Accepting request 1120329 from Java:packages

source/target 8 == fix build with jdk 21

OBS-URL: https://build.opensuse.org/request/show/1120329
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-cipher?expand=0&rev=4

plexus-cipher-build.xml

@@ -15,7 +15,8 @@
   <property name="project.url" value="https://github.com/codehaus-plexus/plexus-cipher"/>
   <property name="project.organization.name" value="Sonatype, Inc."/>
 
-  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -53,6 +54,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"

plexus-cipher.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 25 15:16:02 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
 -------------------------------------------------------------------
 Thu Jan 13 17:22:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

plexus-cipher.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-cipher
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,11 +28,9 @@ Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.7
+BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  sisu-inject
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
 BuildArch:      noarch
 
 %description
@@ -52,30 +50,31 @@ cp %{SOURCE1} build.xml
 # replace %{version}-SNAPSHOT with %{version}
 %pom_xpath_set pom:project/pom:version %{version}
 
-%pom_remove_parent .
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>"
-%pom_change_dep -r -f ::::: :::::
-
-%mvn_file : plexus/%{name}
-
 %build
 mkdir -p lib
 build-jar-repository -s lib atinject org.eclipse.sisu.inject
 
-%ant compile
+%{ant} compile
-%ant jar javadoc
+%{ant} jar javadoc
-
-%mvn_artifact pom.xml target/%{name}-%{version}.jar
-%mvn_alias :{*} org.sonatype.plexus:@1
 
 %install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/plexus
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/%{name}.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/%{name}.pom
+%add_maven_depmap plexus/%{name}.pom plexus/%{name}.jar -a org.sonatype.plexus:%{name}
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
 %license LICENSE.txt NOTICE.txt
 
 %changelog