Accepting request 1143038 from Java:packages

2.14.2

OBS-URL: https://build.opensuse.org/request/show/1143038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-compiler?expand=0&rev=6

plexus-compiler-2.13.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbe912b4a4dd9508c01aab01dbb171a6c643d003dcc326fafba7452835bbeee0
-size 97555

plexus-compiler.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Jan 31 12:43:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 
@@ -45,12 +69,6 @@ Wed Sep 20 05:18:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>
   * 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 <fstrba@suse.com>
 

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,15 +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
+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)
+BuildRequires:  sisu-inject
+BuildRequires:  sisu-plexus
+BuildRequires:  slf4j
 BuildArch:      noarch
 
 %description
@@ -48,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
@@ -81,23 +77,20 @@ cp %{SOURCE2} LICENSE.MIT
 
 %pom_change_dep org.codehaus.plexus:plexus-testing :::test plexus-compilers/plexus-compiler-eclipse
 
-%pom_remove_plugin :maven-site-plugin
+%pom_remove_dep -r :plexus-xml
 
-for i in plexus-compiler-api plexus-compiler-manager plexus-compiler-test \
+%pom_remove_plugin :maven-site-plugin
-         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>%{version}</version><groupId>org.codehaus.plexus</groupId>" ${i}
-done
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus/classworlds \
+build-jar-repository -s lib \
-  plexus-containers/plexus-container-default \
+  atinject \
-  plexus-containers/plexus-component-annotations \
+  ecj \
-  plexus-metadata-generator objectweb-asm/asm \
+  org.eclipse.sisu.inject \
-  jdom2/jdom2 commons-cli qdox plexus/cli guava/guava xbean/xbean-reflect \
+  org.eclipse.sisu.plexus \
-  ecj
+  plexus/utils \
+  slf4j/api
+
 # Tests are skipped because of unavailable plexus-compiler-test artifact
 %{ant} \
   -Dtest.skip=true \
@@ -107,8 +100,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-csharp \
-		 plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do
+    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
 
@@ -116,23 +110,24 @@ 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})
-  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
+    plexus-compilers/plexus-compiler-javac; 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
 
 # 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-javac plexus-compilers/plexus-compiler-j2objc; do
+    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