Hello community, here is the log from the commit of package junit for openSUSE:Factory checked in at 2017-12-22 12:17:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit (Old) and /work/SRC/openSUSE:Factory/.junit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit" Fri Dec 22 12:17:01 2017 rev:21 rq:558207 version:4.11 Changes: -------- --- /work/SRC/openSUSE:Factory/junit/junit.changes 2017-09-13 22:23:19.642801556 +0200 +++ /work/SRC/openSUSE:Factory/.junit.new/junit.changes 2017-12-22 12:17:03.247360784 +0100 @@ -1,0 +2,23 @@ +Mon Dec 18 15:40:52 UTC 2017 - [email protected] + +- Run fdupes on documentation + +------------------------------------------------------------------- +Mon Dec 18 15:35:28 UTC 2017 - [email protected] + +- Harden and fix the test suite: + + org.framework.junit is deprecated since junit 4.0 + + Ensure we fail check when junit no longer returns what we + expect it to (error code checking is useless, since Assert + returns !0, like any other failure to start the test). + +------------------------------------------------------------------- +Mon Dec 18 09:34:48 UTC 2017 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- junit-jdk10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit.spec ++++++ --- /var/tmp/diff_new_pack.FHW9xx/_old 2017-12-22 12:17:03.971325483 +0100 +++ /var/tmp/diff_new_pack.FHW9xx/_new 2017-12-22 12:17:03.971325483 +0100 @@ -31,7 +31,9 @@ #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: fdupes BuildRequires: hamcrest >= 1.3 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local @@ -43,7 +45,6 @@ Requires(postun): javapackages-tools Provides: junit4 = %{version} Obsoletes: junit4 <= 4.10 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -85,6 +86,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf @@ -109,6 +111,7 @@ # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # demo install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is @@ -118,7 +121,7 @@ %check cat > test.java <<EOF -import junit.framework.Assert; +import org.junit.Assert; class test { public static void main(String[] args) { @@ -128,10 +131,10 @@ } EOF javac -cp %{buildroot}/%{_javadir}/%{name}.jar test.java -java -cp %{buildroot}/%{_javadir}/%{name}.jar: test && exit 42 +java -cp %{buildroot}/%{_javadir}/%{name}.jar: test 2>&1 | \ + grep 'Exception in thread "main" java.lang.AssertionError: Hello world from junit' %files -%defattr(0644,root,root,0755) %doc CODING_STYLE LICENSE README acknowledgements.txt %{_javadir}/%{name}.jar %{_javadir}/junit4.jar @@ -139,15 +142,12 @@ %{_datadir}/maven-metadata/%{name}.xml* %files demo -%defattr(0644,root,root,0755) %{_datadir}/%{name} %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %files manual -%defattr(0644,root,root,0755) %doc junit%{version}/doc/* %changelog ++++++ junit-jdk10.patch ++++++ 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(); }
