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

Accepting request 521994 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/521994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-logging?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:19:10 +00:00 committed by Git OBS Bridge
commit adca6722fc
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-commons-logging.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 7 12:07:36 UTC 2017 - fstrba@suse.com
- Added patch:
* commons-logging-1.2-sourcetarget.patch
- set java source and target versions to 1.6 in order to allow
build with jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com

2
apache-commons-logging.spec
View File

@ -31,6 +31,7 @@ Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n
Source2: apache-commons-logging.keyring Source2: apache-commons-logging.keyring
Source3: http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom Source3: http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
Patch0: commons-logging-1.1.3-src-junit.diff Patch0: commons-logging-1.1.3-src-junit.diff
Patch1: commons-logging-1.2-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: apache-commons-parent BuildRequires: apache-commons-parent
@ -61,6 +62,7 @@ logging implementation.
%prep %prep
%setup -q -n %{short_name}-%{version}-src %setup -q -n %{short_name}-%{version}-src
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework %pom_remove_dep :avalon-framework

15
commons-logging-1.2-sourcetarget.patch Normal file
View File

@ -0,0 +1,15 @@
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200
+++ commons-logging-1.2-src/build.xml 2017-09-07 14:05:10.680439161 +0200
@@ -130,10 +130,10 @@
<!-- ========== Compiler Defaults ========================================= -->
<!-- Version of java class files to generate. -->
- <property name="target.version" value="1.2"/>
+ <property name="target.version" value="1.6"/>
<!-- Version of java source to accept -->
- <property name="source.version" value="1.2"/>
+ <property name="source.version" value="1.6"/>
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>