diff --git a/0001-Port-to-hamcrest-2.2.patch b/0001-Port-to-hamcrest-2.2.patch index ea5b5f2..c9dc1b8 100644 --- a/0001-Port-to-hamcrest-2.2.patch +++ b/0001-Port-to-hamcrest-2.2.patch @@ -1,7 +1,7 @@ -From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001 +From d09cc37d39895b8b8b0bffb1c70d0a9d06df69a1 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 +Subject: [PATCH 1/2] Port to hamcrest 2.2 --- .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- @@ -12,7 +12,7 @@ Subject: [PATCH] Port to hamcrest 2.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 +index 93a68276..3ea4a813 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 @@ @@ -38,7 +38,7 @@ index 93a6827..3ea4a81 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 6e2ff5e..1f0a0a0 100644 +index 6e2ff5e3..1f0a0a02 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 @@ @@ -58,7 +58,7 @@ index 6e2ff5e..1f0a0a0 100644 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 +index 74386a86..7d16b11b 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 @@ @@ -78,7 +78,7 @@ 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 13407cc0..8889266e 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 { @@ -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 -index f2b2753..e5759ed 100644 +index f2b27531..e5759ed8 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 +104,5 @@ index f2b2753..e5759ed 100644 } } -- -2.25.2 +2.44.0 diff --git a/0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch b/0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch new file mode 100644 index 0000000..05e9465 --- /dev/null +++ b/0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch @@ -0,0 +1,67 @@ +From 12270ec059bb103dcfb1d11c359e25c7ce5953da Mon Sep 17 00:00:00 2001 +From: Christine Poerschke +Date: Thu, 30 Dec 2021 08:44:54 +0000 +Subject: [PATCH 2/2] remove usages of deprecated org.junit.Assert.assertThat() + +--- + src/main/java/org/junit/rules/ErrorCollector.java | 4 ++-- + src/main/java/org/junit/rules/ExpectedException.java | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/main/java/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java +index 9711e503..f846d776 100644 +--- a/src/main/java/org/junit/rules/ErrorCollector.java ++++ b/src/main/java/org/junit/rules/ErrorCollector.java +@@ -1,6 +1,5 @@ + package org.junit.rules; + +-import static org.junit.Assert.assertThat; + import static org.junit.Assert.assertThrows; + + import java.util.ArrayList; +@@ -10,6 +9,7 @@ import java.util.concurrent.Callable; + import org.junit.function.ThrowingRunnable; + import org.junit.internal.AssumptionViolatedException; + import org.hamcrest.Matcher; ++import org.hamcrest.MatcherAssert; + import org.junit.runners.model.MultipleFailureException; + + /** +@@ -74,7 +74,7 @@ public class ErrorCollector extends Verifier { + public void checkThat(final String reason, final T value, final Matcher matcher) { + checkSucceeds(new Callable() { + public Object call() throws Exception { +- assertThat(reason, value, matcher); ++ MatcherAssert.assertThat(reason, value, matcher); + return value; + } + }); +diff --git a/src/main/java/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java +index 431ad495..16550851 100644 +--- a/src/main/java/org/junit/rules/ExpectedException.java ++++ b/src/main/java/org/junit/rules/ExpectedException.java +@@ -3,11 +3,11 @@ package org.junit.rules; + import static java.lang.String.format; + import static org.hamcrest.CoreMatchers.containsString; + import static org.hamcrest.CoreMatchers.instanceOf; +-import static org.junit.Assert.assertThat; + import static org.junit.Assert.fail; + import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause; + import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; + import org.hamcrest.Matcher; ++import org.hamcrest.MatcherAssert; + import org.hamcrest.StringDescription; + import org.junit.AssumptionViolatedException; + import org.junit.runners.model.Statement; +@@ -268,7 +268,7 @@ public class ExpectedException implements TestRule { + + private void handleException(Throwable e) throws Throwable { + if (isAnyExceptionExpected()) { +- assertThat(e, matcherBuilder.build()); ++ MatcherAssert.assertThat(e, matcherBuilder.build()); + } else { + throw e; + } +-- +2.44.0 + diff --git a/_service b/_service new file mode 100644 index 0000000..653c514 --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + git + https://github.com/junit-team/junit4.git + r4.13.2 + r* + @PARENT_TAG@ + r(.*) + **/*.jar + junit + + + *.tar + xz + + + diff --git a/build.xml b/build.xml deleted file mode 100644 index 46971d5..0000000 --- a/build.xml +++ /dev/null @@ -1,394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/junit-4.13.2.tar.xz b/junit-4.13.2.tar.xz new file mode 100644 index 0000000..c5f0d20 --- /dev/null +++ b/junit-4.13.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e648f34b5103309b87a80c5cfa6342125f827a38858305e3dcab2bf7118f589d +size 850372 diff --git a/junit-build.xml b/junit-build.xml new file mode 100644 index 0000000..893ccdd --- /dev/null +++ b/junit-build.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/junit.changes b/junit.changes index 81e3596..7cdd123 100644 --- a/junit.changes +++ b/junit.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu May 23 05:53:55 UTC 2024 - Fridrich Strba + +- Require hamcrest >= 2.2 to resolve choice of providers + +------------------------------------------------------------------- +Sat Apr 27 11:44:02 UTC 2024 - Fridrich Strba + +- Generate anew the ant build system using the maven pom.xml +- Fetch sources from github by source service and filter out stale + hamcrest binaries. +- Port to hamcrest 2.2 unconditionally +- Added patch: + * 0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch + + upstream patch to replace deprecated assertThat + +------------------------------------------------------------------- +Wed Feb 21 13:55:54 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu Sep 21 07:53:02 UTC 2023 - Fridrich Strba diff --git a/junit.spec b/junit.spec index 10ec989..eba15b2 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ # # spec file for package junit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,15 +23,16 @@ Summary: Java regression test package License: EPL-1.0 Group: Development/Libraries/Java URL: https://junit.org/junit4/ -Source0: https://github.com/junit-team/junit4/archive/r%{version}.tar.gz -Source1: build.xml +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-build.xml Patch0: 0001-Port-to-hamcrest-2.2.patch +Patch1: 0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest >= 1.3 +BuildRequires: hamcrest >= 2.2 BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -Requires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: javapackages-local >= 6 +Requires: hamcrest >= 2.2 Provides: %{name}-demo = %{version}-%{release} Obsoletes: %{name}-demo < %{version}-%{release} Provides: %{name}4-demo = %{version}-%{release} @@ -63,39 +64,32 @@ Obsoletes: %{name}4-manual < %{version}-%{release} Documentation for %{name}. %prep -%setup -q -n %{name}4-r%{version} -%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0} -%patch0 -p1 -%endif -cp %{SOURCE1} . +%setup -q +%patch -P 0 -p1 +%patch -P 1 -p1 +cp %{SOURCE1} build.xml find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf -%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0} -ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar -%else -ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar -%endif - %build -export CLASSPATH=$(build-classpath hamcrest) -ant jars javadoc -Dversion-status= +build-jar-repository -s lib hamcrest +ant jar javadoc %install # jars install -d -m 755 %{buildroot}%{_javadir} -install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # compat symlink ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} %check diff --git a/r4.13.2.tar.gz b/r4.13.2.tar.gz deleted file mode 100644 index 44d85c7..0000000 --- a/r4.13.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b6d700fc374c82951d247f6d80238951d87c61661ceb151f9fbf40f65413561 -size 1077147