From 0cc4cec3eca5351c50690a73ef578e848db7c3c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/10] Expand conditionals --- plexus-compiler.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 8c3b892..b348719 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,4 +1,3 @@ -%bcond_without eclipse Name: plexus-compiler Epoch: 0 @@ -20,9 +19,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -%if %{with eclipse} -BuildRequires: mvn(org.eclipse.tycho:org.eclipse.jdt.core) -%endif %description @@ -63,9 +59,7 @@ cp %{SOURCE2} LICENSE.MIT # missing com.google.errorprone:error_prone_core %pom_disable_module plexus-compiler-javac-errorprone plexus-compilers -%if %{without eclipse} %pom_disable_module plexus-compiler-eclipse plexus-compilers -%endif # don't build/install compiler-test module, it needs maven2 test harness %pom_disable_module plexus-compiler-test From f27755f658d93f491b6fe492b01d0aabe7fa9cd6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/10] Remove explicit Epoch --- plexus-compiler.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index b348719..b2d3f38 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,6 +1,5 @@ Name: plexus-compiler -Epoch: 0 Version: 2.8.2 Release: 2%{?dist} Summary: Compiler call initiators for Plexus From cd738acee64ecad40ea6d4a5a32f12e3407dbdb7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 21:23:37 +0200 Subject: [PATCH 03/10] Update to upstream version 2.8.5 --- .gitignore | 1 + plexus-compiler.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8064b71..1405854 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz /plexus-compiler-2.7.tar.gz /plexus-compiler-2.8.1.tar.gz /plexus-compiler-2.8.2.tar.gz +/plexus-compiler-2.8.5.tar.gz diff --git a/plexus-compiler.spec b/plexus-compiler.spec index b2d3f38..26f74a8 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,7 +1,6 @@ - Name: plexus-compiler -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.5 +Release: 1%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -91,6 +90,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Mon May 13 2019 Mikolaj Izdebski - 2.8.5-1 +- Update to upstream version 2.8.5 + * Fri Feb 09 2018 Fedora Release Engineering - 0:2.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 7e34ea2..e3e10fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-compiler-2.8.2.tar.gz) = 2d1555a1b344a34f613d2ca6f80a074ab6f9ea28408e908964a1f0de3403dd3a6687da80c2f6107a2f3278c65c2b3c545b7a706ed04c462b34cb6933b9576a9f +SHA512 (plexus-compiler-2.8.5.tar.gz) = d53cc996cc86347f2bf95b28d9b6d41e9b6f9d784b929237d5ecbf65fad4843ed734f5280bc9f96b2de3831f2dc422ec682c886301275061cea7fe743dcdf656 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From b8243f2f00d2c70b79a3300868a171971570a194 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 21:31:24 +0200 Subject: [PATCH 04/10] Remove execution of animal-sniffer-maven-plugin --- plexus-compiler.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 26f74a8..94f2e59 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -72,6 +72,7 @@ cp %{SOURCE2} LICENSE.MIT %pom_xpath_remove "pom:dependency[pom:artifactId[text()='plexus-compiler-test']]" plexus-compilers %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin %build # Tests are skipped because of unavailable plexus-compiler-test artifact From 9e12123b07862bb81dd6d3d51b7a8496653766ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:30 +0200 Subject: [PATCH 05/10] Mass rebuild for javapackages-tools 201901 --- plexus-compiler.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 94f2e59..bf89816 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,6 +1,6 @@ Name: plexus-compiler Version: 2.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -91,6 +91,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.8.5-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 2.8.5-1 - Update to upstream version 2.8.5 From 43d64bc9c0a46369a4e494b217a26e382dfa17c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 06/10] Remove unneeded %dir --- plexus-compiler.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index bf89816..9966f4d 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -82,7 +82,6 @@ cp %{SOURCE2} LICENSE.MIT %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE LICENSE.MIT %files extras -f .mfiles-extras %files pom -f .mfiles-pom From 2388113fb88a694edc5e915112e8106614cb9aca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 07/10] Mass rebuild for javapackages-tools 201902 --- plexus-compiler.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 9966f4d..7f3d6e2 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,6 +1,6 @@ Name: plexus-compiler Version: 2.8.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -90,6 +90,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.8.5-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 2.8.5-2 - Mass rebuild for javapackages-tools 201901 From 75d1b8c1f64a998424805f1048f4c3824a551f41 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 09:48:14 +0200 Subject: [PATCH 08/10] Update to upstream version 2.8.8 --- .gitignore | 1 + plexus-compiler.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1405854..4903943 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz /plexus-compiler-2.8.1.tar.gz /plexus-compiler-2.8.2.tar.gz /plexus-compiler-2.8.5.tar.gz +/plexus-compiler-2.8.8.tar.gz diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 7f3d6e2..75a6506 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,6 +1,6 @@ Name: plexus-compiler -Version: 2.8.5 -Release: 3%{?dist} +Version: 2.8.8 +Release: 1%{?dist} Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT @@ -18,7 +18,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - %description Plexus Compiler adds support for using various compilers from a unified api. Support for javac is available in main package. For @@ -50,6 +49,8 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +find -name '.class' -delete + cp %{SOURCE1} LICENSE cp %{SOURCE2} LICENSE.MIT @@ -73,6 +74,9 @@ cp %{SOURCE2} LICENSE.MIT %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep -r org.codehaus.plexus:plexus-compiler-javac-errorprone %build # Tests are skipped because of unavailable plexus-compiler-test artifact @@ -90,6 +94,9 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog +* Fri Sep 11 2020 Marian Koncek - 2.8.8-1 +- Update to upstream version 2.8.8 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.8.5-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index e3e10fb..be89467 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-compiler-2.8.5.tar.gz) = d53cc996cc86347f2bf95b28d9b6d41e9b6f9d784b929237d5ecbf65fad4843ed734f5280bc9f96b2de3831f2dc422ec682c886301275061cea7fe743dcdf656 +SHA512 (plexus-compiler-2.8.8.tar.gz) = ee73634b203de06d29ac8f1af594e73f29ac209ff9e7712bd4c520fcbfb5257d31105cd8576d1f9ac1513159e4c69725bf760830358979efccb1e22834affc3c SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 4bf772396deb1c1ef665fb28494422cb69fe4272 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- plexus-compiler.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 75a6506..b672913 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-compiler Version: 2.8.8 Release: 1%{?dist} @@ -13,10 +15,14 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Plexus Compiler adds support for using various compilers from a From b757100c695a17a4945ead27fa79e91958ac6ec4 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 --- plexus-compiler.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index b672913..26753e3 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-compiler Version: 2.8.8