From 52a44e5ad2b51355a60d8d40d71c21015cf4dafe32677dc4bd8387930516b661 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 09:51:32 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=4 --- plexus-compiler-2.11.1.tar.gz | 3 +++ plexus-compiler-build.tar.xz | 4 ++-- plexus-compiler.spec | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 plexus-compiler-2.11.1.tar.gz diff --git a/plexus-compiler-2.11.1.tar.gz b/plexus-compiler-2.11.1.tar.gz new file mode 100644 index 0000000..1986437 --- /dev/null +++ b/plexus-compiler-2.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa7b09904a2e95deafaa2f0370679738da5f007b38e39627ddfbfd0eea6d061 +size 96692 diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz index c99dc7f..2890fe7 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:32d357b46f0282c1a25e6291eaa110df071b755e47216a8be6a5b6598f4d9764 -size 3408 +oid sha256:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095 +size 3456 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index cf0c10d..e96554a 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-compiler # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: plexus-compiler -Version: 2.8.2 +Version: 2.11.1 Release: 0 Summary: Compiler call initiators for Plexus # extras subpackage has a bit different licensing # parts of compiler-api are ASL2.0/MIT -License: MIT AND Apache-2.0 +License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-compiler Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz @@ -34,6 +34,7 @@ BuildRequires: ecj BuildRequires: fdupes BuildRequires: javapackages-local BuildRequires: plexus-classworlds +BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils @@ -47,10 +48,7 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ -# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java -# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java -License: MIT AND Apache-2.0 AND Apache-1.1 +License: Apache-2.0 Group: Development/Libraries/Java Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} Requires: mvn(org.codehaus.plexus:plexus-utils) @@ -61,7 +59,7 @@ Additional support for csharp, eclipse and jikes compilers %package javadoc Summary: Javadoc for %{name} -License: MIT AND Apache-2.0 AND Apache-1.1 +License: Apache-1.1 AND Apache-2.0 AND MIT Group: Documentation/HTML %description javadoc @@ -87,15 +85,19 @@ cp %{SOURCE2} LICENSE.MIT 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + 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 plexus-containers/plexus-container-default ecj +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 # Tests are skipped because of unavailable plexus-compiler-test artifact %{ant} \ -Dtest.skip=true \ @@ -106,16 +108,15 @@ build-jar-repository -s lib plexus/utils plexus/classworlds plexus-containers/pl 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar done # poms 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 \ - plexus-compilers/plexus-compiler-jikes; do +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 %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras @@ -131,8 +132,7 @@ 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done From 9d3787701bc98dab27fdbf1f1684e52604bd610073a2f8e94f200f0fa3b1bceb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 10:07:08 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=5 --- plexus-compiler-2.11.1.tar.gz | 3 --- plexus-compiler-build.tar.xz | 4 ++-- plexus-compiler.spec | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 plexus-compiler-2.11.1.tar.gz diff --git a/plexus-compiler-2.11.1.tar.gz b/plexus-compiler-2.11.1.tar.gz deleted file mode 100644 index 1986437..0000000 --- a/plexus-compiler-2.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:daa7b09904a2e95deafaa2f0370679738da5f007b38e39627ddfbfd0eea6d061 -size 96692 diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz index 2890fe7..c99dc7f 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:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095 -size 3456 +oid sha256:32d357b46f0282c1a25e6291eaa110df071b755e47216a8be6a5b6598f4d9764 +size 3408 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index e96554a..607d482 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -20,8 +20,6 @@ Name: plexus-compiler Version: 2.11.1 Release: 0 Summary: Compiler call initiators for Plexus -# extras subpackage has a bit different licensing -# parts of compiler-api are ASL2.0/MIT License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-compiler From e3f35d58fc14b32572629fdfe0da9a28727838bde09657a3a52c2c68a1fdbeaa Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 15:41:04 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=6 --- plexus-compiler-2.8.8.tar.gz | 3 +++ plexus-compiler-build.tar.xz | 4 ++-- plexus-compiler.spec | 22 +++++++++++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 plexus-compiler-2.8.8.tar.gz diff --git a/plexus-compiler-2.8.8.tar.gz b/plexus-compiler-2.8.8.tar.gz new file mode 100644 index 0000000..bdde011 --- /dev/null +++ b/plexus-compiler-2.8.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c208cb22e0102c529c2851df6c94688fba3318c4954f12616645d6281d75c90 +size 91627 diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz index c99dc7f..1634265 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:32d357b46f0282c1a25e6291eaa110df071b755e47216a8be6a5b6598f4d9764 -size 3408 +oid sha256:ca3f261c2ae42ff83deea281665bf5385848beb0976232645cda74b2c1c457de +size 3528 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 607d482..b39cf34 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -17,9 +17,11 @@ Name: plexus-compiler -Version: 2.11.1 +Version: 2.8.8 Release: 0 Summary: Compiler call initiators for Plexus +# extras subpackage has a bit different licensing +# parts of compiler-api are ASL2.0/MIT License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-compiler @@ -46,7 +48,10 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -License: Apache-2.0 +# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ +# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java +# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java +License: Apache-1.1 AND Apache-2.0 AND MIT Group: Development/Libraries/Java Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} Requires: mvn(org.codehaus.plexus:plexus-utils) @@ -83,7 +88,8 @@ cp %{SOURCE2} LICENSE.MIT 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 + plexus-compilers/plexus-compiler-jikes 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 @@ -106,15 +112,16 @@ build-jar-repository -s lib plexus/utils plexus/classworlds \ 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-jikes plexus-compilers/plexus-compiler-javac \ + plexus-compilers/plexus-compiler-j2objc; do install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar done # poms 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 +for i in plexus-compilers/plexus-compiler-csharp plexus-compilers/plexus-compiler-eclipse \ + plexus-compilers/plexus-compiler-jikes; do bsnm=$(basename ${i}) install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$bsnm.pom %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras @@ -130,7 +137,8 @@ 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-jikes plexus-compilers/plexus-compiler-javac \ + plexus-compilers/plexus-compiler-j2objc; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done From afdf4e6ed872d2a914e53a2a2a50bcc6fb310659e8856b85f4b918bdd014c4b5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Mar 2022 15:44:32 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=7 --- plexus-compiler-2.11.1.tar.gz | 3 +++ plexus-compiler-2.8.8.tar.gz | 3 --- plexus-compiler-build.tar.xz | 4 ++-- plexus-compiler.spec | 22 +++++++--------------- 4 files changed, 12 insertions(+), 20 deletions(-) create mode 100644 plexus-compiler-2.11.1.tar.gz delete mode 100644 plexus-compiler-2.8.8.tar.gz diff --git a/plexus-compiler-2.11.1.tar.gz b/plexus-compiler-2.11.1.tar.gz new file mode 100644 index 0000000..1986437 --- /dev/null +++ b/plexus-compiler-2.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa7b09904a2e95deafaa2f0370679738da5f007b38e39627ddfbfd0eea6d061 +size 96692 diff --git a/plexus-compiler-2.8.8.tar.gz b/plexus-compiler-2.8.8.tar.gz deleted file mode 100644 index bdde011..0000000 --- a/plexus-compiler-2.8.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c208cb22e0102c529c2851df6c94688fba3318c4954f12616645d6281d75c90 -size 91627 diff --git a/plexus-compiler-build.tar.xz b/plexus-compiler-build.tar.xz index 1634265..2890fe7 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:ca3f261c2ae42ff83deea281665bf5385848beb0976232645cda74b2c1c457de -size 3528 +oid sha256:d1c62ddd3528f3226d2906174181b1064ef0e5a02189a2c65015858331721095 +size 3456 diff --git a/plexus-compiler.spec b/plexus-compiler.spec index b39cf34..607d482 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -17,11 +17,9 @@ Name: plexus-compiler -Version: 2.8.8 +Version: 2.11.1 Release: 0 Summary: Compiler call initiators for Plexus -# extras subpackage has a bit different licensing -# parts of compiler-api are ASL2.0/MIT License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-compiler @@ -48,10 +46,7 @@ additional compilers see %{name}-extras package. %package extras Summary: Extra compiler support for %{name} -# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/ -# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java -# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java -License: Apache-1.1 AND Apache-2.0 AND MIT +License: Apache-2.0 Group: Development/Libraries/Java Requires: mvn(org.codehaus.plexus:plexus-compiler-api) = %{version} Requires: mvn(org.codehaus.plexus:plexus-utils) @@ -88,8 +83,7 @@ cp %{SOURCE2} LICENSE.MIT 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + 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 @@ -112,16 +106,15 @@ build-jar-repository -s lib plexus/utils plexus/classworlds \ 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do install -pm 0644 ${i}/target/$(basename ${i})-%{version}.jar %{buildroot}%{_javadir}/%{name}/$(basename ${i}).jar done # poms 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 \ - plexus-compilers/plexus-compiler-jikes; do +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 %add_maven_depmap %{name}/$bsnm.pom %{name}/$bsnm.jar -f extras @@ -137,8 +130,7 @@ 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-jikes plexus-compilers/plexus-compiler-javac \ - plexus-compilers/plexus-compiler-j2objc; do + plexus-compilers/plexus-compiler-javac plexus-compilers/plexus-compiler-j2objc; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr ${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done From 340abf863b46bda2d11600e60e029bf31f2a87f7f8c9690045751a43fd52dc3c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 12 Mar 2022 09:35:56 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-compiler?expand=0&rev=8 --- plexus-compiler.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plexus-compiler.changes b/plexus-compiler.changes index d820cbe..46699be 100644 --- a/plexus-compiler.changes +++ b/plexus-compiler.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Mar 12 09:32:05 UTC 2022 - Fridrich Strba + +- Upgrade to upstream release 2.11.1 + * needed by the latest maven-compiler-plugin +- Rewrite the plexus metadata generation in the ant build files + * it is now possible to give it an ad-hoc classpath to look for + dependencies + ------------------------------------------------------------------- Fri Mar 29 05:48:03 UTC 2019 - Fridrich Strba