From acd52ac064ffc618ef5b6a95a3afa37da59998edb00e3c5c91ab346372235611 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2023 12:07:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-jar-plugin?expand=0&rev=32 --- 01-allow-replacing-artifacts.patch | 22 +- maven-jar-plugin-3.2.2-source-release.zip | 3 - maven-jar-plugin-3.3.0-source-release.zip | 3 + maven-jar-plugin-bootstrap-resources.patch | 396 ++++++++++++--------- maven-jar-plugin-build.xml | 4 +- maven-jar-plugin.spec | 7 +- 6 files changed, 248 insertions(+), 187 deletions(-) delete mode 100644 maven-jar-plugin-3.2.2-source-release.zip create mode 100644 maven-jar-plugin-3.3.0-source-release.zip diff --git a/01-allow-replacing-artifacts.patch b/01-allow-replacing-artifacts.patch index 450d60a..7a697cc 100644 --- a/01-allow-replacing-artifacts.patch +++ b/01-allow-replacing-artifacts.patch @@ -1,11 +1,11 @@ ---- maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2022-03-29 15:50:36.249589766 +0200 -+++ maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2022-03-29 15:51:59.054148728 +0200 -@@ -317,7 +317,7 @@ - { - if ( projectHasAlreadySetAnArtifact() ) - { -- throw new MojoExecutionException( "You have to use a classifier " -+ getLog().warn( "You have to use a classifier " - + "to attach supplemental artifacts to the project instead of replacing them." ); - } - getProject().getArtifact().setFile( jarFile ); +--- maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2023-09-14 08:41:53.495070762 +0200 ++++ maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2023-09-14 08:46:56.323819346 +0200 +@@ -312,7 +312,7 @@ + { + if ( projectHasAlreadySetAnArtifact() ) + { +- throw new MojoExecutionException( "You have to use a classifier " ++ getLog().warn( "You have to use a classifier " + + "to attach supplemental artifacts to the project instead of replacing them." ); + } + getProject().getArtifact().setFile( jarFile ); diff --git a/maven-jar-plugin-3.2.2-source-release.zip b/maven-jar-plugin-3.2.2-source-release.zip deleted file mode 100644 index dd76cad..0000000 --- a/maven-jar-plugin-3.2.2-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35d28d828096fd6181f6ed3a8267f05cd21ae072972382b8abe029c69ffaf768 -size 198485 diff --git a/maven-jar-plugin-3.3.0-source-release.zip b/maven-jar-plugin-3.3.0-source-release.zip new file mode 100644 index 0000000..46ba671 --- /dev/null +++ b/maven-jar-plugin-3.3.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87d77c76b594d5ebb6d719d5ea5ccd1249411183ff243e50d6c315c358307b4f +size 204961 diff --git a/maven-jar-plugin-bootstrap-resources.patch b/maven-jar-plugin-bootstrap-resources.patch index 66d21a0..b82f38d 100644 --- a/maven-jar-plugin-bootstrap-resources.patch +++ b/maven-jar-plugin-bootstrap-resources.patch @@ -1,6 +1,6 @@ ---- maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml 2019-11-25 18:27:09.361408438 +0100 -@@ -0,0 +1,218 @@ +--- maven-jar-plugin-3.3.0//src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 ++++ maven-jar-plugin-3.3.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-jar-plugin/plugin-help.xml 2023-09-14 14:04:13.990051552 +0200 +@@ -0,0 +1,274 @@ + + + ${project.name} @@ -11,6 +11,62 @@ + jar + + ++ help ++ Display help information on maven-jar-plugin. ++Call mvn jar:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ false ++ false ++ false ++ false ++ false ++ true ++ org.apache.maven.plugins.jar.HelpMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ detail ++ boolean ++ false ++ true ++ Display help information on maven-jar-plugin. ++Call mvn jar:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ ++ ++ goal ++ java.lang.String ++ false ++ true ++ Display help information on maven-jar-plugin. ++Call mvn jar:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ ++ ++ indentSize ++ int ++ false ++ true ++ Display help information on maven-jar-plugin. ++Call mvn jar:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ ++ ++ lineLength ++ int ++ false ++ true ++ Display help information on maven-jar-plugin. ++Call mvn jar:help -Ddetail=true -Dgoal=<goal-name> to display parameter details. ++ ++ ++ ++ ${detail} ++ ${goal} ++ ${indentSize} ++ ${lineLength} ++ ++ ++ + jar + Build a JAR from the current project. + runtime @@ -219,9 +275,9 @@ + + + ---- maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-jar-plugin-3.2.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2019-11-25 18:26:17.657117466 +0100 -@@ -0,0 +1,548 @@ +--- maven-jar-plugin-3.3.0//src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 ++++ maven-jar-plugin-3.3.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2023-09-14 14:03:04.266238892 +0200 +@@ -0,0 +1,556 @@ + + + ${project.name} @@ -234,6 +290,62 @@ + true + + ++ help ++ Display help information on maven-jar-plugin.<br> ++Call <code>mvn jar:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ false ++ false ++ false ++ false ++ false ++ true ++ org.apache.maven.plugins.jar.HelpMojo ++ java ++ per-lookup ++ once-per-session ++ true ++ ++ ++ detail ++ boolean ++ false ++ true ++ Display help information on maven-jar-plugin.<br> ++Call <code>mvn jar:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ ++ ++ goal ++ java.lang.String ++ false ++ true ++ Display help information on maven-jar-plugin.<br> ++Call <code>mvn jar:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ ++ ++ indentSize ++ int ++ false ++ true ++ Display help information on maven-jar-plugin.<br> ++Call <code>mvn jar:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ ++ ++ lineLength ++ int ++ false ++ true ++ Display help information on maven-jar-plugin.<br> ++Call <code>mvn jar:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details. ++ ++ ++ ++ ${detail} ++ ${goal} ++ ${indentSize} ++ ${lineLength} ++ ++ ++ + jar + Build a JAR from the current project. + runtime @@ -511,58 +623,76 @@ + + + -+ org.apache.maven -+ maven-plugin-api ++ org.eclipse.sisu ++ org.eclipse.sisu.plexus + jar -+ 3.1.1 -+ -+ -+ org.apache.maven -+ maven-model -+ jar -+ 3.6.2 ++ 0.9.0.M2 + + + org.codehaus.plexus + plexus-classworlds + jar -+ 2.6.0 ++ 2.7.0 + + -+ org.eclipse.sisu -+ org.eclipse.sisu.plexus ++ org.apache.maven.resolver ++ maven-resolver-spi + jar -+ 0.3.3 -+ -+ -+ org.apache.maven -+ maven-core -+ jar -+ 3.1.1 -+ -+ -+ org.apache.maven -+ maven-settings -+ jar -+ 3.6.2 ++ 1.9.10 + + + org.apache.maven.resolver + maven-resolver-util + jar -+ 1.4.1 ++ 1.9.10 + + -+ org.apache.commons -+ commons-lang3 ++ org.apache.maven ++ maven-settings + jar -+ 3.8.1 ++ 3.9.2 ++ ++ ++ org.slf4j ++ slf4j-api ++ jar ++ 1.7.36 ++ ++ ++ org.apache.maven.resolver ++ maven-resolver-api ++ jar ++ 1.9.10 ++ ++ ++ org.apache.maven ++ maven-model-builder ++ jar ++ 3.9.2 ++ ++ ++ org.codehaus.plexus ++ plexus-component-annotations ++ jar ++ 2.1.0 ++ ++ ++ org.apache.maven ++ maven-resolver-provider ++ jar ++ 3.9.2 ++ ++ ++ org.apache.maven.shared ++ maven-shared-utils ++ jar ++ 3.3.4 + + + org.eclipse.sisu + org.eclipse.sisu.inject + jar -+ 0.3.3 ++ 0.9.0.M2 + + + javax.enterprise @@ -571,10 +701,10 @@ + 1.1 + + -+ javax.el -+ javax.el-api ++ jakarta.inject ++ jakarta.inject-api + jar -+ 3.0.0 ++ 1.0 + + + org.jboss.spec.javax.interceptor @@ -583,52 +713,52 @@ + any + + -+ com.google.inject -+ guice ++ org.apache.maven ++ maven-builder-support + jar -+ 4.2.1 -+ -+ -+ aopalliance -+ aopalliance -+ jar -+ 1.0 -+ -+ -+ cglib -+ cglib -+ jar -+ 3.2.0 -+ -+ -+ org.ow2.asm -+ asm -+ jar -+ 5.0.3 -+ -+ -+ com.google.guava -+ guava -+ jar -+ 19.0 ++ 3.9.2 + + + org.apache.maven -+ maven-resolver-provider ++ maven-repository-metadata + jar -+ 3.6.2 ++ 3.9.2 + + -+ org.slf4j -+ slf4j-api ++ org.codehaus.plexus ++ plexus-interpolation + jar -+ 1.7.25 ++ 1.26 + + + org.apache.maven.resolver -+ maven-resolver-api ++ maven-resolver-impl + jar -+ 1.4.1 ++ 1.9.10 ++ ++ ++ org.apache.maven.resolver ++ maven-resolver-named-locks ++ jar ++ 1.9.12 ++ ++ ++ org.apache.maven ++ maven-settings-builder ++ jar ++ 3.9.2 ++ ++ ++ org.codehaus.plexus ++ plexus-sec-dispatcher ++ jar ++ 2.0 ++ ++ ++ org.codehaus.plexus ++ plexus-cipher ++ jar ++ 2.0 + + + javax.inject @@ -637,70 +767,10 @@ + 1 + + -+ org.apache.maven.resolver -+ maven-resolver-impl -+ jar -+ 1.4.1 -+ -+ -+ org.apache.maven -+ maven-repository-metadata -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven.resolver -+ maven-resolver-spi -+ jar -+ 1.4.1 -+ -+ -+ org.codehaus.plexus -+ plexus-component-annotations -+ jar -+ 1.5.5 -+ -+ -+ org.apache.maven -+ maven-model-builder -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven -+ maven-builder-support -+ jar -+ 3.6.2 -+ -+ -+ org.apache.maven -+ maven-settings-builder -+ jar -+ 3.6.2 -+ -+ -+ org.sonatype.plexus -+ plexus-sec-dispatcher -+ jar -+ 1.4 -+ -+ -+ org.sonatype.plexus -+ plexus-cipher -+ jar -+ 1.4 -+ -+ -+ org.apache.maven -+ maven-artifact -+ jar -+ 3.1.1 -+ -+ + org.apache.maven.shared + file-management + jar -+ 3.0.0 ++ 3.1.0 + + + org.apache.maven.shared @@ -709,64 +779,58 @@ + 3.0.0 + + ++ org.apache.maven.wagon ++ wagon-provider-api ++ jar ++ 2.10 ++ ++ ++ org.apache.maven ++ maven-compat ++ jar ++ 3.0 ++ ++ + org.apache.maven + maven-archiver + jar -+ 3.5.0 -+ -+ -+ org.codehaus.plexus -+ plexus-interpolation -+ jar -+ 1.25 -+ -+ -+ commons-io -+ commons-io -+ jar -+ 2.5 -+ -+ -+ org.apache.maven.shared -+ maven-shared-utils -+ jar -+ 3.2.1 ++ 3.6.0 + + + org.codehaus.plexus + plexus-archiver + jar -+ 4.2.1 ++ 4.8.0 + + + org.codehaus.plexus + plexus-io + jar -+ 3.2.0 ++ 3.4.1 + + -+ org.apache.commons -+ commons-compress ++ commons-io ++ commons-io + jar -+ 1.19 ++ 2.13.0 + + + org.tukaani + xz + jar -+ 1.8 ++ 1.9 ++ ++ ++ org.apache.commons ++ commons-compress ++ jar ++ 1.23.0 + + + org.codehaus.plexus + plexus-utils + jar -+ 3.3.0 -+ -+ -+ org.apache.maven.wagon -+ wagon-provider-api -+ jar -+ 3.3.3 ++ 3.4.2 + + + diff --git a/maven-jar-plugin-build.xml b/maven-jar-plugin-build.xml index 39f816b..95c6c90 100644 --- a/maven-jar-plugin-build.xml +++ b/maven-jar-plugin-build.xml @@ -14,10 +14,10 @@ value="Builds a Java Archive (JAR) file from the compiled project classes and resources."/> - + - + diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index fa93b79..205bcb3 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %bcond_with bootstrap %endif %global base_name maven-jar-plugin -Version: 3.2.2 +Version: 3.3.0 Release: 0 Summary: Maven JAR Plugin License: Apache-2.0 @@ -40,9 +40,7 @@ BuildRequires: maven-archiver >= 3.5.0 BuildRequires: maven-file-management BuildRequires: maven-lib BuildRequires: maven-plugin-annotations -BuildRequires: plexus-archiver >= 4.2.0 BuildRequires: plexus-utils >= 3.3.0 -BuildRequires: sisu-plexus BuildRequires: unzip BuildRequires: xmvn-install BuildRequires: xmvn-resolve @@ -104,7 +102,6 @@ build-jar-repository -s lib \ maven/maven-core \ maven/maven-plugin-api \ maven-plugin-tools/maven-plugin-annotations \ - org.eclipse.sisu.plexus \ plexus/archiver \ plexus/utils %{ant} -Dtest.skip=true jar