Port to OpenJDK 11
This commit is contained in:
parent
c969ecc87f
commit
0404defbd6
25
0002-Port-to-OpenJDK-11.patch
Normal file
25
0002-Port-to-OpenJDK-11.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 085b289c17f7047f4350d52bf594313392ae0caa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marian Koncek <mkoncek@redhat.com>
|
||||||
|
Date: Thu, 31 Oct 2019 12:30:12 +0100
|
||||||
|
Subject: [PATCH] Port to OpenJDK 11
|
||||||
|
|
||||||
|
---
|
||||||
|
.../commons/collections/collection/AbstractTestCollection.java | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
||||||
|
index dfde362..8287f33 100644
|
||||||
|
--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
||||||
|
+++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
|
||||||
|
@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject {
|
||||||
|
verify();
|
||||||
|
|
||||||
|
try {
|
||||||
|
- array = collection.toArray(null);
|
||||||
|
+ array = collection.toArray((Object[]) null);
|
||||||
|
fail("toArray(null) should raise NPE");
|
||||||
|
} catch (NullPointerException e) {
|
||||||
|
// expected
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@ -9,6 +9,7 @@ BuildArch: noarch
|
|||||||
Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
|
Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
|
||||||
|
|
||||||
Patch0: 0001-Port-to-Java-8.patch
|
Patch0: 0001-Port-to-Java-8.patch
|
||||||
|
Patch1: 0002-Port-to-OpenJDK-11.patch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
@ -51,6 +52,7 @@ find . -name "*.jar" -exec rm -f {} \;
|
|||||||
find . -name "*.class" -exec rm -f {} \;
|
find . -name "*.class" -exec rm -f {} \;
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
# Fix file eof
|
# Fix file eof
|
||||||
sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
||||||
|
Loading…
Reference in New Issue
Block a user