From a3766f7905c3faecab1994258f4d535034ee8ae3eb4c358d5bbf1b06d175b8c3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 17:08:55 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=16 --- ...-resources-plugin-3.1.0-source-release.zip | 3 - ...-resources-plugin-3.2.0-source-release.zip | 3 + ...resources-plugin-bootstrap-resources.patch | 256 +++++++++++------- maven-resources-plugin-build.xml | 8 +- maven-resources-plugin.spec | 4 +- 5 files changed, 168 insertions(+), 106 deletions(-) delete mode 100644 maven-resources-plugin-3.1.0-source-release.zip create mode 100644 maven-resources-plugin-3.2.0-source-release.zip diff --git a/maven-resources-plugin-3.1.0-source-release.zip b/maven-resources-plugin-3.1.0-source-release.zip deleted file mode 100644 index 0174cee..0000000 --- a/maven-resources-plugin-3.1.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb1bc6c05aa6da059a90f02f22e394246b0b1064da50b7943fc908e53f75f1f3 -size 936585 diff --git a/maven-resources-plugin-3.2.0-source-release.zip b/maven-resources-plugin-3.2.0-source-release.zip new file mode 100644 index 0000000..343aec4 --- /dev/null +++ b/maven-resources-plugin-3.2.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e28f0b5bd337376eb35397dba0cb9168d1839b42f22e565a0328097a8d5d0178 +size 945426 diff --git a/maven-resources-plugin-bootstrap-resources.patch b/maven-resources-plugin-bootstrap-resources.patch index 5409130..7224b7f 100644 --- a/maven-resources-plugin-bootstrap-resources.patch +++ b/maven-resources-plugin-bootstrap-resources.patch @@ -1,6 +1,6 @@ --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2019-04-01 08:42:56.035739311 +0200 -@@ -0,0 +1,493 @@ +@@ -0,0 +1,517 @@ + + + ${project.name} @@ -120,6 +120,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -282,6 +290,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + skip + boolean + 3.0.0 @@ -438,6 +454,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -496,7 +520,7 @@ + --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 08:42:45.083685375 +0200 -@@ -0,0 +1,830 @@ +@@ -0,0 +1,866 @@ + + + ${project.name} @@ -633,6 +657,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -829,6 +861,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -1028,6 +1068,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -1107,55 +1155,49 @@ + org.apache.maven + maven-plugin-api + jar -+ 3.0 ++ 3.1.0 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.5.2 ++ 2.6.0 + + + org.apache.maven + maven-artifact + jar -+ 3.5.4 -+ -+ -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus -+ jar -+ 0.3.3 ++ 3.8.4 + + + org.apache.maven + maven-core + jar -+ 3.0 ++ 3.1.0 + + + org.apache.maven + maven-settings + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-util + jar -+ 1.1.1 ++ 1.6.3 + + -+ org.apache.commons -+ commons-lang3 ++ org.slf4j ++ slf4j-api + jar -+ 3.8.1 ++ 1.7.32 + + + org.eclipse.sisu + org.eclipse.sisu.inject + jar -+ 0.3.3 ++ 0.3.5 + + + javax.enterprise @@ -1164,58 +1206,64 @@ + 1.1 + + -+ javax.el -+ javax.el-api -+ jar -+ 3.0.0 -+ -+ + org.jboss.spec.javax.interceptor + jboss-interceptors-api_1.2_spec + jar + any + + ++ jakarta.inject ++ jakarta.inject-api ++ jar ++ 1.0 ++ ++ ++ com.google.inject ++ guice ++ jar ++ 4.2.2 ++ ++ ++ aopalliance ++ aopalliance ++ jar ++ any ++ ++ + com.google.guava + guava + jar -+ 20.0 ++ any + + -+ com.google.inject -+ guice ++ com.google.code.findbugs ++ jsr305 + jar -+ 4.2.0 -+ -+ -+ cglib -+ cglib -+ jar -+ 3.2.0 -+ -+ -+ aopalliance -+ aopalliance -+ jar -+ 1.0 ++ any + + + org.ow2.asm + asm + jar -+ 5.0.3 ++ any ++ ++ ++ cglib ++ cglib ++ jar ++ any + + + org.apache.maven + maven-resolver-provider + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-api + jar -+ 1.1.1 ++ 1.6.3 + + + javax.inject @@ -1227,25 +1275,73 @@ + org.apache.maven.resolver + maven-resolver-impl + jar -+ 1.1.1 ++ 1.6.3 + + -+ org.slf4j -+ slf4j-api ++ org.apache.maven.resolver ++ maven-resolver-named-locks + jar -+ 1.7.25 ++ 1.7.3 ++ ++ ++ javax.annotation ++ javax.annotation-api ++ jar ++ 1.3.2 + + + org.apache.maven + maven-repository-metadata + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-spi + jar -+ 1.1.1 ++ 1.6.3 ++ ++ ++ org.apache.maven ++ maven-model-builder ++ jar ++ 3.8.4 ++ ++ ++ org.apache.maven ++ maven-builder-support ++ jar ++ 3.8.4 ++ ++ ++ org.apache.maven.shared ++ maven-shared-utils ++ jar ++ 3.3.4 ++ ++ ++ org.apache.maven ++ maven-settings-builder ++ jar ++ 3.8.4 ++ ++ ++ org.codehaus.plexus ++ plexus-sec-dispatcher ++ jar ++ 2.0 ++ ++ ++ org.codehaus.plexus ++ plexus-cipher ++ jar ++ 2.0 ++ ++ ++ org.apache.maven ++ maven-model ++ jar ++ 3.1.0 + + + org.codehaus.plexus @@ -1254,58 +1350,22 @@ + 1.5.5 + + -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven -+ maven-builder-support -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven.shared -+ maven-shared-utils -+ jar -+ 3.2.1 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.5.4 -+ -+ -+ org.sonatype.plexus -+ plexus-sec-dispatcher -+ jar -+ 1.4 -+ -+ -+ org.sonatype.plexus -+ plexus-cipher -+ jar -+ 1.4 -+ -+ -+ org.apache.maven -+ maven-model -+ jar -+ 3.0 -+ -+ + org.codehaus.plexus -+ plexus-utils ++ plexus-interpolation + jar -+ 3.1.0 ++ 1.26 ++ ++ ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus ++ jar ++ 0.0.0.M2a + + + org.apache.maven.shared + maven-filtering + jar -+ 3.1.1 ++ 3.2.0 + + + org.sonatype.plexus @@ -1317,13 +1377,13 @@ + commons-io + commons-io + jar -+ 2.5 ++ 2.6 + + -+ org.codehaus.plexus -+ plexus-interpolation ++ org.apache.commons ++ commons-lang3 + jar -+ 1.24 ++ 3.8.1 + + + diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml index b4c9533..874ce35 100644 --- a/maven-resources-plugin-build.xml +++ b/maven-resources-plugin-build.xml @@ -13,16 +13,16 @@ - + - + diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index ed396d2..b0ef0f7 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -23,7 +23,7 @@ %bcond_with bootstrap %endif %global base_name maven-resources-plugin -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Maven Resources Plugin License: Apache-2.0 @@ -33,6 +33,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n Source1: %{base_name}-build.xml Patch0: %{base_name}-bootstrap-resources.patch BuildRequires: apache-commons-io +BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -94,6 +95,7 @@ cp %{SOURCE1} build.xml mkdir -p lib build-jar-repository -s lib \ commons-io \ + commons-lang3 \ maven-filtering/maven-filtering \ maven/maven-core \ maven/maven-model \ From a8c2689823f62936fa03774070c099d540d51d2169d1700ad2ec09e7f270bb67 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 17:12:02 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=17 --- maven-resources-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index b0ef0f7..547d41f 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -37,7 +37,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: maven-filtering +BuildRequires: maven-filtering >= 1.3 BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: plexus-interpolation From c8dd10d940a0aff5e59b4193583cdf61951067e32b4984e8baa35fae6fd448c5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Apr 2022 17:14:38 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=18 --- maven-resources-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index 547d41f..a054ec2 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -37,7 +37,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: maven-filtering >= 1.3 +BuildRequires: maven-filtering >= 3.2.0 BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: plexus-interpolation From eaf5c7f1dec140cf0b69a5c6bfac65816fa6c04c15e76ce788a8028e04954815 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 27 Apr 2022 05:18:34 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=19 --- ...-resources-plugin-3.1.0-source-release.zip | 3 + ...-resources-plugin-3.2.0-source-release.zip | 3 - ...resources-plugin-bootstrap-resources.patch | 252 +++++++----------- maven-resources-plugin-build.xml | 8 +- maven-resources-plugin.spec | 6 +- 5 files changed, 105 insertions(+), 167 deletions(-) create mode 100644 maven-resources-plugin-3.1.0-source-release.zip delete mode 100644 maven-resources-plugin-3.2.0-source-release.zip diff --git a/maven-resources-plugin-3.1.0-source-release.zip b/maven-resources-plugin-3.1.0-source-release.zip new file mode 100644 index 0000000..0174cee --- /dev/null +++ b/maven-resources-plugin-3.1.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb1bc6c05aa6da059a90f02f22e394246b0b1064da50b7943fc908e53f75f1f3 +size 936585 diff --git a/maven-resources-plugin-3.2.0-source-release.zip b/maven-resources-plugin-3.2.0-source-release.zip deleted file mode 100644 index 343aec4..0000000 --- a/maven-resources-plugin-3.2.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e28f0b5bd337376eb35397dba0cb9168d1839b42f22e565a0328097a8d5d0178 -size 945426 diff --git a/maven-resources-plugin-bootstrap-resources.patch b/maven-resources-plugin-bootstrap-resources.patch index 7224b7f..5409130 100644 --- a/maven-resources-plugin-bootstrap-resources.patch +++ b/maven-resources-plugin-bootstrap-resources.patch @@ -1,6 +1,6 @@ --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2019-04-01 08:42:56.035739311 +0200 -@@ -0,0 +1,517 @@ +@@ -0,0 +1,493 @@ + + + ${project.name} @@ -120,14 +120,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + resources + java.util.List + true @@ -290,14 +282,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + skip + boolean + 3.0.0 @@ -454,14 +438,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + resources + java.util.List + true @@ -520,7 +496,7 @@ + --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 08:42:45.083685375 +0200 -@@ -0,0 +1,866 @@ +@@ -0,0 +1,830 @@ + + + ${project.name} @@ -657,14 +633,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + resources + java.util.List + true @@ -861,14 +829,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + resources + java.util.List + true @@ -1068,14 +1028,6 @@ + Copy resources of the configured plugin attribute resources + + -+ propertiesEncoding -+ java.lang.String -+ 3.2.0 -+ false -+ true -+ Copy resources of the configured plugin attribute resources -+ -+ + resources + java.util.List + true @@ -1155,49 +1107,55 @@ + org.apache.maven + maven-plugin-api + jar -+ 3.1.0 ++ 3.0 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.6.0 ++ 2.5.2 + + + org.apache.maven + maven-artifact + jar -+ 3.8.4 ++ 3.5.4 ++ ++ ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus ++ jar ++ 0.3.3 + + + org.apache.maven + maven-core + jar -+ 3.1.0 ++ 3.0 + + + org.apache.maven + maven-settings + jar -+ 3.8.4 ++ 3.5.4 + + + org.apache.maven.resolver + maven-resolver-util + jar -+ 1.6.3 ++ 1.1.1 + + -+ org.slf4j -+ slf4j-api ++ org.apache.commons ++ commons-lang3 + jar -+ 1.7.32 ++ 3.8.1 + + + org.eclipse.sisu + org.eclipse.sisu.inject + jar -+ 0.3.5 ++ 0.3.3 + + + javax.enterprise @@ -1206,64 +1164,58 @@ + 1.1 + + ++ javax.el ++ javax.el-api ++ jar ++ 3.0.0 ++ ++ + org.jboss.spec.javax.interceptor + jboss-interceptors-api_1.2_spec + jar + any + + -+ jakarta.inject -+ jakarta.inject-api -+ jar -+ 1.0 -+ -+ -+ com.google.inject -+ guice -+ jar -+ 4.2.2 -+ -+ -+ aopalliance -+ aopalliance -+ jar -+ any -+ -+ + com.google.guava + guava + jar -+ any ++ 20.0 + + -+ com.google.code.findbugs -+ jsr305 ++ com.google.inject ++ guice + jar -+ any -+ -+ -+ org.ow2.asm -+ asm -+ jar -+ any ++ 4.2.0 + + + cglib + cglib + jar -+ any ++ 3.2.0 ++ ++ ++ aopalliance ++ aopalliance ++ jar ++ 1.0 ++ ++ ++ org.ow2.asm ++ asm ++ jar ++ 5.0.3 + + + org.apache.maven + maven-resolver-provider + jar -+ 3.8.4 ++ 3.5.4 + + + org.apache.maven.resolver + maven-resolver-api + jar -+ 1.6.3 ++ 1.1.1 + + + javax.inject @@ -1275,73 +1227,25 @@ + org.apache.maven.resolver + maven-resolver-impl + jar -+ 1.6.3 ++ 1.1.1 + + -+ org.apache.maven.resolver -+ maven-resolver-named-locks ++ org.slf4j ++ slf4j-api + jar -+ 1.7.3 -+ -+ -+ javax.annotation -+ javax.annotation-api -+ jar -+ 1.3.2 ++ 1.7.25 + + + org.apache.maven + maven-repository-metadata + jar -+ 3.8.4 ++ 3.5.4 + + + org.apache.maven.resolver + maven-resolver-spi + jar -+ 1.6.3 -+ -+ -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.8.4 -+ -+ -+ org.apache.maven -+ maven-builder-support -+ jar -+ 3.8.4 -+ -+ -+ org.apache.maven.shared -+ maven-shared-utils -+ jar -+ 3.3.4 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.8.4 -+ -+ -+ org.codehaus.plexus -+ plexus-sec-dispatcher -+ jar -+ 2.0 -+ -+ -+ org.codehaus.plexus -+ plexus-cipher -+ jar -+ 2.0 -+ -+ -+ org.apache.maven -+ maven-model -+ jar -+ 3.1.0 ++ 1.1.1 + + + org.codehaus.plexus @@ -1350,22 +1254,58 @@ + 1.5.5 + + -+ org.codehaus.plexus -+ plexus-interpolation ++ org.apache.maven ++ maven-model-builder + jar -+ 1.26 ++ 3.5.4 + + -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus ++ org.apache.maven ++ maven-builder-support + jar -+ 0.0.0.M2a ++ 3.5.4 ++ ++ ++ org.apache.maven.shared ++ maven-shared-utils ++ jar ++ 3.2.1 ++ ++ ++ org.apache.maven ++ maven-settings-builder ++ jar ++ 3.5.4 ++ ++ ++ org.sonatype.plexus ++ plexus-sec-dispatcher ++ jar ++ 1.4 ++ ++ ++ org.sonatype.plexus ++ plexus-cipher ++ jar ++ 1.4 ++ ++ ++ org.apache.maven ++ maven-model ++ jar ++ 3.0 ++ ++ ++ org.codehaus.plexus ++ plexus-utils ++ jar ++ 3.1.0 + + + org.apache.maven.shared + maven-filtering + jar -+ 3.2.0 ++ 3.1.1 + + + org.sonatype.plexus @@ -1377,13 +1317,13 @@ + commons-io + commons-io + jar -+ 2.6 ++ 2.5 + + -+ org.apache.commons -+ commons-lang3 ++ org.codehaus.plexus ++ plexus-interpolation + jar -+ 3.8.1 ++ 1.24 + + + diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml index 874ce35..b4c9533 100644 --- a/maven-resources-plugin-build.xml +++ b/maven-resources-plugin-build.xml @@ -13,16 +13,16 @@ - + - + diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index a054ec2..ed396d2 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -23,7 +23,7 @@ %bcond_with bootstrap %endif %global base_name maven-resources-plugin -Version: 3.2.0 +Version: 3.1.0 Release: 0 Summary: Maven Resources Plugin License: Apache-2.0 @@ -33,11 +33,10 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n Source1: %{base_name}-build.xml Patch0: %{base_name}-bootstrap-resources.patch BuildRequires: apache-commons-io -BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: maven-filtering >= 3.2.0 +BuildRequires: maven-filtering BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: plexus-interpolation @@ -95,7 +94,6 @@ cp %{SOURCE1} build.xml mkdir -p lib build-jar-repository -s lib \ commons-io \ - commons-lang3 \ maven-filtering/maven-filtering \ maven/maven-core \ maven/maven-model \ From 1acbf9911125bfb0d1e4c0f5671ce78d43a1036fe642fa5f0d2d90aea10faaab Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 27 Apr 2022 05:25:38 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=20 --- ...-resources-plugin-3.1.0-source-release.zip | 3 - ...-resources-plugin-3.2.0-source-release.zip | 3 + ...resources-plugin-bootstrap-resources.patch | 256 +++++++++++------- maven-resources-plugin-build.xml | 8 +- maven-resources-plugin.spec | 6 +- 5 files changed, 169 insertions(+), 107 deletions(-) delete mode 100644 maven-resources-plugin-3.1.0-source-release.zip create mode 100644 maven-resources-plugin-3.2.0-source-release.zip diff --git a/maven-resources-plugin-3.1.0-source-release.zip b/maven-resources-plugin-3.1.0-source-release.zip deleted file mode 100644 index 0174cee..0000000 --- a/maven-resources-plugin-3.1.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb1bc6c05aa6da059a90f02f22e394246b0b1064da50b7943fc908e53f75f1f3 -size 936585 diff --git a/maven-resources-plugin-3.2.0-source-release.zip b/maven-resources-plugin-3.2.0-source-release.zip new file mode 100644 index 0000000..343aec4 --- /dev/null +++ b/maven-resources-plugin-3.2.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e28f0b5bd337376eb35397dba0cb9168d1839b42f22e565a0328097a8d5d0178 +size 945426 diff --git a/maven-resources-plugin-bootstrap-resources.patch b/maven-resources-plugin-bootstrap-resources.patch index 5409130..7224b7f 100644 --- a/maven-resources-plugin-bootstrap-resources.patch +++ b/maven-resources-plugin-bootstrap-resources.patch @@ -1,6 +1,6 @@ --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-resources-plugin/plugin-help.xml 2019-04-01 08:42:56.035739311 +0200 -@@ -0,0 +1,493 @@ +@@ -0,0 +1,517 @@ + + + ${project.name} @@ -120,6 +120,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -282,6 +290,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + skip + boolean + 3.0.0 @@ -438,6 +454,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -496,7 +520,7 @@ + --- maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 +++ maven-resources-plugin-3.1.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-04-01 08:42:45.083685375 +0200 -@@ -0,0 +1,830 @@ +@@ -0,0 +1,866 @@ + + + ${project.name} @@ -633,6 +657,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -829,6 +861,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -1028,6 +1068,14 @@ + Copy resources of the configured plugin attribute resources + + ++ propertiesEncoding ++ java.lang.String ++ 3.2.0 ++ false ++ true ++ Copy resources of the configured plugin attribute resources ++ ++ + resources + java.util.List + true @@ -1107,55 +1155,49 @@ + org.apache.maven + maven-plugin-api + jar -+ 3.0 ++ 3.1.0 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.5.2 ++ 2.6.0 + + + org.apache.maven + maven-artifact + jar -+ 3.5.4 -+ -+ -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus -+ jar -+ 0.3.3 ++ 3.8.4 + + + org.apache.maven + maven-core + jar -+ 3.0 ++ 3.1.0 + + + org.apache.maven + maven-settings + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-util + jar -+ 1.1.1 ++ 1.6.3 + + -+ org.apache.commons -+ commons-lang3 ++ org.slf4j ++ slf4j-api + jar -+ 3.8.1 ++ 1.7.32 + + + org.eclipse.sisu + org.eclipse.sisu.inject + jar -+ 0.3.3 ++ 0.3.5 + + + javax.enterprise @@ -1164,58 +1206,64 @@ + 1.1 + + -+ javax.el -+ javax.el-api -+ jar -+ 3.0.0 -+ -+ + org.jboss.spec.javax.interceptor + jboss-interceptors-api_1.2_spec + jar + any + + ++ jakarta.inject ++ jakarta.inject-api ++ jar ++ 1.0 ++ ++ ++ com.google.inject ++ guice ++ jar ++ 4.2.2 ++ ++ ++ aopalliance ++ aopalliance ++ jar ++ any ++ ++ + com.google.guava + guava + jar -+ 20.0 ++ any + + -+ com.google.inject -+ guice ++ com.google.code.findbugs ++ jsr305 + jar -+ 4.2.0 -+ -+ -+ cglib -+ cglib -+ jar -+ 3.2.0 -+ -+ -+ aopalliance -+ aopalliance -+ jar -+ 1.0 ++ any + + + org.ow2.asm + asm + jar -+ 5.0.3 ++ any ++ ++ ++ cglib ++ cglib ++ jar ++ any + + + org.apache.maven + maven-resolver-provider + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-api + jar -+ 1.1.1 ++ 1.6.3 + + + javax.inject @@ -1227,25 +1275,73 @@ + org.apache.maven.resolver + maven-resolver-impl + jar -+ 1.1.1 ++ 1.6.3 + + -+ org.slf4j -+ slf4j-api ++ org.apache.maven.resolver ++ maven-resolver-named-locks + jar -+ 1.7.25 ++ 1.7.3 ++ ++ ++ javax.annotation ++ javax.annotation-api ++ jar ++ 1.3.2 + + + org.apache.maven + maven-repository-metadata + jar -+ 3.5.4 ++ 3.8.4 + + + org.apache.maven.resolver + maven-resolver-spi + jar -+ 1.1.1 ++ 1.6.3 ++ ++ ++ org.apache.maven ++ maven-model-builder ++ jar ++ 3.8.4 ++ ++ ++ org.apache.maven ++ maven-builder-support ++ jar ++ 3.8.4 ++ ++ ++ org.apache.maven.shared ++ maven-shared-utils ++ jar ++ 3.3.4 ++ ++ ++ org.apache.maven ++ maven-settings-builder ++ jar ++ 3.8.4 ++ ++ ++ org.codehaus.plexus ++ plexus-sec-dispatcher ++ jar ++ 2.0 ++ ++ ++ org.codehaus.plexus ++ plexus-cipher ++ jar ++ 2.0 ++ ++ ++ org.apache.maven ++ maven-model ++ jar ++ 3.1.0 + + + org.codehaus.plexus @@ -1254,58 +1350,22 @@ + 1.5.5 + + -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven -+ maven-builder-support -+ jar -+ 3.5.4 -+ -+ -+ org.apache.maven.shared -+ maven-shared-utils -+ jar -+ 3.2.1 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.5.4 -+ -+ -+ org.sonatype.plexus -+ plexus-sec-dispatcher -+ jar -+ 1.4 -+ -+ -+ org.sonatype.plexus -+ plexus-cipher -+ jar -+ 1.4 -+ -+ -+ org.apache.maven -+ maven-model -+ jar -+ 3.0 -+ -+ + org.codehaus.plexus -+ plexus-utils ++ plexus-interpolation + jar -+ 3.1.0 ++ 1.26 ++ ++ ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus ++ jar ++ 0.0.0.M2a + + + org.apache.maven.shared + maven-filtering + jar -+ 3.1.1 ++ 3.2.0 + + + org.sonatype.plexus @@ -1317,13 +1377,13 @@ + commons-io + commons-io + jar -+ 2.5 ++ 2.6 + + -+ org.codehaus.plexus -+ plexus-interpolation ++ org.apache.commons ++ commons-lang3 + jar -+ 1.24 ++ 3.8.1 + + + diff --git a/maven-resources-plugin-build.xml b/maven-resources-plugin-build.xml index b4c9533..874ce35 100644 --- a/maven-resources-plugin-build.xml +++ b/maven-resources-plugin-build.xml @@ -13,16 +13,16 @@ - + - + diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index ed396d2..547d41f 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -23,7 +23,7 @@ %bcond_with bootstrap %endif %global base_name maven-resources-plugin -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Maven Resources Plugin License: Apache-2.0 @@ -33,10 +33,11 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n Source1: %{base_name}-build.xml Patch0: %{base_name}-bootstrap-resources.patch BuildRequires: apache-commons-io +BuildRequires: apache-commons-lang3 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: maven-filtering +BuildRequires: maven-filtering >= 1.3 BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: plexus-interpolation @@ -94,6 +95,7 @@ cp %{SOURCE1} build.xml mkdir -p lib build-jar-repository -s lib \ commons-io \ + commons-lang3 \ maven-filtering/maven-filtering \ maven/maven-core \ maven/maven-model \ From 88618f3a994a9a175e878bcbb665157d03d1411f1ef0d0f155aa783a2f785d3d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 28 Apr 2022 11:53:09 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resources-plugin?expand=0&rev=21 --- maven-resources-plugin.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maven-resources-plugin.changes b/maven-resources-plugin.changes index 2b6b09b..d1ae1a6 100644 --- a/maven-resources-plugin.changes +++ b/maven-resources-plugin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 28 11:51:20 UTC 2022 - Fridrich Strba + +- Upgrade to version 3.2.0 +- Modified patch: + * maven-resources-plugin-bootstrap-resources.patch + + regenerate with current version of tools against the current + version of package + ------------------------------------------------------------------- Tue Mar 22 13:44:41 UTC 2022 - Fridrich Strba