Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package junit for openSUSE:Factory checked in at 2022-06-17 21:20:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit (Old) and /work/SRC/openSUSE:Factory/.junit.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit" Fri Jun 17 21:20:24 2022 rev:28 rq:982391 version:4.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/junit/junit.changes 2022-03-28 16:59:33.888888161 +0200 +++ /work/SRC/openSUSE:Factory/.junit.new.1548/junit.changes 2022-06-17 21:22:46.994782168 +0200 @@ -1,0 +2,10 @@ +Thu Jun 9 18:02:17 UTC 2022 - Fridrich Strba <[email protected]> + +- Added patch: + * 0001-Port-to-hamcrest-2.2.patch + + do not use the org.hamcrest.Factory that was removed in + hamcrest 2.x and should have been an internal annotation + only + + fix some incompatibilities with template types in matchers + +------------------------------------------------------------------- New: ---- 0001-Port-to-hamcrest-2.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit.spec ++++++ --- /var/tmp/diff_new_pack.bEDmDe/_old 2022-06-17 21:22:47.578782485 +0200 +++ /var/tmp/diff_new_pack.bEDmDe/_new 2022-06-17 21:22:47.582782487 +0200 @@ -25,9 +25,10 @@ URL: https://junit.org/junit4/ Source0: https://github.com/junit-team/junit4/archive/r%{version}.tar.gz Source1: build.xml +Patch0: 0001-Port-to-hamcrest-2.2.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) @@ -63,14 +64,15 @@ %prep %setup -q -n %{name}4-r%{version} +%patch0 -p1 cp %{SOURCE1} . find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf -ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar +ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar %build -export CLASSPATH=$(build-classpath hamcrest/all) +export CLASSPATH=$(build-classpath hamcrest/hamcrest) ant jars javadoc -Dversion-status= %install ++++++ 0001-Port-to-hamcrest-2.2.patch ++++++ >From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> 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<T extends Throwable> extends return Throwables.getStacktrace(throwable); } - @Factory public static <T extends Throwable> Matcher<T> isThrowable( Matcher<T> throwableMatcher) { return new StacktracePrintingMatcher<T>(throwableMatcher); } - @Factory public static <T extends Exception> Matcher<T> isException( Matcher<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 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<T extends Throwable> extends * @param matcher to apply to the cause of the outer exception * @param <T> type of the outer exception */ - @Factory public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> 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 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<T extends Throwable> extends matcher.describeMismatch(item.getMessage(), description); } - @Factory public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) { return new ThrowableMessageMatcher<T>(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 <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) { + public static <T> Matcher<Iterable<? extends T>> everyItem(final Matcher<T> 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<Iterable<Failure>> empty() { + private Matcher<Iterable<? extends Failure>> empty() { return everyItem(nullValue(Failure.class)); } } -- 2.25.2 ++++++ build.xml ++++++ --- /var/tmp/diff_new_pack.bEDmDe/_old 2022-06-17 21:22:47.630782513 +0200 +++ /var/tmp/diff_new_pack.bEDmDe/_new 2022-06-17 21:22:47.634782515 +0200 @@ -110,13 +110,13 @@ <attribute name="Bundle-SymbolicName" value="org.junit"/> <attribute name="Bundle-Vendor" value="JUnit"/> <attribute name="Bundle-Version" value="${version-bundle}"/> - <attribute name="Export-Package" value="org.junit;version="${version-bundle}",org.junit.experimental.max;version="${version-bundle}",org.junit.experimental;version="${version-bundle}",org.junit.experimental.runners;version="${version-bundle}",org.junit.experimental.categories;version="${version-bundle}",org.junit.experimental.theories;version="${version-bundle}",org.junit.experimental.theories.suppliers;version="${version-bundle}",org.junit.experimental.results;version="${version-bundle}",org.junit.runners;version="${version-bundle}",org.junit.runners.model;version="${version-bundle}",org.junit.runners.parameterized;version="${version-bundle}",org.junit.matchers;version="${version-bundle}",org.junit.runner;version="${version-bundle}",org.junit.runner.manipulation;version="${version-bundle}",org.junit.runner.notification;version="${version -bundle}",org.junit.rules;version="${version-bundle}",org.junit.validator;version="${version-bundle}",junit.framework;version="${version-bundle}",junit.runner;version="${version-bundle}",junit.extensions;version="${version-bundle}",junit.textui;version="${version-bundle}",org.junit.experimental.theories.internal;x-internal:=true;version="${version-bundle}",org.junit.internal;x-internal:=true;version="${version-bundle}",org.junit.internal.builders;x-internal:=true;version="${version-bundle}",org.junit.internal.matchers;x-internal:=true;version="${version-bundle}",org.junit.internal.requests;x-internal:=true;version="${version-bundle}",org.junit.internal.runners;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.model;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.rules;x-internal:=true;version="${vers ion-bundle}",org.junit.internal.runners.statements;x-internal:=true;version="${version-bundle}""/> + <attribute name="Export-Package" value="junit.extensions;version="${version-bundle}",junit.framework;version="${version-bundle}",junit.runner;version="${version-bundle}",junit.textui;version="${version-bundle}",org.junit.experimental.categories;version="${version-bundle}",org.junit.experimental.max;version="${version-bundle}",org.junit.experimental.results;version="${version-bundle}",org.junit.experimental.runners;version="${version-bundle}",org.junit.experimental.theories.internal;x-internal:=true;version="${version-bundle}",org.junit.experimental.theories.suppliers;version="${version-bundle}",org.junit.experimental.theories;version="${version-bundle}",org.junit.experimental;version="${version-bundle}",org.junit.function;version="${version-bundle}",org.junit.internal.builders;x-internal:=true;version="${version-bundle}",org.junit.internal.man agement;x-internal:=true;version="${version-bundle}",org.junit.internal.matchers;x-internal:=true;version="${version-bundle}",org.junit.internal.requests;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.model;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.rules;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.statements;x-internal:=true;version="${version-bundle}",org.junit.internal.runners;x-internal:=true;version="${version-bundle}",org.junit.internal;x-internal:=true;version="${version-bundle}",org.junit.matchers;version="${version-bundle}",org.junit.rules;version="${version-bundle}",org.junit.runner.manipulation;version="${version-bundle}",org.junit.runner.notification;version="${version-bundle}",org.junit.runner;version="${version-bundle}",org.junit.runners.model;version="${v ersion-bundle}",org.junit.runners.parameterized;version="${version-bundle}",org.junit.runners;version="${version-bundle}",org.junit.validator;version="${version-bundle}",org.junit;version="${version-bundle}""/> <attribute name="Implementation-Title" value="JUnit"/> <attribute name="Implementation-URL" value="http://junit.org"/> <attribute name="Implementation-Vendor" value="JUnit"/> <attribute name="Implementation-Vendor-Id" value="junit"/> <attribute name="Implementation-Version" value="${version-base}"/> - <attribute name="Import-Package" value="junit.extensions,junit.framework,junit.runner,org.hamcrest;version="[1.3,2)";core=split,org.hamcrest.core;version="[1.3,2)",org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.internal,org.junit.internal.builders,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator"/> + <attribute name="Import-Package" value="junit.extensions,junit.framework,junit.runner,org.hamcrest.core,org.hamcrest,org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.function,org.junit.internal,org.junit.internal.builders,org.junit.internal.management,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator"/> <attribute name="JavaPackages-ArtifactId" value="junit"/> <attribute name="JavaPackages-GroupId" value="junit"/> <attribute name="JavaPackages-Version" value="${version-base}"/>
