From d2fe58e62eb8f8b2935eadb519714eb9c4c1f996 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/57] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d77668d..f586a0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz +SHA512 (junit-4.12-clean.tar.gz) = d25fc547aa8fd961a33e5104da899be924047dbe150bfe8cd1677648173f7bcab82b0562718fc8ec2138323b786bb6c66e749f96701871d8f1d8984dee52c2de From b322d34ffbc716faf2b50ecb59e1a38e7379aa78 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 02/57] Remove Obsoletes --- junit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/junit.spec b/junit.spec index 79e8de6..5e99856 100644 --- a/junit.spec +++ b/junit.spec @@ -16,7 +16,6 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) -Obsoletes: %{name}-demo < 4.12 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. From 7632bdc5663c65c29fe877519bea634f5eb15792 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:54 +0200 Subject: [PATCH 03/57] Mass rebuild for javapackages-tools 201901 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 5e99856..5e15f6e 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -85,6 +85,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 +- Mass rebuild for javapackages-tools 201901 + * Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 - Update license tag From 82f045811c0404b6e17f2db6c1dba24922eb4bb1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Aug 2019 12:50:26 +0200 Subject: [PATCH 04/57] Port to hamcrest 2.1 --- 0001-Port-to-hamcrest-2.1.patch | 108 ++++++++++++++++++++++++++++++++ junit.spec | 4 ++ 2 files changed, 112 insertions(+) create mode 100644 0001-Port-to-hamcrest-2.1.patch diff --git a/0001-Port-to-hamcrest-2.1.patch b/0001-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..16b864a --- /dev/null +++ b/0001-Port-to-hamcrest-2.1.patch @@ -0,0 +1,108 @@ +From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 29 Aug 2019 12:48:20 +0200 +Subject: [PATCH] Port to hamcrest 2.1 + +--- + .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +index 5d45ba3..6e94a67 100644 +--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +@@ -4,7 +4,6 @@ import java.io.PrintWriter; + import java.io.StringWriter; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + + /** +@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher extends + return stringWriter.toString(); + } + +- @Factory + public static Matcher isThrowable( + Matcher throwableMatcher) { + return new StacktracePrintingMatcher(throwableMatcher); + } + +- @Factory + public static Matcher isException( + Matcher exceptionMatcher) { + return new StacktracePrintingMatcher(exceptionMatcher); +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +index 22ce8bd..4fa89e7 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends + * @param matcher to apply to the cause of the outer exception + * @param type of the outer exception + */ +- @Factory + public static Matcher hasCause(final Matcher matcher) { + return new ThrowableCauseMatcher(matcher); + } +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +index 74386a8..7d16b11 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends + matcher.describeMismatch(item.getMessage(), description); + } + +- @Factory + public static Matcher hasMessage(final Matcher matcher) { + return new ThrowableMessageMatcher(matcher); + } +diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java +index 13407cc..8889266 100644 +--- a/src/main/java/org/junit/matchers/JUnitMatchers.java ++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java +@@ -56,7 +56,7 @@ public class JUnitMatchers { + * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. + */ + @Deprecated +- public static Matcher> everyItem(final Matcher elementMatcher) { ++ public static Matcher> everyItem(final Matcher elementMatcher) { + return CoreMatchers.everyItem(elementMatcher); + } + +diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +index c814508..ce22ef4 100644 +--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java ++++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +@@ -108,7 +108,7 @@ public class WithDataPointMethod { + return JUnitCore.runClasses(type).getFailures(); + } + +- private Matcher> empty() { ++ private Matcher> empty() { + return everyItem(nullValue(Failure.class)); + } + } +-- +2.21.0 + diff --git a/junit.spec b/junit.spec index 5e15f6e..5fd85d5 100644 --- a/junit.spec +++ b/junit.spec @@ -11,6 +11,8 @@ BuildArch: noarch Source0: %{name}-%{version}-clean.tar.gz Source3: create-tarball.sh +Patch1: 0001-Port-to-hamcrest-2.1.patch + BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -38,6 +40,8 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-r%{version} +%patch1 -p1 + # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java From 47fb9150a3d86e9f7abc4259bc33ca9c477f3a43 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 24 Sep 2019 11:20:09 +0200 Subject: [PATCH 05/57] Remove Epoch --- junit.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/junit.spec b/junit.spec index 5fd85d5..b82ac09 100644 --- a/junit.spec +++ b/junit.spec @@ -1,5 +1,4 @@ Name: junit -Epoch: 1 Version: 4.12 Release: 10%{?dist} Summary: Java regression test package From 9a59ab0198798c29b630e8663b608f32939aa5ea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 24 Sep 2019 11:54:23 +0200 Subject: [PATCH 06/57] Update to upstream version 4.13~beta.1 --- .gitignore | 1 + 0001-Port-to-hamcrest-2.1.patch | 41 ++++++++++++++++++--------------- create-tarball.sh | 22 ------------------ generate-tarball.sh | 23 ++++++++++++++++++ junit.spec | 15 +++++++----- sources | 2 +- 6 files changed, 56 insertions(+), 48 deletions(-) delete mode 100755 create-tarball.sh create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index ecd44ef..3a4dd0c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ junit3.8.2.zip /r4.11.tar.gz /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz +/junit-4.13~beta.1.tar.gz diff --git a/0001-Port-to-hamcrest-2.1.patch b/0001-Port-to-hamcrest-2.1.patch index 16b864a..bc1fd0c 100644 --- a/0001-Port-to-hamcrest-2.1.patch +++ b/0001-Port-to-hamcrest-2.1.patch @@ -1,30 +1,30 @@ -From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001 +From e2d59e5707cdcb011cb8390dadbba7bbe7f64ece Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Thu, 29 Aug 2019 12:48:20 +0200 +Date: Tue, 24 Sep 2019 11:38:29 +0200 Subject: [PATCH] Port to hamcrest 2.1 --- - .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- - .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- - .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- - src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- - .../experimental/theories/runner/WithDataPointMethod.java | 2 +- - 5 files changed, 2 insertions(+), 9 deletions(-) + .../junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 4 +--- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -index 5d45ba3..6e94a67 100644 +index 9e9505d..45dc4f1 100644 --- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -@@ -4,7 +4,6 @@ import java.io.PrintWriter; - import java.io.StringWriter; +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; - /** -@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher extends - return stringWriter.toString(); + import org.junit.internal.Throwables; +@@ -43,13 +42,11 @@ public class StacktracePrintingMatcher extends + return Throwables.getStacktrace(throwable); } - @Factory @@ -38,7 +38,7 @@ index 5d45ba3..6e94a67 100644 Matcher exceptionMatcher) { return new StacktracePrintingMatcher(exceptionMatcher); diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -index 22ce8bd..4fa89e7 100644 +index a8d9cef..a3611b4 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java @@ -1,7 +1,6 @@ @@ -49,14 +49,17 @@ index 22ce8bd..4fa89e7 100644 import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends +@@ -45,8 +44,7 @@ public class ThrowableCauseMatcher extends * @param matcher to apply to the cause of the outer exception * @param type of the outer exception */ - @Factory - public static Matcher hasCause(final Matcher matcher) { + public static Matcher hasCause(final Matcher matcher) { return new ThrowableCauseMatcher(matcher); } +-} +\ No newline at end of file ++} diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java index 74386a8..7d16b11 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java @@ -78,10 +81,10 @@ index 74386a8..7d16b11 100644 return new ThrowableMessageMatcher(matcher); } diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java -index 13407cc..8889266 100644 +index 47897c5..8ae4dcd 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/org/junit/matchers/JUnitMatchers.java -@@ -56,7 +56,7 @@ public class JUnitMatchers { +@@ -58,7 +58,7 @@ public class JUnitMatchers { * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. */ @Deprecated diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100755 index 1594760..0000000 --- a/create-tarball.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; then - echo "Usage: ./create-tarball.sh VERSION" - exit 1 -fi - -VERSION=${1} -NAME="junit" - -wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz -tar xvf r${VERSION}.tar.gz - -( - cd ${NAME}-r${VERSION} - find . -name "*.jar" -delete - find . -name "*.class" -delete -) - -tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} -rm -Rf ${NAME}-${VERSION}.tar.gz - diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..019c640 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +name=junit +version="$(sed -n 's/Version:\s*//p' *.spec)" +upstream_version="$(echo ${version} | echo ${version} | sed 's/~\|\(alpha\.\|beta\)\./\1-/g')" + +# RETRIEVE +wget "https://github.com/${name}-team/${name}/archive/r${upstream_version}.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar xf "../r${upstream_version}.tar.gz" +mv * ${name}-${version} + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete + +tar czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "r${upstream_version}.tar.gz" diff --git a/junit.spec b/junit.spec index b82ac09..7ef3574 100644 --- a/junit.spec +++ b/junit.spec @@ -1,14 +1,14 @@ Name: junit -Version: 4.12 -Release: 10%{?dist} +Version: 4.13~beta.1 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch -# ./clean-tarball.sh %{version} -Source0: %{name}-%{version}-clean.tar.gz -Source3: create-tarball.sh +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +Source3: ./generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.1.patch @@ -37,7 +37,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-r%{version} +%setup -q %patch1 -p1 @@ -88,6 +88,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Sep 24 2019 Marian Koncek - 4.13~beta.1-1 +- Update to upstream version 4.13~beta.1 + * Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index f586a0c..c0cdbe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.12-clean.tar.gz) = d25fc547aa8fd961a33e5104da899be924047dbe150bfe8cd1677648173f7bcab82b0562718fc8ec2138323b786bb6c66e749f96701871d8f1d8984dee52c2de +SHA512 (junit-4.13~beta.1.tar.gz) = 7ae7c85077dfd3fd0ba0084317f628654f5f9352d3680033746e061f07aae0a8720d38b83782059a7f93d63cc54a0af73323aa9b30d11e223e5c5f8d34b8e67f From 35ba4685daab0c3c739652e366b3386c1bafed16 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 24 Sep 2019 13:08:31 +0200 Subject: [PATCH 07/57] Revert "Update to upstream version 4.13~beta.1" This reverts commit 9a59ab0198798c29b630e8663b608f32939aa5ea. reason: breaks mockito tests --- .gitignore | 1 - 0001-Port-to-hamcrest-2.1.patch | 41 +++++++++++++++------------------ create-tarball.sh | 22 ++++++++++++++++++ generate-tarball.sh | 23 ------------------ junit.spec | 15 +++++------- sources | 2 +- 6 files changed, 48 insertions(+), 56 deletions(-) create mode 100755 create-tarball.sh delete mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index 3a4dd0c..ecd44ef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ junit3.8.2.zip /r4.11.tar.gz /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz -/junit-4.13~beta.1.tar.gz diff --git a/0001-Port-to-hamcrest-2.1.patch b/0001-Port-to-hamcrest-2.1.patch index bc1fd0c..16b864a 100644 --- a/0001-Port-to-hamcrest-2.1.patch +++ b/0001-Port-to-hamcrest-2.1.patch @@ -1,30 +1,30 @@ -From e2d59e5707cdcb011cb8390dadbba7bbe7f64ece Mon Sep 17 00:00:00 2001 +From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Tue, 24 Sep 2019 11:38:29 +0200 +Date: Thu, 29 Aug 2019 12:48:20 +0200 Subject: [PATCH] Port to hamcrest 2.1 --- - .../junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- - .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 4 +--- - .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- - src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- - .../experimental/theories/runner/WithDataPointMethod.java | 2 +- - 5 files changed, 3 insertions(+), 10 deletions(-) + .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -index 9e9505d..45dc4f1 100644 +index 5d45ba3..6e94a67 100644 --- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; +@@ -4,7 +4,6 @@ import java.io.PrintWriter; + import java.io.StringWriter; import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; - import org.junit.internal.Throwables; -@@ -43,13 +42,11 @@ public class StacktracePrintingMatcher extends - return Throwables.getStacktrace(throwable); + /** +@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher extends + return stringWriter.toString(); } - @Factory @@ -38,7 +38,7 @@ index 9e9505d..45dc4f1 100644 Matcher exceptionMatcher) { return new StacktracePrintingMatcher(exceptionMatcher); diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -index a8d9cef..a3611b4 100644 +index 22ce8bd..4fa89e7 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java @@ -1,7 +1,6 @@ @@ -49,17 +49,14 @@ index a8d9cef..a3611b4 100644 import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -@@ -45,8 +44,7 @@ public class ThrowableCauseMatcher extends +@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends * @param matcher to apply to the cause of the outer exception * @param type of the outer exception */ - @Factory - public static Matcher hasCause(final Matcher matcher) { + public static Matcher hasCause(final Matcher matcher) { return new ThrowableCauseMatcher(matcher); } --} -\ No newline at end of file -+} diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java index 74386a8..7d16b11 100644 --- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java @@ -81,10 +78,10 @@ index 74386a8..7d16b11 100644 return new ThrowableMessageMatcher(matcher); } diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java -index 47897c5..8ae4dcd 100644 +index 13407cc..8889266 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/org/junit/matchers/JUnitMatchers.java -@@ -58,7 +58,7 @@ public class JUnitMatchers { +@@ -56,7 +56,7 @@ public class JUnitMatchers { * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. */ @Deprecated diff --git a/create-tarball.sh b/create-tarball.sh new file mode 100755 index 0000000..1594760 --- /dev/null +++ b/create-tarball.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Usage: ./create-tarball.sh VERSION" + exit 1 +fi + +VERSION=${1} +NAME="junit" + +wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz +tar xvf r${VERSION}.tar.gz + +( + cd ${NAME}-r${VERSION} + find . -name "*.jar" -delete + find . -name "*.class" -delete +) + +tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} +rm -Rf ${NAME}-${VERSION}.tar.gz + diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 019c640..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -e - -name=junit -version="$(sed -n 's/Version:\s*//p' *.spec)" -upstream_version="$(echo ${version} | echo ${version} | sed 's/~\|\(alpha\.\|beta\)\./\1-/g')" - -# RETRIEVE -wget "https://github.com/${name}-team/${name}/archive/r${upstream_version}.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar xf "../r${upstream_version}.tar.gz" -mv * ${name}-${version} - -# CLEAN TARBALL -find -name '*.jar' -delete -find -name '*.class' -delete - -tar czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "r${upstream_version}.tar.gz" diff --git a/junit.spec b/junit.spec index 7ef3574..b82ac09 100644 --- a/junit.spec +++ b/junit.spec @@ -1,14 +1,14 @@ Name: junit -Version: 4.13~beta.1 -Release: 1%{?dist} +Version: 4.12 +Release: 10%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -Source3: ./generate-tarball.sh +# ./clean-tarball.sh %{version} +Source0: %{name}-%{version}-clean.tar.gz +Source3: create-tarball.sh Patch1: 0001-Port-to-hamcrest-2.1.patch @@ -37,7 +37,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q +%setup -q -n %{name}-r%{version} %patch1 -p1 @@ -88,9 +88,6 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog -* Tue Sep 24 2019 Marian Koncek - 4.13~beta.1-1 -- Update to upstream version 4.13~beta.1 - * Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index c0cdbe0..f586a0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13~beta.1.tar.gz) = 7ae7c85077dfd3fd0ba0084317f628654f5f9352d3680033746e061f07aae0a8720d38b83782059a7f93d63cc54a0af73323aa9b30d11e223e5c5f8d34b8e67f +SHA512 (junit-4.12-clean.tar.gz) = d25fc547aa8fd961a33e5104da899be924047dbe150bfe8cd1677648173f7bcab82b0562718fc8ec2138323b786bb6c66e749f96701871d8f1d8984dee52c2de From edd08b97a561d800b2e10d1f7589cfb3fe3b337a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 15:00:31 +0100 Subject: [PATCH 08/57] Set compiler source/target levels to 1.6 --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index b82ac09..c28cbbe 100644 --- a/junit.spec +++ b/junit.spec @@ -72,7 +72,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_file : %{name} %build -%mvn_build +%mvn_build -- -DjdkVersion=1.6 %install %mvn_install From c9cef20a482b1832ba713287616ffc3eecd26ed0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 31 Oct 2019 12:17:16 +0100 Subject: [PATCH 09/57] Port to OpenJDK 11 --- 0002-Port-to-OpenJDK-11.patch | 90 +++++++++++++++++++++++++++++++++++ junit.spec | 2 + 2 files changed, 92 insertions(+) create mode 100644 0002-Port-to-OpenJDK-11.patch diff --git a/0002-Port-to-OpenJDK-11.patch b/0002-Port-to-OpenJDK-11.patch new file mode 100644 index 0000000..d251373 --- /dev/null +++ b/0002-Port-to-OpenJDK-11.patch @@ -0,0 +1,90 @@ +From abb2895b7faf07817644e69e34701af6e88204e7 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 30 Oct 2019 17:16:11 +0100 +Subject: [PATCH] Port to OpenJDK 11 + +--- + .../junit/runners/model/TestClassTest.java | 3 ++ + .../junit/tests/running/core/MainRunner.java | 31 ------------------- + 2 files changed, 3 insertions(+), 31 deletions(-) + +diff --git a/src/test/java/org/junit/runners/model/TestClassTest.java b/src/test/java/org/junit/runners/model/TestClassTest.java +index 7682968..810de25 100644 +--- a/src/test/java/org/junit/runners/model/TestClassTest.java ++++ b/src/test/java/org/junit/runners/model/TestClassTest.java +@@ -135,6 +135,9 @@ public class TestClassTest { + } + } + ++ /// The class Object starting from JDK9 has its own annotations ++ /// which causes this test to fail ++ @Ignore + @Test + public void providesAnnotatedMethodsSortedByName() { + TestClass tc = new TestClass(MethodsAnnotated.class); +diff --git a/src/test/java/org/junit/tests/running/core/MainRunner.java b/src/test/java/org/junit/tests/running/core/MainRunner.java +index 31f01e8..076a212 100644 +--- a/src/test/java/org/junit/tests/running/core/MainRunner.java ++++ b/src/test/java/org/junit/tests/running/core/MainRunner.java +@@ -39,11 +39,6 @@ public class MainRunner { + throw new ExitException(status); + } + +- @Override +- public boolean getInCheck() { +- return (originalSecurityManager != null) && originalSecurityManager.getInCheck(); +- } +- + @Override + public Object getSecurityContext() { + return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext(); +@@ -196,11 +191,6 @@ public class MainRunner { + } + } + +- @Override +- public boolean checkTopLevelWindow(Object window) { +- return (originalSecurityManager == null) ? super.checkTopLevelWindow(window) : originalSecurityManager.checkTopLevelWindow(window); +- } +- + @Override + public void checkPrintJobAccess() { + if (originalSecurityManager != null) { +@@ -208,20 +198,6 @@ public class MainRunner { + } + } + +- @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) { +@@ -243,13 +219,6 @@ public class MainRunner { + } + } + +- @Override +- public void checkMemberAccess(Class clazz, int which) { +- if (originalSecurityManager != null) { +- originalSecurityManager.checkMemberAccess(clazz, which); +- } +- } +- + @Override + public void checkSecurityAccess(String target) { + if (originalSecurityManager != null) { +-- +2.21.0 + diff --git a/junit.spec b/junit.spec index c28cbbe..d53084b 100644 --- a/junit.spec +++ b/junit.spec @@ -11,6 +11,7 @@ Source0: %{name}-%{version}-clean.tar.gz Source3: create-tarball.sh Patch1: 0001-Port-to-hamcrest-2.1.patch +Patch2: 0002-Port-to-OpenJDK-11.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -40,6 +41,7 @@ Javadoc for %{name}. %setup -q -n %{name}-r%{version} %patch1 -p1 +%patch2 -p1 # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java From d0f7b6e6de9d59874c9f7c5e470d6c43718b1f18 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 10/57] Mass rebuild for javapackages-tools 201902 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index d53084b..d7c4372 100644 --- a/junit.spec +++ b/junit.spec @@ -1,6 +1,6 @@ Name: junit Version: 4.12 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -90,6 +90,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 - Mass rebuild for javapackages-tools 201901 From 0ba92bfe809f7baba5c28ec9bda7e733030fcee2 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 6 Mar 2020 14:49:34 +0100 Subject: [PATCH 11/57] Update to upstream version 4.13 --- .gitignore | 1 + 0001-Port-to-hamcrest-2.1.patch | 83 +++--------------------------- 0002-Port-to-OpenJDK-11.patch | 90 --------------------------------- create-tarball.sh | 22 -------- generate-tarball.sh | 22 ++++++++ junit.spec | 22 ++++---- sources | 2 +- 7 files changed, 44 insertions(+), 198 deletions(-) delete mode 100644 0002-Port-to-OpenJDK-11.patch delete mode 100755 create-tarball.sh create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index ecd44ef..78c1bba 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ junit3.8.2.zip /r4.11.tar.gz /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz +/junit-4.13.tar.gz diff --git a/0001-Port-to-hamcrest-2.1.patch b/0001-Port-to-hamcrest-2.1.patch index 16b864a..015a7ee 100644 --- a/0001-Port-to-hamcrest-2.1.patch +++ b/0001-Port-to-hamcrest-2.1.patch @@ -1,82 +1,13 @@ -From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001 +From 41302698f39a6bda58e634a786ce2a6c290eadba Mon Sep 17 00:00:00 2001 From: Marian Koncek -Date: Thu, 29 Aug 2019 12:48:20 +0200 +Date: Fri, 6 Mar 2020 14:28:05 +0100 Subject: [PATCH] Port to hamcrest 2.1 --- - .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- - .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- - .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- - src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- - .../experimental/theories/runner/WithDataPointMethod.java | 2 +- - 5 files changed, 2 insertions(+), 9 deletions(-) + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../tests/experimental/theories/runner/WithDataPointMethod.java | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -index 5d45ba3..6e94a67 100644 ---- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -@@ -4,7 +4,6 @@ import java.io.PrintWriter; - import java.io.StringWriter; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - - /** -@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher extends - return stringWriter.toString(); - } - -- @Factory - public static Matcher isThrowable( - Matcher throwableMatcher) { - return new StacktracePrintingMatcher(throwableMatcher); - } - -- @Factory - public static Matcher isException( - Matcher exceptionMatcher) { - return new StacktracePrintingMatcher(exceptionMatcher); -diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -index 22ce8bd..4fa89e7 100644 ---- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - import org.hamcrest.TypeSafeMatcher; - -@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends - * @param matcher to apply to the cause of the outer exception - * @param type of the outer exception - */ -- @Factory - public static Matcher hasCause(final Matcher matcher) { - return new ThrowableCauseMatcher(matcher); - } -diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -index 74386a8..7d16b11 100644 ---- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - import org.hamcrest.TypeSafeMatcher; - -@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends - matcher.describeMismatch(item.getMessage(), description); - } - -- @Factory - public static Matcher hasMessage(final Matcher matcher) { - return new ThrowableMessageMatcher(matcher); - } diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java index 13407cc..8889266 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java @@ -91,7 +22,7 @@ index 13407cc..8889266 100644 } diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -index c814508..ce22ef4 100644 +index f2b2753..e5759ed 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java @@ -108,7 +108,7 @@ public class WithDataPointMethod { @@ -104,5 +35,5 @@ index c814508..ce22ef4 100644 } } -- -2.21.0 +2.24.1 diff --git a/0002-Port-to-OpenJDK-11.patch b/0002-Port-to-OpenJDK-11.patch deleted file mode 100644 index d251373..0000000 --- a/0002-Port-to-OpenJDK-11.patch +++ /dev/null @@ -1,90 +0,0 @@ -From abb2895b7faf07817644e69e34701af6e88204e7 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Wed, 30 Oct 2019 17:16:11 +0100 -Subject: [PATCH] Port to OpenJDK 11 - ---- - .../junit/runners/model/TestClassTest.java | 3 ++ - .../junit/tests/running/core/MainRunner.java | 31 ------------------- - 2 files changed, 3 insertions(+), 31 deletions(-) - -diff --git a/src/test/java/org/junit/runners/model/TestClassTest.java b/src/test/java/org/junit/runners/model/TestClassTest.java -index 7682968..810de25 100644 ---- a/src/test/java/org/junit/runners/model/TestClassTest.java -+++ b/src/test/java/org/junit/runners/model/TestClassTest.java -@@ -135,6 +135,9 @@ public class TestClassTest { - } - } - -+ /// The class Object starting from JDK9 has its own annotations -+ /// which causes this test to fail -+ @Ignore - @Test - public void providesAnnotatedMethodsSortedByName() { - TestClass tc = new TestClass(MethodsAnnotated.class); -diff --git a/src/test/java/org/junit/tests/running/core/MainRunner.java b/src/test/java/org/junit/tests/running/core/MainRunner.java -index 31f01e8..076a212 100644 ---- a/src/test/java/org/junit/tests/running/core/MainRunner.java -+++ b/src/test/java/org/junit/tests/running/core/MainRunner.java -@@ -39,11 +39,6 @@ public class MainRunner { - throw new ExitException(status); - } - -- @Override -- public boolean getInCheck() { -- return (originalSecurityManager != null) && originalSecurityManager.getInCheck(); -- } -- - @Override - public Object getSecurityContext() { - return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext(); -@@ -196,11 +191,6 @@ public class MainRunner { - } - } - -- @Override -- public boolean checkTopLevelWindow(Object window) { -- return (originalSecurityManager == null) ? super.checkTopLevelWindow(window) : originalSecurityManager.checkTopLevelWindow(window); -- } -- - @Override - public void checkPrintJobAccess() { - if (originalSecurityManager != null) { -@@ -208,20 +198,6 @@ public class MainRunner { - } - } - -- @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) { -@@ -243,13 +219,6 @@ public class MainRunner { - } - } - -- @Override -- public void checkMemberAccess(Class clazz, int which) { -- if (originalSecurityManager != null) { -- originalSecurityManager.checkMemberAccess(clazz, which); -- } -- } -- - @Override - public void checkSecurityAccess(String target) { - if (originalSecurityManager != null) { --- -2.21.0 - diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100755 index 1594760..0000000 --- a/create-tarball.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; then - echo "Usage: ./create-tarball.sh VERSION" - exit 1 -fi - -VERSION=${1} -NAME="junit" - -wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz -tar xvf r${VERSION}.tar.gz - -( - cd ${NAME}-r${VERSION} - find . -name "*.jar" -delete - find . -name "*.class" -delete -) - -tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} -rm -Rf ${NAME}-${VERSION}.tar.gz - diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..76a4605 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e + +name=junit +version="$(sed -n 's/Version:\s*//p' *.spec)" + +# RETRIEVE +wget "https://github.com/junit-team/junit/archive/r${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" + +# CLEAN TARBALL +find -name '*.jar' -delete +find -name '*.class' -delete +rm -r "junit4-r${version}/src/site" + +tar -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/junit.spec b/junit.spec index d7c4372..75269cf 100644 --- a/junit.spec +++ b/junit.spec @@ -1,24 +1,22 @@ Name: junit -Version: 4.12 -Release: 11%{?dist} +Version: 4.13 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch -# ./clean-tarball.sh %{version} -Source0: %{name}-%{version}-clean.tar.gz -Source3: create-tarball.sh +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.1.patch -Patch2: 0002-Port-to-OpenJDK-11.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) - %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java. JUnit is Open @@ -38,10 +36,13 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-r%{version} +%setup -q -n junit4-r%{version} %patch1 -p1 -%patch2 -p1 + +# Port to hamcrest 2.1 (Factory annotation removed with no effect) +find -name '*.java' -exec sed -i '/@Factory/d' {} + +find -name '*.java' -exec sed -i '/hamcrest\.Factory/d' {} + # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -90,6 +91,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Mar 06 2020 Marian Koncek - 4.13-1 +- Update to upstream version 4.13 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index f586a0c..b0927fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.12-clean.tar.gz) = d25fc547aa8fd961a33e5104da899be924047dbe150bfe8cd1677648173f7bcab82b0562718fc8ec2138323b786bb6c66e749f96701871d8f1d8984dee52c2de +SHA512 (junit-4.13.tar.gz) = 6cafdeed70435c1928767fbb3327a7c9e6d6869703c10696e404e6f1c3ececa3ef0c09bad50585c28f6b1ca5b17affcaa29e207b1d20e257e7f332d5fc3554bc From 88b304df04dd2f537378c2bcef651d74c818a136 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 22 Apr 2020 11:27:19 +0200 Subject: [PATCH 12/57] Rework hamcrest 2.2 patch --- 0001-Port-to-hamcrest-2.1.patch | 39 ------------ 0001-Port-to-hamcrest-2.2.patch | 108 ++++++++++++++++++++++++++++++++ junit.spec | 6 +- 3 files changed, 109 insertions(+), 44 deletions(-) delete mode 100644 0001-Port-to-hamcrest-2.1.patch create mode 100644 0001-Port-to-hamcrest-2.2.patch diff --git a/0001-Port-to-hamcrest-2.1.patch b/0001-Port-to-hamcrest-2.1.patch deleted file mode 100644 index 015a7ee..0000000 --- a/0001-Port-to-hamcrest-2.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 41302698f39a6bda58e634a786ce2a6c290eadba Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 6 Mar 2020 14:28:05 +0100 -Subject: [PATCH] Port to hamcrest 2.1 - ---- - src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- - .../tests/experimental/theories/runner/WithDataPointMethod.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java -index 13407cc..8889266 100644 ---- a/src/main/java/org/junit/matchers/JUnitMatchers.java -+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java -@@ -56,7 +56,7 @@ public class JUnitMatchers { - * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. - */ - @Deprecated -- public static Matcher> everyItem(final Matcher elementMatcher) { -+ public static Matcher> everyItem(final Matcher elementMatcher) { - return CoreMatchers.everyItem(elementMatcher); - } - -diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -index f2b2753..e5759ed 100644 ---- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -+++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -@@ -108,7 +108,7 @@ public class WithDataPointMethod { - return JUnitCore.runClasses(type).getFailures(); - } - -- private Matcher> empty() { -+ private Matcher> empty() { - return everyItem(nullValue(Failure.class)); - } - } --- -2.24.1 - diff --git a/0001-Port-to-hamcrest-2.2.patch b/0001-Port-to-hamcrest-2.2.patch new file mode 100644 index 0000000..0d51ef4 --- /dev/null +++ b/0001-Port-to-hamcrest-2.2.patch @@ -0,0 +1,108 @@ +From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 6 Mar 2020 14:28:05 +0100 +Subject: [PATCH] Port to hamcrest 2.2 + +--- + .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +index 93a6827..3ea4a81 100644 +--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + + import org.junit.internal.Throwables; +@@ -39,13 +38,11 @@ public class StacktracePrintingMatcher extends + return Throwables.getStacktrace(throwable); + } + +- @Factory + public static Matcher isThrowable( + Matcher throwableMatcher) { + return new StacktracePrintingMatcher(throwableMatcher); + } + +- @Factory + public static Matcher isException( + Matcher exceptionMatcher) { + return new StacktracePrintingMatcher(exceptionMatcher); +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +index 6e2ff5e..1f0a0a0 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends + * @param matcher to apply to the cause of the outer exception + * @param type of the outer exception + */ +- @Factory + public static Matcher hasCause(final Matcher matcher) { + return new ThrowableCauseMatcher(matcher); + } +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +index 74386a8..7d16b11 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends + matcher.describeMismatch(item.getMessage(), description); + } + +- @Factory + public static Matcher hasMessage(final Matcher matcher) { + return new ThrowableMessageMatcher(matcher); + } +diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java +index 13407cc..8889266 100644 +--- a/src/main/java/org/junit/matchers/JUnitMatchers.java ++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java +@@ -56,7 +56,7 @@ public class JUnitMatchers { + * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. + */ + @Deprecated +- public static Matcher> everyItem(final Matcher elementMatcher) { ++ public static Matcher> everyItem(final Matcher elementMatcher) { + return CoreMatchers.everyItem(elementMatcher); + } + +diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +index f2b2753..e5759ed 100644 +--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java ++++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +@@ -108,7 +108,7 @@ public class WithDataPointMethod { + return JUnitCore.runClasses(type).getFailures(); + } + +- private Matcher> empty() { ++ private Matcher> empty() { + return everyItem(nullValue(Failure.class)); + } + } +-- +2.25.2 + diff --git a/junit.spec b/junit.spec index 75269cf..b070b0c 100644 --- a/junit.spec +++ b/junit.spec @@ -10,7 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh -Patch1: 0001-Port-to-hamcrest-2.1.patch +Patch1: 0001-Port-to-hamcrest-2.2.patch BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -40,10 +40,6 @@ Javadoc for %{name}. %patch1 -p1 -# Port to hamcrest 2.1 (Factory annotation removed with no effect) -find -name '*.java' -exec sed -i '/@Factory/d' {} + -find -name '*.java' -exec sed -i '/hamcrest\.Factory/d' {} + - # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java From 618bce49235f51f34a8336c1095e8c15c4448b63 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 14:12:17 +0200 Subject: [PATCH 13/57] Add BR on surefire-junit4 --- junit.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/junit.spec b/junit.spec index b070b0c..9c9c478 100644 --- a/junit.spec +++ b/junit.spec @@ -17,6 +17,11 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) +# For other packages, surefire-junit4 is normally pulled as transitive +# runtime dependency of junit, but junit doesn't build-depend on +# itself, so explicit BR on surefire-junit4 is needed. +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) + %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java. JUnit is Open From d1002df10688196fca68bdc67ecf2ff38543ad2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 4 Dec 2020 12:53:26 +0100 Subject: [PATCH 14/57] Update to upstream version 4.13.1 --- .gitignore | 1 + junit.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78c1bba..b5d208d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ junit3.8.2.zip /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz /junit-4.13.tar.gz +/junit-4.13.1.tar.gz diff --git a/junit.spec b/junit.spec index 9c9c478..236af75 100644 --- a/junit.spec +++ b/junit.spec @@ -1,5 +1,5 @@ Name: junit -Version: 4.13 +Version: 4.13.1 Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 @@ -92,6 +92,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 +- Update to upstream version 4.13.1 + * Fri Mar 06 2020 Marian Koncek - 4.13-1 - Update to upstream version 4.13 diff --git a/sources b/sources index b0927fa..4064fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.tar.gz) = 6cafdeed70435c1928767fbb3327a7c9e6d6869703c10696e404e6f1c3ececa3ef0c09bad50585c28f6b1ca5b17affcaa29e207b1d20e257e7f332d5fc3554bc +SHA512 (junit-4.13.1.tar.gz) = 53eb0ab9278bb792b8e5f7978d3d47f52d6e94898fbf77286f7d4836cdb78aac4f0db111c146373e2591feb9c8600193d09c146a6befa56029c06324e444ecfc From 953bf29c47711f9a59f9c0ee1bb35798814525e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:06:33 +0000 Subject: [PATCH 15/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index d8c1ed2..506dbb1 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -99,6 +99,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 - Bump release to account for previously untagged 4.13-1.fc33 build. From 83b6c85acad2b8a45dbb5b10e61df375b1f303bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 16/57] Conditionalize buildrequires in bootstrap mode --- junit.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/junit.spec b/junit.spec index 236af75..2703dc2 100644 --- a/junit.spec +++ b/junit.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: junit Version: 4.13.1 Release: 1%{?dist} @@ -13,14 +15,20 @@ Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) +%endif # For other packages, surefire-junit4 is normally pulled as transitive # runtime dependency of junit, but junit doesn't build-depend on # itself, so explicit BR on surefire-junit4 is needed. +%if %{without bootstrap} BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) +%endif %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. From bac7df55951558a6ba3d31b41b1e14eccca4f046 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 17/57] Turn off bootstrap mode by default --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 2703dc2..5461390 100644 --- a/junit.spec +++ b/junit.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: junit Version: 4.13.1 From da81f4afc04ecd854f1d173c6168ee2cadbb158a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:57 +0200 Subject: [PATCH 18/57] Bootstrap build --- junit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index c61a72b..c993ffc 100644 --- a/junit.spec +++ b/junit.spec @@ -1,9 +1,9 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: junit Epoch: 1 Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -102,6 +102,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f2ac673f546a3714f2f17d2449ba873dbd64c7a4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:44 +0200 Subject: [PATCH 19/57] Non-bootstrap build --- junit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index c993ffc..b679d3f 100644 --- a/junit.spec +++ b/junit.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: junit Epoch: 1 @@ -104,6 +104,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %changelog * Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 81119b3df75dbcf03c631a4c36018b2011b77b66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:21:21 +0000 Subject: [PATCH 20/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index b679d3f..e471eb4 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -102,6 +102,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 - Bootstrap build - Non-bootstrap build From ede9920526d88376fee328c2701ebf08fe7fa74c Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Thu, 14 Oct 2021 00:11:15 +0700 Subject: [PATCH 21/57] Add alias for junit-dep --- junit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index e471eb4..974719c 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -84,6 +84,8 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_file : %{name} +%mvn_alias junit:junit junit:junit-dep + %build %mvn_build -- -DjdkVersion=1.6 @@ -102,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +- Add alias for junit-dep + * Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 123e6511ef80f56485d58210da57eceddda0c93a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 16:22:58 +0100 Subject: [PATCH 22/57] Bump Java compiler source/target levels to 1.7 --- junit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 974719c..8410a4e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,7 +87,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_alias junit:junit junit:junit-dep %build -%mvn_build -- -DjdkVersion=1.6 +%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint %install %mvn_install @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 +- Bump Java compiler source/target levels to 1.7 + * Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 - Add alias for junit-dep From 2771d4e014cf6b5d34dd26572823188bdeaf46ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:03:37 +0000 Subject: [PATCH 23/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 8410a4e..7cb2801 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 - Bump Java compiler source/target levels to 1.7 From e22e0bf350a706c12a69c41fd5ae1b6196a75198 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:10:06 +0100 Subject: [PATCH 24/57] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 7cb2801..cb3eaef 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f8b4efc26f9656888c18b414a7fdf4b8cb4f80df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 25/57] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- junit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/junit.spec b/junit.spec index cb3eaef..8ea08b8 100644 --- a/junit.spec +++ b/junit.spec @@ -8,6 +8,7 @@ Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 539d9b64e2d868596300d7620d8c8085b757a0ef Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 26/57] Update build-requires in bootstrap mode --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 8ea08b8..54cb211 100644 --- a/junit.spec +++ b/junit.spec @@ -16,10 +16,10 @@ Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) From 1ec8a502ec0a8ffe48fbcf521e3c865c6914ecf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:29:58 +0000 Subject: [PATCH 27/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 54cb211..b8b5319 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -105,6 +105,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 - Rebuilt for java-17-openjdk as system jdk From 8ecdfb2f71648cdbb8d2f0751ae866e2d10dde49 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 28/57] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 8cbf7177ff592a15b1d1e26031c01ae35eb7beba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:59:17 +0000 Subject: [PATCH 29/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index b8b5319..9073918 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -105,6 +105,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6770a161f83fae43f4a2fc8b681a3512e4eef479 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 7 Sep 2022 11:18:38 +0200 Subject: [PATCH 30/57] Fix bogus date in changelog --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 9073918..6cbe034 100644 --- a/junit.spec +++ b/junit.spec @@ -120,7 +120,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr * Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 - Bump Java compiler source/target levels to 1.7 -* Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 - Add alias for junit-dep * Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 From 1a378a3693b2210327b25ff79c8937e6e97def9d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 16 Feb 2023 10:09:20 +0100 Subject: [PATCH 31/57] Change packaging to jar instead of bundle --- junit.spec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/junit.spec b/junit.spec index 6cbe034..020fa3c 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -20,7 +20,6 @@ Patch1: 0001-Port-to-hamcrest-2.2.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif @@ -66,23 +65,6 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr # Removing hamcrest source jar references (not available and/or necessary) %pom_remove_plugin :maven-javadoc-plugin -# Add proper Apache Felix Bundle Plugin instructions -# so that we get a reasonable OSGi manifest. -%pom_xpath_inject pom:project "bundle" -%pom_xpath_inject pom:build/pom:plugins " - - org.apache.felix - maven-bundle-plugin - true - - - org.junit - {local-packages},!org.hamcrest*,*;x-internal:=true - <_nouses>true - - - " - %mvn_file : %{name} %mvn_alias junit:junit junit:junit-dep @@ -105,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 +- Change packaging to jar instead of bundle + * Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 700696f35de6d761b2951505aa21f4649156a9b9 Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Tue, 25 Apr 2023 15:38:36 +0100 Subject: [PATCH 32/57] Update to upstream version 4.13.2 --- .gitignore | 1 + junit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b5d208d..d1b500a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ junit3.8.2.zip /junit-4.12-clean.tar.gz /junit-4.13.tar.gz /junit-4.13.1.tar.gz +/junit-4.13.2.tar.gz diff --git a/junit.spec b/junit.spec index 020fa3c..5007f28 100644 --- a/junit.spec +++ b/junit.spec @@ -2,8 +2,8 @@ Name: junit Epoch: 1 -Version: 4.13.1 -Release: 10%{?dist} +Version: 4.13.2 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 +- Update to upstream version 4.13.2 + * Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 - Change packaging to jar instead of bundle diff --git a/sources b/sources index 4064fda..932111e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.1.tar.gz) = 53eb0ab9278bb792b8e5f7978d3d47f52d6e94898fbf77286f7d4836cdb78aac4f0db111c146373e2591feb9c8600193d09c146a6befa56029c06324e444ecfc +SHA512 (junit-4.13.2.tar.gz) = 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb From cf69fa4f1c4282e3ca8e7f375496035fac654b48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 15 Jun 2023 16:50:36 +0200 Subject: [PATCH 33/57] Regenerate junit-4.13.2.tar.gz tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 932111e..8254963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.2.tar.gz) = 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb +SHA512 (junit-4.13.2.tar.gz) = 1d41c1e9a85429830d3bdadc3a50cbff7828c0381b225d38fe53692ab043e25e792b98acbb708b6cd505af7d75ce3e0a4c5f12c9287ad834fcc1077e1d2c9e2f From bf8dd364c7f62acc67d8e178953cd07233ee8080 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:17:19 +0000 Subject: [PATCH 34/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 5007f28..ceebdbb 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 25 2023 Chris Kelley - 4.13.2-1 - Update to upstream version 4.13.2 From 5f0dad2ea31b260a9f55d659cf107c1319487e6d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:23:21 +0200 Subject: [PATCH 35/57] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 From d4a0de5b7ea5ccf57a5d8335cfdc604672026158 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 36/57] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From ed6b3fa217d2f9cbca4fa2e625daf2ee3dce730f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:52:31 +0000 Subject: [PATCH 37/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index ceebdbb..de99f1e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d1fca191fe7379c82f0fb3402a8656dc93c08965 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:32:36 +0000 Subject: [PATCH 38/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index de99f1e..309f48e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 388db1ec6ca15630eb3a4ee394ceb43b58b2e315 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 10:09:37 +0100 Subject: [PATCH 39/57] Port to OpenJDK 21 --- 0002-Port-to-OpenJDK-21.patch | 143 ++++++++++++++++++++++++++++++++++ junit.spec | 13 +++- 2 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 0002-Port-to-OpenJDK-21.patch diff --git a/0002-Port-to-OpenJDK-21.patch b/0002-Port-to-OpenJDK-21.patch new file mode 100644 index 0000000..7a37714 --- /dev/null +++ b/0002-Port-to-OpenJDK-21.patch @@ -0,0 +1,143 @@ +From e77b0978378999acd44ddf4b75476cc25c14c19e Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 21 Feb 2024 13:30:20 +0100 +Subject: [PATCH 2/2] Port to OpenJDK 21 + +--- + src/main/java/org/junit/runner/Result.java | 18 ++++++++++----- + .../runners/statements/FailOnTimeoutTest.java | 1 + + .../tests/running/core/AllCoreTests.java | 4 +--- + .../tests/running/core/CommandLineTest.java | 1 + + .../junit/tests/running/core/MainRunner.java | 22 ------------------- + 5 files changed, 15 insertions(+), 31 deletions(-) + +diff --git a/src/main/java/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java +index 4b5f4a4..abfe0fe 100644 +--- a/src/main/java/org/junit/runner/Result.java ++++ b/src/main/java/org/junit/runner/Result.java +@@ -1,11 +1,13 @@ + package org.junit.runner; + + import java.io.IOException; ++import java.io.InvalidClassException; + import java.io.ObjectInputStream; + import java.io.ObjectOutputStream; + import java.io.ObjectStreamClass; + import java.io.ObjectStreamField; + import java.io.Serializable; ++import java.lang.ClassNotFoundException; + import java.util.ArrayList; + import java.util.Collections; + import java.util.List; +@@ -189,12 +191,16 @@ public class Result implements Serializable { + + @SuppressWarnings("unchecked") + private SerializedForm(ObjectInputStream.GetField fields) throws IOException { +- fCount = (AtomicInteger) fields.get("fCount", null); +- fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null); +- assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null); +- fFailures = (List) fields.get("fFailures", null); +- fRunTime = fields.get("fRunTime", 0L); +- fStartTime = fields.get("fStartTime", 0L); ++ try { ++ fCount = (AtomicInteger) fields.get("fCount", null); ++ fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null); ++ assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null); ++ fFailures = (List) fields.get("fFailures", null); ++ fRunTime = fields.get("fRunTime", 0L); ++ fStartTime = fields.get("fStartTime", 0L); ++ } catch (ClassNotFoundException ex) { ++ throw new InvalidClassException("ClassNotFoundException", ex); ++ } + } + + public void serialize(ObjectOutputStream s) throws IOException { +diff --git a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +index 8bf7823..cafbd18 100644 +--- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java ++++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +@@ -182,6 +182,7 @@ public class FailOnTimeoutTest { + } + + @Test ++ @org.junit.Ignore + public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable { + assumeTrue(lookingForStuckThread); + final AtomicReference innerThreadGroup = new AtomicReference(); +diff --git a/src/test/java/org/junit/tests/running/core/AllCoreTests.java b/src/test/java/org/junit/tests/running/core/AllCoreTests.java +index a17a7e2..1a65be5 100644 +--- a/src/test/java/org/junit/tests/running/core/AllCoreTests.java ++++ b/src/test/java/org/junit/tests/running/core/AllCoreTests.java +@@ -6,9 +6,7 @@ import org.junit.runners.Suite.SuiteClasses; + + @RunWith(Suite.class) + @SuiteClasses({ +- CommandLineTest.class, +- JUnitCoreReturnsCorrectExitCodeTest.class, +- SystemExitTest.class ++ CommandLineTest.class + }) + public class AllCoreTests { + } +diff --git a/src/test/java/org/junit/tests/running/core/CommandLineTest.java b/src/test/java/org/junit/tests/running/core/CommandLineTest.java +index 37f0659..7c82cba 100644 +--- a/src/test/java/org/junit/tests/running/core/CommandLineTest.java ++++ b/src/test/java/org/junit/tests/running/core/CommandLineTest.java +@@ -36,6 +36,7 @@ public class CommandLineTest { + } + + @Test ++ @org.junit.Ignore + public void runATest() { + testWasRun = false; + new MainRunner().runWithCheckForSystemExit(new Runnable() { +diff --git a/src/test/java/org/junit/tests/running/core/MainRunner.java b/src/test/java/org/junit/tests/running/core/MainRunner.java +index ea90886..91e5e4f 100644 +--- a/src/test/java/org/junit/tests/running/core/MainRunner.java ++++ b/src/test/java/org/junit/tests/running/core/MainRunner.java +@@ -20,25 +20,6 @@ public class MainRunner { + } + } + +- /** +- * A {@code NoExitSecurityManager} throws a {@link ExitException} exception +- * whenever {@link #checkExit(int)} is called; all other permissions are allowed. +- */ +- public class NoExitSecurityManager extends SecurityManager { +- +- @Override +- public void checkExit(int status) { +- throw new ExitException(status); +- } +- +- @Override +- public void checkPermission(Permission perm) { +- if (perm.getName().startsWith("exitVM")) { +- super.checkPermission(perm); +- } +- } +- } +- + /** + * Execute runnable.run(), preventing System.exit(). If System.exit() is called + * in runnable.run(), the value is returned. If System.exit() +@@ -47,8 +28,6 @@ public class MainRunner { + * @return null if System.exit() is not called, Integer.valueof(status) if not + */ + public Integer runWithCheckForSystemExit(Runnable runnable) { +- SecurityManager oldSecurityManager = System.getSecurityManager(); +- System.setSecurityManager(new NoExitSecurityManager()); + PrintStream oldOut = System.out; + + System.setOut(new PrintStream(new ByteArrayOutputStream())); +@@ -60,7 +39,6 @@ public class MainRunner { + System.out.println("System.exit() called, value=" + e.getStatus()); + return e.getStatus(); + } finally { +- System.setSecurityManager(oldSecurityManager); + System.setOut(oldOut); + } + } +-- +2.43.0 + diff --git a/junit.spec b/junit.spec index 309f48e..6fb3df4 100644 --- a/junit.spec +++ b/junit.spec @@ -3,10 +3,10 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java regression test package License: EPL-1.0 -URL: http://www.junit.org/ +URL: https://junit.org/junit4/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -15,6 +15,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch +Patch2: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -52,7 +53,8 @@ Javadoc for %{name}. %prep %setup -q -n junit4-r%{version} -%patch1 -p1 +%patch 1 -p1 +%patch 2 -p1 # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -70,7 +72,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_alias junit:junit junit:junit-dep %build -%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint +%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint %install %mvn_install @@ -87,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 +- Port to OpenJDK 21 + * Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fa3877fc429e18398f11b3236778bffac69e0905 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:44:50 +0100 Subject: [PATCH 40/57] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 6fb3df4..92951f9 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -89,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 +- Rebuilt for java-21-openjdk as system jdk + * Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 - Port to OpenJDK 21 From 45dc5128eebcd573361eb5ed7958aab5a43aa68d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:14:16 +0000 Subject: [PATCH 41/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 92951f9..a1312b9 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -89,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 - Rebuilt for java-21-openjdk as system jdk From d358d4f780af4d73119cc69c03e7e0cc7f8b4234 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 42/57] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From af40ce3ca48d4082900d2c786c8901c524b2a55e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 43/57] Switch from %setup to %autosetup --- junit.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/junit.spec b/junit.spec index a1312b9..63d8d74 100644 --- a/junit.spec +++ b/junit.spec @@ -51,10 +51,8 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n junit4-r%{version} +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java From 2015fbfa9e23ea8a2171489a445f72ba1908a339 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 44/57] Switch to non-numdered patches --- junit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 63d8d74..d0d3e56 100644 --- a/junit.spec +++ b/junit.spec @@ -14,8 +14,8 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh -Patch1: 0001-Port-to-hamcrest-2.2.patch -Patch2: 0002-Port-to-OpenJDK-21.patch +Patch: 0001-Port-to-hamcrest-2.2.patch +Patch: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 01a556767fb7db5075e56c9fb00e617966e7fdc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:09 +0200 Subject: [PATCH 45/57] Convert to %autorelease and %autochangelog --- changelog | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++ junit.spec | 308 +---------------------------------------------------- 2 files changed, 307 insertions(+), 306 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ed09c7b --- /dev/null +++ b/changelog @@ -0,0 +1,305 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 +- Port to OpenJDK 21 + +* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 +- Update to upstream version 4.13.2 + +* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 +- Change packaging to jar instead of bundle + +* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 +- Bump Java compiler source/target levels to 1.7 + +* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +- Add alias for junit-dep + +* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 +- Update to upstream version 4.13.1 + +* Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 +- Bump release to account for previously untagged 4.13-1.fc33 build. + +* Thu Aug 13 2020 Jerry James - 1:4.13-1 +- Update to upstream version 4.13 + +* Tue Aug 04 2020 Mat Booth - 1:4.12-18 +- Add automatic module name + +* Tue Aug 04 2020 Mat Booth - 1:4.12-17 +- Allow building on Java 11 + +* Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Mar 06 2020 Marian Koncek - 4.13-1 +- Update to upstream version 4.13 + +* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 +- Update license tag + +* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jul 15 2016 Mat Booth - 1:4.12-5 +- Add missing BR + +* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 +- Export internal OSGi packages and mark them with x-internal +- Resolves: rhbz#1184144 + +* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 +- Update to upstream version 4.12 +- Build with Maven +- Remove demo package + +* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 +- Add epoch as workaround for a bug in koji-shadow + +* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 +- Remove epoch + +* Sun Jun 8 2014 Peter Robinson 4.11-12 +- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths + +* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Alexander Kurtakov 4.11-10 +- Update OSGi manifest to state 4.11. + +* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 +- Update to current packaging guidelines +- Drop old Obsoletes/Provides for junit4 rename +- Disable test which fails with Java 8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 23 2013 Michal Srb - 0:4.11-7 +- Drop "-SNAPSHOT" from version ID +- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html + +* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 +- Fix version in pom.xml (#998266) + +* Fri Aug 02 2013 Michal Srb - 0:4.11-5 +- Add create-tarball.sh script to SRPM + +* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Jun 21 2013 Michal Srb - 0:4.11-3 +- Build from clean tarball + +* Mon May 06 2013 Tomas Radej - 0:4.11-2 +- Removed uneeded dependencies + +* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 +- Updated to latest upstream version + +* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Dec 18 2012 Michal Srb - 0:4.10-7 +- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) +- Description cleanup (Resolves: #888389) + +* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 +- Update OSGi metadata to match 4.10.0 release. + +* Thu Feb 09 2012 Harald Hoyer 4.10-4 +- removed Conflicts with itsself + +* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 +- Add OSGi metadata to junit.jar manifest. + +* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 +- Fixed versioning + +* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 +- Updated to upstream 4.10 +- Obsoleted junit4 +- Epoch added + +* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 +- Drop gcj support. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 +- drop repotag + +* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 +- Autorebuild for GCC 4.3 + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 +- Fix location of stylesheet for javadocs + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 +- Rebuild for ppc32 execmem issue and new build-id + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 +- Add dist tag + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 +- Committed on behalf of Tania Bento +- Update per Fedora review process +- Resolves rhbz#225954 + +* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 +- Added missing requirements. + +* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc +- Require(post/postun): coreutils + +* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc +- Rebuilt. + +* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc +- Upgrade to 3.8.2 +- Added conditional native compilation. +- Fix path where demo is located. + +* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp +- First JPP-1.7 release + +* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp +- Rebuild with ant-1.6.2 + +* Fri May 09 2003 David Walluck 0:3.8.1-3jpp +- update for JPackage 1.5 + +* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp +- For jpackage-utils 1.5 + +* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp +- 3.8.1 + +* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp +- used original zip file + +* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp +- 3.8 +- group, vendor and distribution tags + +* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp +- versioned dir for javadoc +- no dependencies for manual and javadoc packages +- stricter dependency for demo package +- additional sources in individual archives +- section macro + +* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp +- javadoc in javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp +- fixed previous releases ...grrr + +* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp +- added jpp extension +- removed packager tag + +* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp +- first unified release +- s/jPackage/JPackage + +* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk +- 3.7 +- vendor tag +- packager tag +- s/Copyright/License/ +- truncated description to 72 columns in spec +- spec cleanup +- used versioned jar +- moved demo files to %%{_datadir}/%%{name} + +* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk +- first Mandrake release diff --git a/junit.spec b/junit.spec index d0d3e56..6dc1ec1 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 7%{?dist} +Release: %autorelease Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -87,308 +87,4 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 -- Rebuilt for java-21-openjdk as system jdk - -* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 -- Port to OpenJDK 21 - -* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 -- Update to upstream version 4.13.2 - -* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 -- Change packaging to jar instead of bundle - -* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 -- Bump Java compiler source/target levels to 1.7 - -* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 -- Add alias for junit-dep - -* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 -- Update to upstream version 4.13.1 - -* Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 -- Bump release to account for previously untagged 4.13-1.fc33 build. - -* Thu Aug 13 2020 Jerry James - 1:4.13-1 -- Update to upstream version 4.13 - -* Tue Aug 04 2020 Mat Booth - 1:4.12-18 -- Add automatic module name - -* Tue Aug 04 2020 Mat Booth - 1:4.12-17 -- Allow building on Java 11 - -* Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Mar 06 2020 Marian Koncek - 4.13-1 -- Update to upstream version 4.13 - -* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 -- Mass rebuild for javapackages-tools 201902 - -* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 -- Update license tag - -* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 15 2016 Mat Booth - 1:4.12-5 -- Add missing BR - -* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 -- Export internal OSGi packages and mark them with x-internal -- Resolves: rhbz#1184144 - -* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 -- Update to upstream version 4.12 -- Build with Maven -- Remove demo package - -* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 -- Add epoch as workaround for a bug in koji-shadow - -* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 -- Remove epoch - -* Sun Jun 8 2014 Peter Robinson 4.11-12 -- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths - -* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Alexander Kurtakov 4.11-10 -- Update OSGi manifest to state 4.11. - -* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 -- Update to current packaging guidelines -- Drop old Obsoletes/Provides for junit4 rename -- Disable test which fails with Java 8 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Aug 23 2013 Michal Srb - 0:4.11-7 -- Drop "-SNAPSHOT" from version ID -- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html - -* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 -- Fix version in pom.xml (#998266) - -* Fri Aug 02 2013 Michal Srb - 0:4.11-5 -- Add create-tarball.sh script to SRPM - -* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 -- Rebuild to regenerate API documentation -- Resolves: CVE-2013-1571 - -* Fri Jun 21 2013 Michal Srb - 0:4.11-3 -- Build from clean tarball - -* Mon May 06 2013 Tomas Radej - 0:4.11-2 -- Removed uneeded dependencies - -* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 -- Updated to latest upstream version - -* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Dec 18 2012 Michal Srb - 0:4.10-7 -- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) -- Description cleanup (Resolves: #888389) - -* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 -- Update OSGi metadata to match 4.10.0 release. - -* Thu Feb 09 2012 Harald Hoyer 4.10-4 -- removed Conflicts with itsself - -* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 -- Add OSGi metadata to junit.jar manifest. - -* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 -- Fixed versioning - -* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 -- Updated to upstream 4.10 -- Obsoleted junit4 -- Epoch added - -* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 -- Drop gcj support. - -* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 -- drop repotag - -* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 -- Autorebuild for GCC 4.3 - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 -- Fix location of stylesheet for javadocs - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 -- Rebuild for ppc32 execmem issue and new build-id - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 -- Add dist tag - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 -- Committed on behalf of Tania Bento -- Update per Fedora review process -- Resolves rhbz#225954 - -* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 -- Added missing requirements. - -* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc -- Require(post/postun): coreutils - -* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc -- Rebuilt. - -* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc -- Upgrade to 3.8.2 -- Added conditional native compilation. -- Fix path where demo is located. - -* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp -- First JPP-1.7 release - -* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp -- Rebuild with ant-1.6.2 - -* Fri May 09 2003 David Walluck 0:3.8.1-3jpp -- update for JPackage 1.5 - -* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp -- For jpackage-utils 1.5 - -* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp -- 3.8.1 - -* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp -- used original zip file - -* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp -- 3.8 -- group, vendor and distribution tags - -* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp -- versioned dir for javadoc -- no dependencies for manual and javadoc packages -- stricter dependency for demo package -- additional sources in individual archives -- section macro - -* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp -- javadoc in javadoc package - -* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp -- fixed previous releases ...grrr - -* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp -- added jpp extension -- removed packager tag - -* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp -- first unified release -- s/jPackage/JPackage - -* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk -- 3.7 -- vendor tag -- packager tag -- s/Copyright/License/ -- truncated description to 72 columns in spec -- spec cleanup -- used versioned jar -- moved demo files to %%{_datadir}/%%{name} - -* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk -- first Mandrake release +%autochangelog From 105a9b9ee41fd3804f8d05e088e41c97371af9be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 46/57] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 76c4c8d804070b4ab4d1d52c89576e733800d2ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 47/57] Unify spec style with the rest of Java/Maven packages [skip changelog] --- junit.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/junit.spec b/junit.spec index 6dc1ec1..4a837d9 100644 --- a/junit.spec +++ b/junit.spec @@ -24,11 +24,10 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif - +%if %{without bootstrap} # For other packages, surefire-junit4 is normally pulled as transitive # runtime dependency of junit, but junit doesn't build-depend on # itself, so explicit BR on surefire-junit4 is needed. -%if %{without bootstrap} BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif @@ -79,12 +78,12 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %license LICENSE-junit.txt %doc README.md -%files javadoc -f .mfiles-javadoc -%license LICENSE-junit.txt - %files manual %license LICENSE-junit.txt %doc doc/* +%files javadoc -f .mfiles-javadoc +%license LICENSE-junit.txt + %changelog %autochangelog From dac1f887739ed18d7b49e89f718a2bd9b9fa4faf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 48/57] Update javadoc package description [skip changelog] --- junit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 4a837d9..ab5e8bb 100644 --- a/junit.spec +++ b/junit.spec @@ -44,10 +44,10 @@ Summary: Manual for %{name} Documentation for %{name}. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 57750a0e6fc80cd31b1a299b6684bd5e0bda4618 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:08:13 +0000 Subject: [PATCH 49/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 804ce2788e215dc7c8c28d7a90c7f0bb2cdabb5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 50/57] Remove javadoc subpackage --- junit.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/junit.spec b/junit.spec index ab5e8bb..f8eeaa5 100644 --- a/junit.spec +++ b/junit.spec @@ -30,6 +30,8 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) # itself, so explicit BR on surefire-junit4 is needed. BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 4.13.2-20 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. @@ -43,12 +45,6 @@ Summary: Manual for %{name} %description manual Documentation for %{name}. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -69,7 +65,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_alias junit:junit junit:junit-dep %build -%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint +%mvn_build -j -- -DjdkVersion=1.8 -P\!restrict-doclint %install %mvn_install @@ -82,8 +78,5 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %license LICENSE-junit.txt %doc doc/* -%files javadoc -f .mfiles-javadoc -%license LICENSE-junit.txt - %changelog %autochangelog From 31a931a55f064b8cc1d352c652b8ff1f46420de1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Mar 2025 13:49:31 +0100 Subject: [PATCH 51/57] Fix javadoc obsoletes version --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index f8eeaa5..f34f04d 100644 --- a/junit.spec +++ b/junit.spec @@ -31,7 +31,7 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif # TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 4.13.2-20 +Obsoletes: %{name}-javadoc < 1:4.13.2-20 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. From a03662c1049783664d53ba735941b429e49cc7bf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 52/57] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 204bca60baa623f50e35fbb5779689bcd72e7066 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 53/57] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From bd3acbc99f5eee237c7b58051030882497f69527 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 54/57] Build with OpenJDK 25 --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index f34f04d..e1d5b0c 100644 --- a/junit.spec +++ b/junit.spec @@ -20,7 +20,7 @@ Patch: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif From 871864ee9cab37a84498835c33b341498f605495 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:08:47 +0000 Subject: [PATCH 55/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a571dbe6f8e3b8565794430d33e511eaada4af8d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:02:32 +0200 Subject: [PATCH 56/57] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 1e9dfd0dfb37bd976c94ad0d4fbf65eab05bc45a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Sep 2025 12:22:50 +0200 Subject: [PATCH 57/57] Remove build-dependency on maven-enforcer-plugin --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index e1d5b0c..0bddd0e 100644 --- a/junit.spec +++ b/junit.spec @@ -21,7 +21,6 @@ Patch: 0002-Port-to-OpenJDK-21.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif %if %{without bootstrap} @@ -56,6 +55,7 @@ sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin # Removing hamcrest source jar references (not available and/or necessary) %pom_remove_plugin :maven-javadoc-plugin