OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=25
This commit is contained in:
parent
45ce47709a
commit
21bcc33b0b
@ -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
|
Tue May 15 07:37:07 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@ Patch2: java8-compat.patch
|
|||||||
# PATCH-FIX-UPSTREAM add missing MANIFEST.MF file
|
# PATCH-FIX-UPSTREAM add missing MANIFEST.MF file
|
||||||
Patch3: commons-collections-missing-MF.patch
|
Patch3: commons-collections-missing-MF.patch
|
||||||
Patch4: commons-collections-3.2.2-tf.javadoc.patch
|
Patch4: commons-collections-3.2.2-tf.javadoc.patch
|
||||||
|
Patch5: commons-collections-jdk11.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: apache-commons-parent
|
BuildRequires: apache-commons-parent
|
||||||
@ -101,6 +102,7 @@ find . -name "*.class" -exec rm -f {} \;
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
# Substitute version into testframework pom
|
# Substitute version into testframework pom
|
||||||
cp -p %{SOURCE1} pom-testframework.xml
|
cp -p %{SOURCE1} pom-testframework.xml
|
||||||
|
11
commons-collections-jdk11.patch
Normal file
11
commons-collections-jdk11.patch
Normal 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
|
Loading…
Reference in New Issue
Block a user