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/.gitignore b/.gitignore index ecd44ef..d1b500a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ 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 +/junit-4.13.1.tar.gz +/junit-4.13.2.tar.gz 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/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/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/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/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/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/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 7e10338..0bddd0e 100644 --- a/junit.spec +++ b/junit.spec @@ -1,22 +1,36 @@ +%bcond_with bootstrap + Name: junit Epoch: 1 -Version: 4.12 -Release: 13%{?dist} +Version: 4.13.2 +Release: %autorelease 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 -# ./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 -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +Patch: 0001-Port-to-hamcrest-2.2.patch +Patch: 0002-Port-to-OpenJDK-21.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.hamcrest:hamcrest-core) - -Obsoletes: %{name}-demo < 4.12 +%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. +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) +%endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1:4.13.2-20 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. @@ -30,14 +44,9 @@ Summary: Manual for %{name} %description manual Documentation for %{name}. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -Javadoc for %{name}. - %prep -%setup -q -n %{name}-r%{version} +%autosetup -p1 -C + # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -46,261 +55,28 @@ 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 -# 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 + %build -%mvn_build +%mvn_build -j -- -DjdkVersion=1.8 -P\!restrict-doclint %install %mvn_install %files -f .mfiles -%doc LICENSE-junit.txt README.md - -%files javadoc -f .mfiles-javadoc -%doc LICENSE-junit.txt +%license LICENSE-junit.txt +%doc README.md %files manual -%doc LICENSE-junit.txt +%license LICENSE-junit.txt %doc doc/* %changelog -* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* 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 diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt diff --git a/sources b/sources index d77668d..8254963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz +SHA512 (junit-4.13.2.tar.gz) = 1d41c1e9a85429830d3bdadc3a50cbff7828c0381b225d38fe53692ab043e25e792b98acbb708b6cd505af7d75ce3e0a4c5f12c9287ad834fcc1077e1d2c9e2f