From bc28d7c3327e74334b9781ba308ca6b9e2337579165be3efc10a022316916158 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:31:36 +0000 Subject: [PATCH 1/5] Accepting request 1114376 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114376 OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=18 --- plexus-compiler.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 400380e..ad6a485 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -30,13 +30,12 @@ Source100: %{name}-build.tar.xz BuildRequires: ant BuildRequires: ecj BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils -Requires: mvn(org.codehaus.plexus:plexus-utils) BuildArch: noarch %description @@ -83,13 +82,6 @@ cp %{SOURCE2} LICENSE.MIT %pom_remove_plugin :maven-site-plugin -for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \ - plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ - plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do - %pom_remove_parent ${i} - %pom_xpath_inject "pom:project" "%{version}org.codehaus.plexus" ${i} -done - %build mkdir -p lib build-jar-repository -s lib plexus/utils plexus/classworlds \ @@ -118,14 +110,14 @@ install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} for i in plexus-compilers/plexus-compiler-csharp \ plexus-compilers/plexus-compiler-eclipse; do bsnm=$(basename ${i}) - install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras done # These ones end-up in the main package for i in plexus-compiler-api plexus-compiler-manager \ plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do bsnm=$(basename ${i}) - install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar done From edbf73bb29982f9a2982a19fca91d33428851c08a6104843094a388e55957713 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 Jan 2024 12:11:02 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=19 --- plexus-compiler-2.13.0.tar.gz | 3 --- plexus-compiler-2.14.2.tar.gz | 3 +++ plexus-compiler-build.tar.xz | 4 ++-- plexus-compiler.spec | 43 ++++++++++++++++++----------------- 4 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 plexus-compiler-2.13.0.tar.gz create mode 100644 plexus-compiler-2.14.2.tar.gz diff --git a/plexus-compiler-2.13.0.tar.gz b/plexus-compiler-2.13.0.tar.gz deleted file mode 100644 index b048759..0000000 --- a/plexus-compiler-2.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbe912b4a4dd9508c01aab01dbb171a6c643d003dcc326fafba7452835bbeee0 -size 97555 diff --git a/plexus-compiler-2.14.2.tar.gz b/plexus-compiler-2.14.2.tar.gz new file mode 100644 index 0000000..6177e1f --- /dev/null +++ b/plexus-compiler-2.14.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20631bf6c5464c69342c1588070b09e6a4b2803eba22e8e558b6445e5c33e5e8 +size 94831 diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz index 4a90f9a..8cb793e 100644 --- a/plexus-compiler-build.tar.xz +++ b/plexus-compiler-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5076e6a5139a00996485213ca3fb6e1c0b185f0b7e2a4648e331967c400cd23c -size 3384 +oid sha256:b3e8876b514f5ed61f8214a2d035344e0c5b9de2e536c1e0a336be0f100d3725 +size 3344 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index ad6a485..d3604de 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-compiler # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: plexus-compiler -Version: 2.13.0 +Version: 2.14.2 Release: 0 Summary: Compiler call initiators for Plexus License: Apache-2.0 AND MIT @@ -28,14 +28,14 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT Source100: %{name}-build.tar.xz BuildRequires: ant +BuildRequires: atinject BuildRequires: ecj BuildRequires: fdupes BuildRequires: javapackages-local >= 6 -BuildRequires: plexus-classworlds -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +BuildRequires: sisu-inject +BuildRequires: sisu-plexus +BuildRequires: slf4j BuildArch: noarch %description @@ -47,9 +47,6 @@ additional compilers see %{name}-extras package. Summary: Extra compiler support for %{name} License: Apache-2.0 Group: Development/Libraries/Java -Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} -Requires: mvn(org.codehaus.plexus:plexus-utils) -Requires: mvn(org.eclipse.jdt:ecj) %description extras Additional support for csharp, eclipse and jikes compilers @@ -84,12 +81,14 @@ cp %{SOURCE2} LICENSE.MIT %build mkdir -p lib -build-jar-repository -s lib plexus/utils plexus/classworlds \ - plexus-containers/plexus-container-default \ - plexus-containers/plexus-component-annotations \ - plexus-metadata-generator objectweb-asm/asm \ - jdom2/jdom2 commons-cli qdox plexus/cli guava/guava xbean/xbean-reflect \ - ecj +build-jar-repository -s lib \ + atinject \ + ecj \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + plexus/utils \ + slf4j/api + # Tests are skipped because of unavailable plexus-compiler-test artifact %{ant} \ -Dtest.skip=true \ @@ -99,8 +98,9 @@ build-jar-repository -s lib plexus/utils plexus/classworlds \ # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} for i in plexus-compiler-api plexus-compiler-manager \ - plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ - plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-csharp \ + plexus-compilers/plexus-compiler-eclipse \ + plexus-compilers/plexus-compiler-javac; do install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar done @@ -108,14 +108,14 @@ done install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} # These ones belong to the *-extras package for i in plexus-compilers/plexus-compiler-csharp \ - plexus-compilers/plexus-compiler-eclipse; do + plexus-compilers/plexus-compiler-eclipse; do bsnm=$(basename ${i}) %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras done # These ones end-up in the main package for i in plexus-compiler-api plexus-compiler-manager \ - plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac; do bsnm=$(basename ${i}) %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar @@ -123,8 +123,9 @@ done # javadoc for i in plexus-compiler-api plexus-compiler-manager \ - plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ - plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac \ + plexus-compilers/plexus-compiler-csharp \ + plexus-compilers/plexus-compiler-eclipse; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done From 1200461f90c3436d2158aa0834f569b2d8e18a15003abe3c06a5ae50afb8d1fb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 Jan 2024 12:27:19 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=20 --- plexus-compiler.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index d3604de..974b46e 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -77,6 +77,8 @@ cp %{SOURCE2} LICENSE.MIT %pom_change_dep org.codehaus.plexus:plexus-testing :::test plexus-compilers/plexus-compiler-eclipse +%pom_remove_dep -r :plexus-xml + %pom_remove_plugin :maven-site-plugin %build From 4c28ecc965ee40389cc5d6c859f48e72e142915657a6b9020d724d5ecde91fd6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 Jan 2024 13:48:58 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=21 --- plexus-compiler.changes | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/plexus-compiler.changes b/plexus-compiler.changes index 03a61f5..fbf39fd 100644 --- a/plexus-compiler.changes +++ b/plexus-compiler.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Jan 31 12:43:57 UTC 2024 - Fridrich Strba + +- Upgrade to upstream release 2.14.2 + * Removed + + Drop J2ObjC compiler + * New features and improvements + + Update AspectJ Compiler to 1.9.21 to support Java 21 + + Require JDK 17 for build + + Improve locking on JavacCompiler + + Include 'parameter' and 'preview' describe log + + Switch to SISU annotations and plugin, fixes #217 + + Support jdk 21 + + Require Maven 3.5.4+ + + Require Java 11 for plexus-compiler-eclipse an + javac-errorprone and aspectj compilers + + Add support to run its with Java 20 + * Bug Fixes + + Fix javac memory leak + + Validate zip file names before extracting (Zip Slip) + + Restore AbstractCompiler#getLogger() method + + Return empty list for not existing source root location + + Improve javac error output parsing - Fix #336 + ------------------------------------------------------------------- Wed Sep 20 05:18:46 UTC 2023 - Fridrich Strba From 4a38008416ea1c9ef8f8e86826fe5ab583c7656c40264e922f322ebc64c82b45 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 Jan 2024 13:50:19 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=22 --- plexus-compiler.changes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plexus-compiler.changes b/plexus-compiler.changes index fbf39fd..5c12f0a 100644 --- a/plexus-compiler.changes +++ b/plexus-compiler.changes @@ -69,12 +69,6 @@ Wed Sep 20 05:18:46 UTC 2023 - Fridrich Strba * Build + use shared release drafter - Bump maven-surefire-plugin from 3.0.0-M5 to 3.0.0-M6 - Bump error_prone_core from 2.11.0 to 2.13.1 - Bump github/codeql-action from 1 to 2 - Bump ecj from 3.28.0 to 3.29.0 - Bump release-drafter/release-drafter from 5.18.1 to 5.19.0 - ------------------------------------------------------------------- Sat May 21 19:49:23 UTC 2022 - Fridrich Strba