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

Accepting request 526051 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/526051
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-collections?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2017-09-14 19:18:32 +00:00 committed by Git OBS Bridge
commit 156bc97601
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-commons-collections.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 14 11:07:55 UTC 2017 - fstrba@suse.com
- Fix build with jdk9 by specifying java source and target 1.6
- Added patch:
* commons-collections-3.2.2-tf.javadoc.patch
- Fix unresolved symbols when building tf.javadoc
-------------------------------------------------------------------
Fri May 19 08:49:50 UTC 2017 - tchvatal@suse.com

7
apache-commons-collections.spec
View File

@ -33,6 +33,7 @@ Patch1: commons-collections-3.2-build_xml.patch
Patch2: java8-compat.patch
# PATCH-FIX-UPSTREAM add missing MANIFEST.MF file
Patch3: commons-collections-missing-MF.patch
Patch4: commons-collections-3.2.2-tf.javadoc.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
@ -98,15 +99,17 @@ find . -name "*.class" -exec rm -f {} \;
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# Substitute version into testframework pom
cp -p %{SOURCE1} pom-testframework.xml
sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
%build
export CLASSPATH=$(build-classpath junit)
echo "junit.jar=$(build-classpath junit)" >>build.properties
ant \
-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dant.build.javadoc.source=1.6 \
-Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
%install

13
commons-collections-3.2.2-tf.javadoc.patch Normal file
View File

@ -0,0 +1,13 @@
--- commons-collections-3.2.2-src/build.xml 2017-09-14 12:45:40.626106146 +0200
+++ commons-collections-3.2.2-src/build.xml 2017-09-14 13:04:45.932517074 +0200
@@ -460,6 +460,10 @@
doctitle="${tf.title} ${tf.version} API;"
windowtitle="${tf.title} ${tf.version} API"
bottom="Copyright © 2001-${year} Apache Software Foundation. All Rights Reserved.">
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${junit.jar}"/>
+ </classpath>
<fileset dir="${source.test}">
<include name="**/AbstractTest*.java"/>
<include name="**/BulkTest*.java"/>