From c52d108c843dc2f43982e49e41980e829fe94861 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 21:42:05 +0200 Subject: [PATCH 1/9] Update to upstream version 3.1.2 --- .gitignore | 1 + maven-jar-plugin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 12bf4b5..153ba49 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ maven-jar-plugin-2.4-source-release.zip /maven-jar-plugin-3.0.1-source-release.zip /maven-jar-plugin-3.0.2-source-release.zip /maven-jar-plugin-3.1.0-source-release.zip +/maven-jar-plugin-3.1.2-source-release.zip diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index d97783d..dae8cf0 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,5 +1,5 @@ Name: maven-jar-plugin -Version: 3.1.0 +Version: 3.1.2 Release: 1%{?dist} Summary: Maven JAR Plugin @@ -10,7 +10,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/% BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-archiver) +BuildRequires: mvn(org.apache.maven:maven-archiver) >= 3.4.0 BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) @@ -49,6 +49,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Mon May 13 2019 Mikolaj Izdebski - 3.1.2-1 +- Update to upstream version 3.1.2 + * Tue Apr 10 2018 Michael Simacek - 3.1.0-1 - Update to upstream version 3.1.0 diff --git a/sources b/sources index f72e027..e823218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-jar-plugin-3.1.0-source-release.zip) = 6ce09ac2d547b87cdae22c62878090000e359531a397a643bbb906d4ed72c70976833a9bea8837df61aca4166fa6f0e227d83a6f4dbcc0ef9fc72e8fe75e6724 +SHA512 (maven-jar-plugin-3.1.2-source-release.zip) = aff5baf3c218ab79e1f15b59f3c7e6c0c0b5344b13cf62d1aef03be34a8f90b75ceb51c7d8a28f1916becdcc48ec869b426bcb71365de364a93b981050d1fd70 From cb5864999fe1853a980038a70bfa5c9b799cc11d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 07:12:35 +0200 Subject: [PATCH 2/9] Regenerate build-requires --- maven-jar-plugin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index dae8cf0..67d503b 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -17,6 +17,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.shared:file-management) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) From 2dcb7ca21ab9ab50806b4bf58538a16bf301ca88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:08 +0200 Subject: [PATCH 3/9] Mass rebuild for javapackages-tools 201901 --- maven-jar-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 67d503b..555df07 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,6 +1,6 @@ Name: maven-jar-plugin Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven JAR Plugin License: ASL 2.0 @@ -50,6 +50,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.1.2-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 3.1.2-1 - Update to upstream version 3.1.2 From 6a608fe7251d99e9260c7c9b9a69e5b5a2bc5909 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 4/9] Remove unneeded %dir --- maven-jar-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 555df07..2fdaf95 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -43,7 +43,6 @@ API documentation for %{name}. %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc From 1e9375941d7dd92ed31c8e37ca6a76b99bf7d8f6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- maven-jar-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 2fdaf95..4e0dcad 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,6 +1,6 @@ Name: maven-jar-plugin Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven JAR Plugin License: ASL 2.0 @@ -49,6 +49,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.1.2-2 - Mass rebuild for javapackages-tools 201901 From f7d146e69f9db847b89aae1ab999fd799bce60c8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Nov 2019 16:34:07 +0100 Subject: [PATCH 6/9] Update to upstream version 3.2.0 --- .gitignore | 1 + maven-jar-plugin.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 153ba49..9da466b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ maven-jar-plugin-2.4-source-release.zip /maven-jar-plugin-3.0.2-source-release.zip /maven-jar-plugin-3.1.0-source-release.zip /maven-jar-plugin-3.1.2-source-release.zip +/maven-jar-plugin-3.2.0-source-release.zip diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 4e0dcad..60a22fd 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,23 +1,27 @@ Name: maven-jar-plugin -Version: 3.1.2 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Maven JAR Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-jar-plugin/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -BuildArch: noarch +BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-archiver) >= 3.4.0 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:file-management) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -31,13 +35,11 @@ Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q %build -# Test class MockArtifact doesn't override method getMetadata -%mvn_build -f -- -DmavenVersion=3.1.1 +%mvn_build %install %mvn_install @@ -49,6 +51,9 @@ API documentation for %{name}. %doc LICENSE NOTICE %changelog +* Wed Nov 20 2019 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index e823218..095eb39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-jar-plugin-3.1.2-source-release.zip) = aff5baf3c218ab79e1f15b59f3c7e6c0c0b5344b13cf62d1aef03be34a8f90b75ceb51c7d8a28f1916becdcc48ec869b426bcb71365de364a93b981050d1fd70 +SHA512 (maven-jar-plugin-3.2.0-source-release.zip) = b84da749dd6ca3a58173ad060a7406bee48ea02d78bc638fcc404c1c31c7c466d5d33890ab549a4edd99efcfebb8926a7955d647a398968c2b1c44393a3bef43 From ee1028801714fcff950b7f872ec2e81377701790 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 25 Mar 2020 06:12:56 +0100 Subject: [PATCH 7/9] Use system version of itself instead of reactor version --- maven-jar-plugin.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index 60a22fd..c441f23 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -37,6 +37,8 @@ API documentation for %{name}. %prep %setup -q +# System version of maven-jar-plugin should be used, not reactor version +%pom_xpath_inject pom:pluginManagement/pom:plugins "maven-jar-pluginSYSTEM" %build %mvn_build From 6d6b57ce0cdafa2da75f52e2f10a41d0960bdbe5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- maven-jar-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index c441f23..f0745bd 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-jar-plugin Version: 3.2.0 Release: 1%{?dist} @@ -10,6 +12,9 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/% BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-archiver) BuildRequires: mvn(org.apache.maven:maven-artifact) @@ -24,6 +29,7 @@ BuildRequires: mvn(org.apache.maven.shared:file-management) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Builds a Java Archive (JAR) file from the compiled From c8f1910f3f51efcfa7b2fdc2da34724de9ee8f5a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- maven-jar-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec index f0745bd..8d16fed 100644 --- a/maven-jar-plugin.spec +++ b/maven-jar-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-jar-plugin Version: 3.2.0