Fridrich Strba 2017-12-18 09:39:52 +00:00 committed by Git OBS Bridge
parent a04462275e
commit 28ae12a1a5
3 changed files with 26 additions and 0 deletions

15
junit-jdk10.patch Normal file
View File

@ -0,0 +1,15 @@
diff -urEbwB junit-r4.11/src/test/java/org/junit/tests/running/core/MainRunner.java junit-r4.11/src/test/java/org/junit/tests/running/core/MainRunner.java
--- junit-r4.11/src/test/java/org/junit/tests/running/core/MainRunner.java 2012-11-13 21:10:09.000000000 +0100
+++ junit-r4.11/src/test/java/org/junit/tests/running/core/MainRunner.java 2017-12-18 10:32:05.822083468 +0100
@@ -40,11 +40,6 @@
}
@Override
- public boolean getInCheck() {
- return (originalSecurityManager != null) && originalSecurityManager.getInCheck();
- }
-
- @Override
public Object getSecurityContext() {
return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext();
}

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Dec 18 09:34:48 UTC 2017 - fstrba@suse.com
- Added patch:
* junit-jdk10.patch
+ Remove a function getInCheck from NoExitSecurityManager,
since it does not exist in the extended class in jdk10 and is
deprecated in previous versions
-------------------------------------------------------------------
Fri Sep 8 08:42:24 UTC 2017 - fstrba@suse.com

View File

@ -31,6 +31,7 @@ Patch0: junit-no-hamcrest-src.patch
#PATCH-FIX-UPSTREAM: build with jdk8 and newer, already in upstream repo
Patch1: junit-jdk8.patch
Patch2: junit-jdk9.patch
Patch3: junit-jdk10.patch
BuildRequires: ant
BuildRequires: hamcrest >= 1.3
BuildRequires: java-devel >= 1.6.0
@ -85,6 +86,7 @@ Demos for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf