Fridrich Strba 2018-07-10 13:04:27 +00:00 committed by Git OBS Bridge
parent 45ce47709a
commit 21bcc33b0b
3 changed files with 21 additions and 0 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 10 13:02:58 UTC 2018 - fstrba@suse.com
- Added patch:
* commons-collections-jdk11.patch
+ resolve ambiguity with toArray(null)
+ fixes tests with jdk11
-------------------------------------------------------------------
Tue May 15 07:37:07 UTC 2018 - fstrba@suse.com

View File

@ -34,6 +34,7 @@ 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
Patch5: commons-collections-jdk11.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
@ -101,6 +102,7 @@ find . -name "*.class" -exec rm -f {} \;
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Substitute version into testframework pom
cp -p %{SOURCE1} pom-testframework.xml

View File

@ -0,0 +1,11 @@
--- commons-collections-3.2.2-src/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java 2015-11-12 23:25:16.000000000 +0100
+++ commons-collections-3.2.2-src/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java 2018-07-10 14:58:06.116528850 +0200
@@ -1116,7 +1116,7 @@
verify();
try {
- array = collection.toArray(null);
+ array = collection.toArray((Object[])null);
fail("toArray(null) should raise NPE");
} catch (NullPointerException e) {
// expected