From 28155b517d461863fa1552ab0a2f8cd62cac2f68c0e1672b12324a08037381dc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Sep 2023 06:06:24 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-filtering?expand=0&rev=12 --- maven-filtering-3.2.0-source-release.zip | 3 -- maven-filtering-3.3.1-source-release.zip | 3 ++ maven-filtering-build.xml | 44 +++++++---------- maven-filtering.spec | 63 +++++++++--------------- 4 files changed, 44 insertions(+), 69 deletions(-) delete mode 100644 maven-filtering-3.2.0-source-release.zip create mode 100644 maven-filtering-3.3.1-source-release.zip diff --git a/maven-filtering-3.2.0-source-release.zip b/maven-filtering-3.2.0-source-release.zip deleted file mode 100644 index 832ffa9..0000000 --- a/maven-filtering-3.2.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7655bfb5c653ab04289efbf63e9606bf1fa44f3a0b9e07bc5ad76118c33e13b -size 161793 diff --git a/maven-filtering-3.3.1-source-release.zip b/maven-filtering-3.3.1-source-release.zip new file mode 100644 index 0000000..70dfaad --- /dev/null +++ b/maven-filtering-3.3.1-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c080b49c40b963b0781438520319d0b41d46c63ddda5e6c5f7ee0cefb68f38d +size 172597 diff --git a/maven-filtering-build.xml b/maven-filtering-build.xml index 8d2a597..c49605f 100644 --- a/maven-filtering-build.xml +++ b/maven-filtering-build.xml @@ -10,11 +10,11 @@ - + - + @@ -69,31 +69,25 @@ - + - - - - - - - - - - - - - - - - - - + description="Generate javax.inject.Name index"> + + + + + + + + + + + @@ -129,7 +123,7 @@ - + = 6 BuildRequires: maven-lib -BuildRequires: maven-shared-utils -BuildRequires: objectweb-asm BuildRequires: plexus-build-api -BuildRequires: plexus-classworlds -BuildRequires: plexus-cli -BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-interpolation -BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils -BuildRequires: qdox BuildRequires: sisu-inject -BuildRequires: sisu-plexus +BuildRequires: slf4j BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildArch: noarch %description @@ -70,47 +55,43 @@ This package contains the API documentation for %{name}. %setup -q cp %{SOURCE1} build.xml +%pom_xpath_remove pom:project/pom:parent/pom:relativePath + %build mkdir -p lib build-jar-repository -s lib \ + atinject \ + commons-io \ maven/maven-core \ maven/maven-model \ maven/maven-settings \ - org.eclipse.sisu.plexus \ - plexus-containers/plexus-component-annotations \ - maven-shared-utils/maven-shared-utils \ + org.eclipse.sisu.inject \ plexus/utils \ plexus/interpolation \ plexus/plexus-build-api \ - commons-io \ - jsr-305 \ - \ - atinject \ - commons-cli \ - guava/guava \ - guice/google-guice-no_aop \ - jdom2/jdom2 \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ - plexus-classworlds \ - plexus-metadata-generator \ - plexus/cli \ - qdox + slf4j/api -# Tests use a package that is no longer present in plexus-build-api (v0.0.7) %{ant} \ jar javadoc -%{mvn_artifact} pom.xml target/%{name}-%{version}.jar - %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE NOTICE %changelog From dfbacc01f4a01c226188dec16187417da9a1a792c9b071e2c228a07b5920ad41 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2023 12:55:40 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-filtering?expand=0&rev=13 --- maven-filtering-build.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-filtering-build.xml b/maven-filtering-build.xml index c49605f..37c0673 100644 --- a/maven-filtering-build.xml +++ b/maven-filtering-build.xml @@ -76,9 +76,9 @@ depends="compile" description="Generate javax.inject.Name index"> - + @@ -87,7 +87,7 @@ - + From 86f7793e8b8c77dfb230b912bc16e1c5e78f3ae289348447d08a0b1e44c1e38a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Sep 2023 13:12:41 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-filtering?expand=0&rev=14 --- maven-filtering.changes | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/maven-filtering.changes b/maven-filtering.changes index 232ce46..bf95222 100644 --- a/maven-filtering.changes +++ b/maven-filtering.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Sep 6 13:00:35 UTC 2023 - Fridrich Strba + +- Upgrade to version 3.3.1 + * Changes of 3.3.1 + + MSHARED-1175: Copying x resources from rel/path to rel/path + + MSHARED-1213: Bug: filtering existing but 0 byte file + + MSHARED-1199: Upgrade parent pom to 39 + + MSHARED-1112: Ignore setting permissions on non existing dest + files/symlinks + + MSHARED-1144: remove rendundant error message + * Changes of 3.3.0 + + fixed cloning of MavenResourcesExecution's instances using + copyOf() method + + MRESOURCES-258: Copying and filtering logic is delegated to + FileUtils + + replace deprecated methods + + replace deprecated code in favor of Java 7 core and apache + commons libraries + declare dependencies + + MSHARED-1080: Parent POM 36, Java8, drop legacy. + ------------------------------------------------------------------- Thu Apr 28 11:53:54 UTC 2022 - Fridrich Strba