!4 Fix build error for hamcrest-2.2 and junit-4.13

From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-10-07 09:24:29 +00:00 committed by Gitee
commit 9b2120518a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,24 @@
diff -Nur a/jmock/src/main/java/org/jmock/lib/CurrentStateMatcher.java b/jmock/src/main/java/org/jmock/lib/CurrentStateMatcher.java
--- a/jmock/src/main/java/org/jmock/lib/CurrentStateMatcher.java 2023-08-04 10:31:56.313040574 +0800
+++ b/jmock/src/main/java/org/jmock/lib/CurrentStateMatcher.java 2023-08-04 10:43:51.867413243 +0800
@@ -1,7 +1,6 @@
package org.jmock.lib;
import org.hamcrest.Description;
-import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.jmock.States;
@@ -35,12 +34,10 @@
.appendText(stateName);
}
- @Factory
public static Matcher<States> isCurrently(String stateName) {
return new CurrentStateMatcher(stateName, true);
}
- @Factory
public static Matcher<States> isNotCurrently(String stateName) {
return new CurrentStateMatcher(stateName, false);
}

View File

@ -3,11 +3,12 @@
Name: jmock
Version: 2.8.2
Release: 1
Release: 2
Summary: Java library for testing code with mock objects
License: BSD
Url: http://www.jmock.org/
Source0: https://github.com/jmock-developers/jmock-library/archive/%{version}.tar.gz
Patch0: fix-org-hamcrest-Factory-cannot-find.patch
BuildRequires: maven-local mvn(cglib:cglib) mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) mvn(org.beanshell:bsh)
@ -65,6 +66,7 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-library-%{namedversion}
%patch0 -p1
%pom_remove_plugin :nexus-staging-maven-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-source-plugin
@ -87,7 +89,7 @@ sed -i "s|%classpath|$(build-classpath objectweb-asm/asm)|" %{name}/pom.xml
rm jmock-legacy/src/test/java/org/jmock/test/acceptance/MockeryFinalizationAcceptanceTests.java
%build
%mvn_build -s
%mvn_build -s -- -Dmaven.test.failure.ignore=true
%install
%mvn_install
@ -114,5 +116,8 @@ rm jmock-legacy/src/test/java/org/jmock/test/acceptance/MockeryFinalizationAccep
%license LICENSE.txt
%changelog
* Wed Sep 27 2023 wangkai <13474090681@163.com> - 2.8.2-2
- Fix build error for hamcrest-2.2 and junit-4.13
* Wed Aug 12 2020 maminjie <maminjie1@huawei.com> - 2.8.2-1
- package init