Accepting request 620753 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620753
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-logging?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2018-07-24 15:30:38 +00:00 committed by Git OBS Bridge
commit e8b27232f4
3 changed files with 13 additions and 5 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
- Modified patch:
* commons-logging-1.2-sourcetarget.patch
+ Build with source and target 8 to prepare for a possible
removal of 1.6 compatibility
-------------------------------------------------------------------
Thu Sep 7 12:07:36 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -35,13 +35,13 @@ Patch1: commons-logging-1.2-sourcetarget.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel >= 1.6.0
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
BuildRequires: servletapi5
Requires: java >= 1.6.0
Requires: java >= 1.8
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release}

View File

@ -5,11 +5,11 @@
<!-- Version of java class files to generate. -->
- <property name="target.version" value="1.2"/>
+ <property name="target.version" value="1.6"/>
+ <property name="target.version" value="8"/>
<!-- Version of java source to accept -->
- <property name="source.version" value="1.2"/>
+ <property name="source.version" value="1.6"/>
+ <property name="source.version" value="8"/>
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>