Accepting request 620743 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-beanutils?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2018-07-07 19:57:59 +00:00 committed by Git OBS Bridge
commit 694ff28f41
3 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue May 15 06:03:11 UTC 2018 - fstrba@suse.com
- Modified patch:
* jdk9.patch
+ Build with source and target 8 to prepare for a possible
removal of 1.6 compatibility
- Run fdupes on documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 14 09:25:26 UTC 2017 - fstrba@suse.com Thu Sep 14 09:25:26 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-beanutils # spec file for package apache-commons-beanutils
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -30,6 +30,7 @@ Patch0: jdk9.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: commons-collections BuildRequires: commons-collections
BuildRequires: commons-logging BuildRequires: commons-logging
BuildRequires: fdupes
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
Requires: commons-collections >= 2.0 Requires: commons-collections >= 2.0
Requires: commons-logging >= 1.0 Requires: commons-logging >= 1.0
@ -87,6 +88,7 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc # javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)

View File

@ -5,11 +5,11 @@
<!-- Compiler source JDK version --> <!-- Compiler source JDK version -->
- <property name="compile.source" value="1.5"/> - <property name="compile.source" value="1.5"/>
+ <property name="compile.source" value="1.6"/> + <property name="compile.source" value="8"/>
<!-- Compiler target JDK version --> <!-- Compiler target JDK version -->
- <property name="compile.target" value="1.5"/> - <property name="compile.target" value="1.5"/>
+ <property name="compile.target" value="1.6"/> + <property name="compile.target" value="8"/>
<!-- Should Java compilations set the 'debug' compiler option? --> <!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/> <property name="compile.debug" value="true"/>