Accepting request 1120352 from Java:packages

fix build with jdk 21

OBS-URL: https://build.opensuse.org/request/show/1120352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-dbcp1?expand=0&rev=4

apache-commons-dbcp-sourcetarget.patch

@@ -13,27 +13,29 @@
        <property name="src.java.dir" value="${src.dir}/java"/>
        <property name="src.test.dir" value="${src.dir}/test"/>
 -      <property name="javac.source" value="1.5" />
-+      <property name="javac.source" value="1.7" />
++      <property name="javac.source" value="8" />
-+      <property name="javac.target" value="1.7" />
++      <property name="javac.target" value="8" />
     </target>
  
     <target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
-@@ -194,7 +196,8 @@
+@@ -194,7 +196,9 @@
               debug="${javac.debug}"
               deprecation="${javac.deprecation}"
               optimize="${javac.optimize}"
 -             source="${javac.source}">
 +             source="${javac.source}"
++             release="${javac.target}"
 +             target="${javac.target}">
           <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
               unless="jndi.present"/>
           <exclude name="org/apache/commons/dbcp/datasources/**"
-@@ -211,7 +214,8 @@
+@@ -211,7 +214,9 @@
               debug="${javac.debug}"
               deprecation="${javac.deprecation}"
               optimize="${javac.optimize}"
 -             source="${javac.source}">
 +             source="${javac.source}"
++             release="${javac.target}"
 +             target="${javac.target}">
          <classpath>
            <pathelement location="${build.classes.dir}" /> 

apache-commons-dbcp1.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct 25 16:39:04 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * apache-commons-dbcp-sourcetarget.patch
+    + build with source target levels 8
+    + use "release" with compilers that support it
+
 -------------------------------------------------------------------
 Mon Apr 15 13:38:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

apache-commons-dbcp1.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package apache-commons-dbcp1
+# spec file
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -25,8 +25,8 @@ Summary:        Jakarta Commons DataBase Pooling Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://commons.apache.org/proper/commons-dbcp/
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source100:      http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
+Source100:      https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
 Source101:      commons.keyring
 Patch0:         apache-commons-dbcp-sourcetarget.patch
 Patch1:         apache-commons-dbcp-javadoc.patch
@@ -36,16 +36,13 @@ BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-pool
 BuildRequires:  fdupes
 BuildRequires:  geronimo-jta-1_1-api
-BuildRequires:  java-devel >= 1.7
+BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  jdbc-stdext >= 2.0
 BuildRequires:  junit >= 3.8.1
 BuildRequires:  xerces-j2
-Requires:       commons-collections >= 3.2
-Requires:       commons-pool
-Requires:       jta_api >= 1.1
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(preun):update-alternatives
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
@@ -84,8 +81,6 @@ features.
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-%pom_remove_parent .
-
 %build
 ant \
         -Dcommons-pool.jar=$(build-classpath commons-pool) \
@@ -101,30 +96,20 @@ ant \
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/apache-%{short_name}-%{version}.jar
+install -m 644 dist/%{short_name}.jar %{buildroot}%{_javadir}/apache-%{short_name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
+ln -sf %{_javadir}/apache-%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/apache-%{short_name}-%{version}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/apache-%{short_name}.pom
-%add_maven_depmap apache-%{short_name}-%{version}.pom apache-%{short_name}-%{version}.jar
+%add_maven_depmap apache-%{short_name}.pom apache-%{short_name}.jar
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%files
+%files -f .mfiles
 %license LICENSE.txt
-%{_javadir}/apache-%{short_name}.jar
-%{_javadir}/apache-%{short_name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
-%{_javadir}/%{short_name}-%{version}.jar
-%{_mavenpomdir}/apache-%{short_name}-%{version}.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
 %{_javadocdir}/%{name}