diff --git a/_service b/_service index 4d8813b..da21d1f 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/codehaus-plexus/plexus-languages.git - plexus-languages-1.1.1 + plexus-languages-1.2.0 plexus-languages-* @PARENT_TAG@ plexus-languages-(.*) diff --git a/plexus-java-build.xml b/plexus-java-build.xml index ca0f80d..8f0a05f 100644 --- a/plexus-java-build.xml +++ b/plexus-java-build.xml @@ -10,9 +10,10 @@ - + - + + @@ -34,16 +35,11 @@ - - diff --git a/plexus-languages-1.1.1.tar.xz b/plexus-languages-1.1.1.tar.xz deleted file mode 100644 index 4d8c705..0000000 --- a/plexus-languages-1.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f52f7ecb514bdbfaff2d7b44401220d4e6710f0562c1fd8a1296fd056a62550 -size 431264 diff --git a/plexus-languages-1.2.0.tar.xz b/plexus-languages-1.2.0.tar.xz new file mode 100644 index 0000000..b70a9b7 --- /dev/null +++ b/plexus-languages-1.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1e126f51bfe6955bb527ae5249f2ec80b7ba7a1cb1a39679ba5441eb62bd5b2 +size 433572 diff --git a/plexus-languages-atinject.patch b/plexus-languages-atinject.patch new file mode 100644 index 0000000..c7f8ebd --- /dev/null +++ b/plexus-languages-atinject.patch @@ -0,0 +1,10 @@ +--- plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:25.596880353 +0200 ++++ plexus-languages-1.1.1/plexus-java/src/main/java9/module-info.java 2024-04-10 11:00:57.827095904 +0200 +@@ -20,6 +20,7 @@ + { + requires com.thoughtworks.qdox; + requires org.objectweb.asm; ++ requires java.inject; + + exports org.codehaus.plexus.languages.java.jpms; + exports org.codehaus.plexus.languages.java.version; diff --git a/plexus-languages.changes b/plexus-languages.changes index b8ffa0e..cae77cc 100644 --- a/plexus-languages.changes +++ b/plexus-languages.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Apr 29 11:45:22 UTC 2024 - Fridrich Strba + +- The binaries are compatible with java 1.8 + +------------------------------------------------------------------- +Wed Apr 10 09:14:52 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 1.2.0 + * Changes: + + Fail on duplicate modules on the module path + + Add java bytecode class file version detection + + Fix badge in README + * Documentation updates + + Fix typo module (#125) @Thihup + + Fix scm protocol + +------------------------------------------------------------------- +Wed Apr 10 09:07:44 UTC 2024 - Fridrich Strba + +- Added patch: + * plexus-languages-atinject.patch + + Fix against multirelease version of atinject + ------------------------------------------------------------------- Sat Mar 12 07:26:31 UTC 2022 - Fridrich Strba diff --git a/plexus-languages.spec b/plexus-languages.spec index 0975afa..935646c 100644 --- a/plexus-languages.spec +++ b/plexus-languages.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-languages # -# Copyright (c) 2022 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 @@ -16,8 +16,11 @@ # +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless Name: plexus-languages -Version: 1.1.1 +Version: 1.2.0 Release: 0 Summary: Plexus Languages License: Apache-2.0 @@ -26,18 +29,17 @@ URL: https://github.com/codehaus-plexus/plexus-languages Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source100: plexus-java-build.xml +Patch0: plexus-languages-atinject.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes BuildRequires: java-devel >= 9 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: objectweb-asm BuildRequires: plexus-containers-component-annotations BuildRequires: qdox >= 2 BuildRequires: sisu-inject -Requires: java >= 1.7 -Requires: mvn(com.thoughtworks.qdox:qdox) -Requires: mvn(org.ow2.asm:asm) +Requires: java-headless >= 1.8 BuildArch: noarch %description @@ -53,6 +55,7 @@ API documentation for %{name}. %prep %setup -q +%patch -P 0 -p1 cp %{SOURCE1} . cp %{SOURCE100} plexus-java/build.xml @@ -74,9 +77,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 plexus-java/target/plexus-java-%{version}.jar %{buildroot}%{_javadir}/%{name}/plexus-java.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom -install -pm 0644 plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom +%{mvn_install_pom} plexus-java/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/plexus-java.pom %add_maven_depmap %{name}/plexus-java.pom %{name}/plexus-java.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/plexus-java