Accepting request 622094 from Java:packages
Fix build with jdk11 OBS-URL: https://build.opensuse.org/request/show/622094 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junit?expand=0&rev=22
This commit is contained in:
commit
2f10dac8f2
49
junit-jdk11.patch
Normal file
49
junit-jdk11.patch
Normal file
@ -0,0 +1,49 @@
|
||||
--- 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 2018-07-11 16:50:47.418496509 +0200
|
||||
@@ -197,11 +197,6 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public boolean checkTopLevelWindow(Object window) {
|
||||
- return (originalSecurityManager == null) ? super.checkTopLevelWindow(window) : originalSecurityManager.checkTopLevelWindow(window);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
public void checkPrintJobAccess() {
|
||||
if (originalSecurityManager != null) {
|
||||
originalSecurityManager.checkPrintJobAccess();
|
||||
@@ -209,20 +204,6 @@
|
||||
}
|
||||
|
||||
@Override
|
||||
- public void checkSystemClipboardAccess() {
|
||||
- if (originalSecurityManager != null) {
|
||||
- originalSecurityManager.checkSystemClipboardAccess();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void checkAwtEventQueueAccess() {
|
||||
- if (originalSecurityManager != null) {
|
||||
- originalSecurityManager.checkAwtEventQueueAccess();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
public void checkPackageAccess(String pkg) {
|
||||
if (originalSecurityManager != null) {
|
||||
originalSecurityManager.checkPackageAccess(pkg);
|
||||
@@ -243,13 +224,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- @Override
|
||||
- public void checkMemberAccess(Class<?> clazz, int which) {
|
||||
- if (originalSecurityManager != null) {
|
||||
- originalSecurityManager.checkMemberAccess(clazz, which);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
@Override
|
||||
public void checkSecurityAccess(String target) {
|
||||
if (originalSecurityManager != null) {
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 11 14:52:48 UTC 2018 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* junit-jdk11.patch
|
||||
+ Fix build with jdk11
|
||||
+ Don't override removed SecurityManager methods
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 18 15:40:52 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package junit
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -32,6 +32,7 @@ Patch0: junit-no-hamcrest-src.patch
|
||||
Patch1: junit-jdk8.patch
|
||||
Patch2: junit-jdk9.patch
|
||||
Patch3: junit-jdk10.patch
|
||||
Patch4: junit-jdk11.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: hamcrest >= 1.3
|
||||
@ -87,6 +88,7 @@ Demos for %{name}.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user