Compare commits
No commits in common. "c8-stream-201902" and "c10s" have entirely different histories.
c8-stream-
...
c10s
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
9
.gitignore
vendored
9
.gitignore
vendored
@ -1 +1,8 @@
|
|||||||
SOURCES/junit-4.12-clean.tar.gz
|
junit3.8.2.zip
|
||||||
|
/junit-4.10.tar.xz
|
||||||
|
/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
|
||||||
|
@ -1 +0,0 @@
|
|||||||
8638be921555bc2a38baee8cfe0c7325b7d34650 SOURCES/junit-4.12-clean.tar.gz
|
|
@ -1,7 +1,7 @@
|
|||||||
From 9507c7b942a25f89428c95abb0012d30aff0ca9b Mon Sep 17 00:00:00 2001
|
From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001
|
||||||
From: Marian Koncek <mkoncek@redhat.com>
|
From: Marian Koncek <mkoncek@redhat.com>
|
||||||
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
|
Subject: [PATCH] Port to hamcrest 2.2
|
||||||
|
|
||||||
---
|
---
|
||||||
.../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 ---
|
.../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 ---
|
||||||
@ -12,19 +12,19 @@ Subject: [PATCH] Port to hamcrest 2.1
|
|||||||
5 files changed, 2 insertions(+), 9 deletions(-)
|
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
|
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 93a6827..3ea4a81 100644
|
||||||
--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java
|
--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java
|
||||||
+++ b/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;
|
@@ -1,7 +1,6 @@
|
||||||
import java.io.StringWriter;
|
package org.junit.internal.matchers;
|
||||||
|
|
||||||
import org.hamcrest.Description;
|
import org.hamcrest.Description;
|
||||||
-import org.hamcrest.Factory;
|
-import org.hamcrest.Factory;
|
||||||
import org.hamcrest.Matcher;
|
import org.hamcrest.Matcher;
|
||||||
|
|
||||||
/**
|
import org.junit.internal.Throwables;
|
||||||
@@ -42,13 +41,11 @@ public class StacktracePrintingMatcher<T extends Throwable> extends
|
@@ -39,13 +38,11 @@ public class StacktracePrintingMatcher<T extends Throwable> extends
|
||||||
return stringWriter.toString();
|
return Throwables.getStacktrace(throwable);
|
||||||
}
|
}
|
||||||
|
|
||||||
- @Factory
|
- @Factory
|
||||||
@ -38,7 +38,7 @@ index 5d45ba3..6e94a67 100644
|
|||||||
Matcher<T> exceptionMatcher) {
|
Matcher<T> exceptionMatcher) {
|
||||||
return new StacktracePrintingMatcher<T>(exceptionMatcher);
|
return new StacktracePrintingMatcher<T>(exceptionMatcher);
|
||||||
diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
|
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 6e2ff5e..1f0a0a0 100644
|
||||||
--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
|
--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
|
||||||
+++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
|
+++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,7 +1,6 @@
|
||||||
@ -54,7 +54,7 @@ index 22ce8bd..4fa89e7 100644
|
|||||||
* @param <T> type of the outer exception
|
* @param <T> type of the outer exception
|
||||||
*/
|
*/
|
||||||
- @Factory
|
- @Factory
|
||||||
public static <T extends Throwable> Matcher<T> hasCause(final Matcher<? extends Throwable> matcher) {
|
public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
|
||||||
return new ThrowableCauseMatcher<T>(matcher);
|
return new ThrowableCauseMatcher<T>(matcher);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java
|
diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java
|
||||||
@ -91,7 +91,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
|
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
|
--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java
|
||||||
+++ b/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 {
|
@@ -108,7 +108,7 @@ public class WithDataPointMethod {
|
||||||
@ -104,5 +104,5 @@ index c814508..ce22ef4 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.21.0
|
2.25.2
|
||||||
|
|
143
0002-Port-to-OpenJDK-21.patch
Normal file
143
0002-Port-to-OpenJDK-21.patch
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
From e77b0978378999acd44ddf4b75476cc25c14c19e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marian Koncek <mkoncek@redhat.com>
|
||||||
|
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<Failure>) 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<Failure>) 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<ThreadGroup> innerThreadGroup = new AtomicReference<ThreadGroup>();
|
||||||
|
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
|
||||||
|
|
@ -1,90 +0,0 @@
|
|||||||
From abb2895b7faf07817644e69e34701af6e88204e7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marian Koncek <mkoncek@redhat.com>
|
|
||||||
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
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_contexts:
|
||||||
|
- osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
22
generate-tarball.sh
Executable file
22
generate-tarball.sh
Executable file
@ -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"
|
@ -1,23 +1,36 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
Name: junit
|
Name: junit
|
||||||
Version: 4.12
|
Epoch: 1
|
||||||
Release: 11%{?dist}
|
Version: 4.13.2
|
||||||
|
Release: 7%{?dist}
|
||||||
Summary: Java regression test package
|
Summary: Java regression test package
|
||||||
License: EPL-1.0
|
License: EPL-1.0
|
||||||
URL: http://www.junit.org/
|
URL: https://junit.org/junit4/
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
ExclusiveArch: %{java_arches} noarch
|
||||||
|
|
||||||
# ./clean-tarball.sh %{version}
|
# ./generate-tarball.sh
|
||||||
Source0: %{name}-%{version}-clean.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Source3: create-tarball.sh
|
Source1: generate-tarball.sh
|
||||||
|
|
||||||
Patch1: 0001-Port-to-hamcrest-2.1.patch
|
Patch1: 0001-Port-to-hamcrest-2.2.patch
|
||||||
Patch2: 0002-Port-to-OpenJDK-11.patch
|
Patch2: 0002-Port-to-OpenJDK-21.patch
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||||
BuildRequires: mvn(org.hamcrest:hamcrest-core)
|
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
|
%description
|
||||||
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
|
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
|
||||||
@ -38,10 +51,10 @@ Summary: Javadoc for %{name}
|
|||||||
Javadoc for %{name}.
|
Javadoc for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-r%{version}
|
%setup -q -n junit4-r%{version}
|
||||||
|
|
||||||
%patch1 -p1
|
%patch 1 -p1
|
||||||
%patch2 -p1
|
%patch 2 -p1
|
||||||
|
|
||||||
# InaccessibleBaseClassTest fails with Java 8
|
# InaccessibleBaseClassTest fails with Java 8
|
||||||
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
|
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
|
||||||
@ -54,48 +67,131 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
|
|||||||
# Removing hamcrest source jar references (not available and/or necessary)
|
# Removing hamcrest source jar references (not available and/or necessary)
|
||||||
%pom_remove_plugin :maven-javadoc-plugin
|
%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 "<packaging>bundle</packaging>"
|
|
||||||
%pom_xpath_inject pom:build/pom:plugins "
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.felix</groupId>
|
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<configuration>
|
|
||||||
<instructions>
|
|
||||||
<Bundle-SymbolicName>org.junit</Bundle-SymbolicName>
|
|
||||||
<Export-Package>{local-packages},!org.hamcrest*,*;x-internal:=true</Export-Package>
|
|
||||||
<_nouses>true</_nouses>
|
|
||||||
</instructions>
|
|
||||||
</configuration>
|
|
||||||
</plugin>"
|
|
||||||
|
|
||||||
%mvn_file : %{name}
|
%mvn_file : %{name}
|
||||||
|
|
||||||
|
%mvn_alias junit:junit junit:junit-dep
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build -- -DjdkVersion=1.6
|
%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%doc LICENSE-junit.txt README.md
|
%license LICENSE-junit.txt
|
||||||
|
%doc README.md
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
%files javadoc -f .mfiles-javadoc
|
||||||
%doc LICENSE-junit.txt
|
%license LICENSE-junit.txt
|
||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%doc LICENSE-junit.txt
|
%license LICENSE-junit.txt
|
||||||
%doc doc/*
|
%doc doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:4.13.2-7
|
||||||
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
|
* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.2-6
|
||||||
|
- Port to OpenJDK 21
|
||||||
|
- Resolves: RHEL-52712
|
||||||
|
|
||||||
|
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:4.13.2-6
|
||||||
|
- Bump release for Aug 2024 java mass rebuild
|
||||||
|
|
||||||
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:4.13.2-5
|
||||||
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 25 2023 Chris Kelley <ckelley@redhat.com> - 4.13.2-1
|
||||||
|
- Update to upstream version 4.13.2
|
||||||
|
|
||||||
|
* Thu Feb 16 2023 Marian Koncek <mkoncek@redhat.com> - 1:4.13.1-11
|
||||||
|
- Change packaging to jar instead of bundle
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:4.13.1-7
|
||||||
|
- Rebuilt for java-17-openjdk as system jdk
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-5
|
||||||
|
- Bump Java compiler source/target levels to 1.7
|
||||||
|
|
||||||
|
* Wed Sep 15 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1:4.13.1-4
|
||||||
|
- Add alias for junit-dep
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-2
|
||||||
|
- Bootstrap build
|
||||||
|
- Non-bootstrap build
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Dec 4 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.13.1-1
|
||||||
|
- Update to upstream version 4.13.1
|
||||||
|
|
||||||
|
* Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1:4.13-2
|
||||||
|
- Bump release to account for previously untagged 4.13-1.fc33 build.
|
||||||
|
|
||||||
|
* Thu Aug 13 2020 Jerry James <loganjerry@gmail.com> - 1:4.13-1
|
||||||
|
- Update to upstream version 4.13
|
||||||
|
|
||||||
|
* Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 1:4.12-18
|
||||||
|
- Add automatic module name
|
||||||
|
|
||||||
|
* Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 1:4.12-17
|
||||||
|
- Allow building on Java 11
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-16
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:4.12-14
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Fri Mar 06 2020 Marian Koncek <mkoncek@redhat.com> - 4.13-1
|
||||||
|
- Update to upstream version 4.13
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.12-11
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.12-11
|
||||||
- Mass rebuild for javapackages-tools 201902
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.12-10
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.12-10
|
||||||
- Mass rebuild for javapackages-tools 201901
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.12-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Jul 2 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.12-9
|
* Mon Jul 2 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.12-9
|
||||||
- Update license tag
|
- Update license tag
|
||||||
|
|
||||||
@ -253,6 +349,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
|
|||||||
|
|
||||||
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
|
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
|
||||||
- Rebuild with ant-1.6.2
|
- Rebuild with ant-1.6.2
|
||||||
|
|
||||||
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
|
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
|
||||||
- update for JPackage 1.5
|
- update for JPackage 1.5
|
||||||
|
|
7
plans/javapackages.fmf
Normal file
7
plans/javapackages.fmf
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
summary: Run javapackages-specific tests
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://src.fedoraproject.org/tests/javapackages
|
||||||
|
ref: c10s
|
||||||
|
execute:
|
||||||
|
how: tmt
|
Loading…
Reference in New Issue
Block a user