From b74006ecf161cfab0ee11200c101334d8d248810 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:01 +0200 Subject: [PATCH 01/10] Mass rebuild for javapackages-tools 201901 --- maven-compiler-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 3c6e94e..9929299 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,6 +1,6 @@ Name: maven-compiler-plugin Version: 3.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin @@ -49,6 +49,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.7.0-3 +- Mass rebuild for javapackages-tools 201901 + * Thu Feb 08 2018 Fedora Release Engineering - 3.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ae939ab9be925d919d23b9009a829c7314fac976 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Aug 2018 15:18:38 +0200 Subject: [PATCH 02/10] Update to upstream version 3.8.0 --- .gitignore | 1 + maven-compiler-plugin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a68c2c1..2542224 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ maven-compiler-plugin-2.0.2.tar.xz /maven-compiler-plugin-3.6.0-source-release.zip /maven-compiler-plugin-3.6.1-source-release.zip /maven-compiler-plugin-3.7.0-source-release.zip +/maven-compiler-plugin-3.8.0-source-release.zip diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 9929299..cc80d52 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,6 +1,6 @@ Name: maven-compiler-plugin -Version: 3.7.0 -Release: 3%{?dist} +Version: 3.8.0 +Release: 1%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin @@ -49,6 +49,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri May 31 2019 Marian Koncek - 3.8.0-1 +- Update to upstream version 3.8.0 + * Fri May 24 2019 Mikolaj Izdebski - 3.7.0-3 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 2395b4c..80aa5ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-compiler-plugin-3.7.0-source-release.zip) = 8d4f61188a17e618603cdbee036208740b9912b4c8aa416703436331d7600d735c56c1143404ff0f447beaf52d49a45473add7723984fc05f6c6d742be8a3c7f +SHA512 (maven-compiler-plugin-3.8.0-source-release.zip) = dc8c222e567ec75f45de04072237e65cbc98087cd41f1c6ceff806c02205d144d1be7c50589dd4f982f6937df5520b56b1310839d23730be6e99c874d959cd4e From 56fc0dfea6cb988e65f0d42a178a56dacb157e08 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Jun 2019 14:36:27 +0200 Subject: [PATCH 03/10] Update to upstream version 3.8.1 --- .gitignore | 1 + maven-compiler-plugin.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2542224..b24bba0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ maven-compiler-plugin-2.0.2.tar.xz /maven-compiler-plugin-3.6.1-source-release.zip /maven-compiler-plugin-3.7.0-source-release.zip /maven-compiler-plugin-3.8.0-source-release.zip +/maven-compiler-plugin-3.8.1-source-release.zip diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index cc80d52..410ae52 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,5 +1,5 @@ Name: maven-compiler-plugin -Version: 3.8.0 +Version: 3.8.1 Release: 1%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 @@ -23,7 +23,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-java) - %description The Compiler Plugin is used to compile the sources of your project. @@ -49,6 +48,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Tue Jun 04 2019 Marian Koncek - 3.8.1-1 +- Update to upstream version 3.8.1 + * Fri May 31 2019 Marian Koncek - 3.8.0-1 - Update to upstream version 3.8.0 diff --git a/sources b/sources index 80aa5ac..6978974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-compiler-plugin-3.8.0-source-release.zip) = dc8c222e567ec75f45de04072237e65cbc98087cd41f1c6ceff806c02205d144d1be7c50589dd4f982f6937df5520b56b1310839d23730be6e99c874d959cd4e +SHA512 (maven-compiler-plugin-3.8.1-source-release.zip) = 6ee6e9ac84ffdccee39f626f2adbfd62f880aee9ca404c9f229af68b006617a4394c1586cdc44c9a9e63bdde7d22127e6400e47459ac8f9f6ead15257a93249e From 95cc31fb65c2ac5da66c6bd927a2487ef294e0a3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 04/10] Mass rebuild for javapackages-tools 201902 --- maven-compiler-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 410ae52..9e0282e 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,6 +1,6 @@ Name: maven-compiler-plugin Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-compiler-plugin @@ -48,6 +48,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.8.1-2 +- Mass rebuild for javapackages-tools 201902 + * Tue Jun 04 2019 Marian Koncek - 3.8.1-1 - Update to upstream version 3.8.1 From 3b6030e48d5a39e519f08b28bfe4dca7b770c760 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 31 Jul 2020 15:19:27 +0200 Subject: [PATCH 05/10] Port to newer plexus-languages --- maven-compiler-plugin.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 9e0282e..32f4b56 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -35,6 +35,9 @@ API documentation for %{name}. %prep %setup -q +# Port to newer plexus-languages +sed -i 's/ResolvePathsResult.ModuleNameSource/ModuleNameSource/' src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java + %build %mvn_build -f From ce68615431b62a340524a527a19060b8089df7f1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 31 Jul 2020 15:20:35 +0200 Subject: [PATCH 06/10] Use HTTPS --- maven-compiler-plugin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 32f4b56..08ef70b 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -3,10 +3,10 @@ Version: 3.8.1 Release: 2%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-compiler-plugin +URL: https://maven.apache.org/plugins/maven-compiler-plugin BuildArch: noarch -Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip +Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip BuildRequires: maven-local BuildRequires: mvn(org.apache.maven:maven-artifact) From f915483c37f1ae6a9b7f6508b1068cb1d6893885 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 31 Jul 2020 15:22:37 +0200 Subject: [PATCH 07/10] Enable tests --- maven-compiler-plugin.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 08ef70b..ca8e48a 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -9,11 +9,14 @@ BuildArch: noarch Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip BuildRequires: maven-local +BuildRequires: mvn(junit:junit) 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:maven-shared-incremental) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) @@ -22,6 +25,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-java) +BuildRequires: mvn(org.mockito:mockito-core) %description The Compiler Plugin is used to compile the sources of your project. @@ -38,8 +42,11 @@ API documentation for %{name}. # Port to newer plexus-languages sed -i 's/ResolvePathsResult.ModuleNameSource/ModuleNameSource/' src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java +# Replace path to junit in a test case with the system wide .jar +sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java + %build -%mvn_build -f +%mvn_build %install %mvn_install From a9c531519108a1c3bf9b8971807d226bfe7a3f98 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 18 Aug 2020 09:13:33 +0200 Subject: [PATCH 08/10] Fix bootstrap build --- maven-compiler-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index ca8e48a..bb9e149 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -43,7 +43,7 @@ API documentation for %{name}. sed -i 's/ResolvePathsResult.ModuleNameSource/ModuleNameSource/' src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java # Replace path to junit in a test case with the system wide .jar -sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java +sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java %build %mvn_build From 3ee2a515d59e4856bb855f1264cecd56009172b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- maven-compiler-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index bb9e149..2bd2e52 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-compiler-plugin Version: 3.8.1 Release: 2%{?dist} @@ -9,6 +11,9 @@ BuildArch: noarch Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-compat) @@ -26,6 +31,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.mockito:mockito-core) +%endif %description The Compiler Plugin is used to compile the sources of your project. From 66245e8b792bf121188e22a0d1173ce39b77cb1b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- maven-compiler-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 2bd2e52..914a50f 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-compiler-plugin Version: 3.8.1