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