Accepting request 791983 from Java:packages

4.12 -> 4.13

OBS-URL: https://build.opensuse.org/request/show/791983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junit?expand=0&rev=25

build.xml

@@ -7,7 +7,7 @@
   <property name="src" value="src/main/java" />
   <property name="target" location="target" />
   <property name="bin" location="${target}/main" />
-  <property name="version-base" value="4.12" />
+  <property name="version-base" value="4.13" />
   <property name="version-bundle" value="${version-base}.0" />
   <property name="version-status" value="-SNAPSHOT" />
   <property name="version" value="${version-base}${version-status}" />

junit-jdk10.patch

@@ -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();
-         }

junit-jdk11.patch

@@ -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) {

junit.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr  7 12:20:17 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 

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

r4.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24
-size 443804

r4.13.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4e8f5681ad387a386a5aebe05ed4b73ffbfff963e154fbc4d77090f230777c7
+size 1061693