From e6ec36d250dbb5fff8311b39e18453b2487ab56a1399ce39fe8181108e7f52c1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 7 Apr 2020 12:41:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=37 --- build.xml | 2 +- junit-jdk10.patch | 15 --------------- junit-jdk11.patch | 49 ----------------------------------------------- junit.changes | 9 +++++++++ junit.spec | 16 ++++++---------- r4.12.tar.gz | 3 --- r4.13.tar.gz | 3 +++ 7 files changed, 19 insertions(+), 78 deletions(-) delete mode 100644 junit-jdk10.patch delete mode 100644 junit-jdk11.patch delete mode 100644 r4.12.tar.gz create mode 100644 r4.13.tar.gz diff --git a/build.xml b/build.xml index cf4911c..2d762d2 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ - + diff --git a/junit-jdk10.patch b/junit-jdk10.patch deleted file mode 100644 index 4395f6d..0000000 --- a/junit-jdk10.patch +++ /dev/null @@ -1,15 +0,0 @@ -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(); - } diff --git a/junit-jdk11.patch b/junit-jdk11.patch deleted file mode 100644 index a5e3cd0..0000000 --- a/junit-jdk11.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- 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 41d9e66..7ae62ba 100644 --- a/junit.changes +++ b/junit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 7 12:20:17 UTC 2020 - Fridrich Strba + +- Upgrade to 4.13 +- Removed patches: + * junit-jdk10.patch + * junit-jdk11.patch + + not needed with this version + ------------------------------------------------------------------- Mon Feb 4 17:16:22 UTC 2019 - Fridrich Strba diff --git a/junit.spec b/junit.spec index 96c1760..c7963bf 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ # # spec file for package junit # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,17 @@ Name: junit -Version: 4.12 +Version: 4.13 Release: 0 Summary: Java regression test package License: EPL-1.0 Group: Development/Libraries/Java -URL: http://www.junit.org/ +URL: https://www.junit.org/ Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz Source1: build.xml -Patch0: junit-jdk10.patch -Patch1: junit-jdk11.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest-core >= 1.3 +BuildRequires: hamcrest >= 1.3 BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local Requires: mvn(org.hamcrest:hamcrest-core) @@ -66,15 +64,13 @@ Documentation for %{name}. %prep %setup -q -n %{name}4-r%{version} cp %{SOURCE1} . -%patch0 -p1 -%patch1 -p1 find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf -ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar +ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar %build -export CLASSPATH=$(build-classpath hamcrest/core) +export CLASSPATH=$(build-classpath hamcrest/all) ant jars javadoc -Dversion-status= %install diff --git a/r4.12.tar.gz b/r4.12.tar.gz deleted file mode 100644 index a5b7f87..0000000 --- a/r4.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24 -size 443804 diff --git a/r4.13.tar.gz b/r4.13.tar.gz new file mode 100644 index 0000000..6bcdd2a --- /dev/null +++ b/r4.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e8f5681ad387a386a5aebe05ed4b73ffbfff963e154fbc4d77090f230777c7 +size 1061693