pool/apache-commons-dbcp1
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp1?expand=0&rev=11

Browse Source
This commit is contained in:
Fridrich Strba 2023-10-25 16:40:00 +00:00 committed by Git OBS Bridge
parent c698ca8aee
commit e6a6b54fc8
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apache-commons-dbcp-sourcetarget.patch
View File

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

8
apache-commons-dbcp1.changes
View File

@ -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> Mon Apr 15 13:38:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>

6
apache-commons-dbcp1.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -45,7 +45,7 @@ Requires: commons-collections >= 3.2
Requires: commons-pool Requires: commons-pool
Requires: jta_api >= 1.1 Requires: jta_api >= 1.1
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(preun): update-alternatives Requires(preun):update-alternatives
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
Obsoletes: %{short_name} < %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release}
Provides: jakarta-%{short_name} = %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release}