From a3cbc555b0341a224d8b6ce956c224b3ceecfec803c3af8cdb7c27d9652e2fb7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 Jul 2018 15:02:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=22 --- junit-jdk11.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++ junit.changes | 8 ++++++++ junit.spec | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 junit-jdk11.patch diff --git a/junit-jdk11.patch b/junit-jdk11.patch new file mode 100644 index 0000000..a5e3cd0 --- /dev/null +++ b/junit-jdk11.patch @@ -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) { diff --git a/junit.changes b/junit.changes index 722f6d1..133857c 100644 --- a/junit.changes +++ b/junit.changes @@ -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 diff --git a/junit.spec b/junit.spec index 5ec3175..ed17e37 100644 --- a/junit.spec +++ b/junit.spec @@ -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