!7 Fixed compilation failures caused by hamcrest upgrade

From: @lyn1001 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

0004-Port-to-hamcrest-2.1.patch

@@ -0,0 +1,75 @@
+From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 29 Aug 2019 15:18:53 +0200
+Subject: [PATCH] Port to hamcrest 2.1
+ 
+---
+ .../tests2/EasyMockSupportClassTest.java       | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+ 
+diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
+index c5dd63b..b8be307 100644
+--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
++++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
+@@ -48,49 +48,49 @@ public class EasyMockSupportClassTest extends EasyMockSupport {
+     @Test
+     public void testCreateStrictControl() {
+         IMocksControl ctrl = createStrictControl();
+-        assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
++        assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateControl() {
+         IMocksControl ctrl = createControl();
+-        assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
++        assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateNiceControl() {
+         IMocksControl ctrl = createNiceControl();
+-        assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
++        assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateStrictMockClassOfT() {
+-        assertThat(createStrictMock(ToMock.class), is(ToMock.class));
++        assertThat(createStrictMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateStrictMockStringClassOfT() {
+-        assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class));
++        assertThat(createStrictMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateMockClassOfT() {
+-        assertThat(createMock(ToMock.class), is(ToMock.class));
++        assertThat(createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateMockStringClassOfT() {
+-        assertThat(createMock("myMock", ToMock.class), is(ToMock.class));
++        assertThat(createMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateNiceMockClassOfT() {
+-        assertThat(createNiceMock(ToMock.class), is(ToMock.class));
++        assertThat(createNiceMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+     public void testCreateNiceMockStringClassOfT() {
+-        assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class));
++        assertThat(createNiceMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
+     }
+ 
+     @Test
+-- 
+2.21.0
+ 

README.en.md

@@ -1,36 +0,0 @@
-# easymock
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,39 +0,0 @@
-# easymock
-
-#### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

easymock.spec

@@ -1,29 +1,26 @@
-Name:           easymock
+Name:                easymock
-Version:        3.5
+Version:             3.6
-Release:        5
+Release:             2
-Summary:        Easy mock objects
+Summary:             Easy mock objects
-License:        ASL 2.0
+License:             ASL 2.0
-URL:            http://www.easymock.org
+URL:                 http://www.easymock.org
-Source0:        %{name}-%{version}.tar.gz
+Source0:             https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz
-Source1:        generate-tarball.sh
+Patch1:              0001-Disable-android-support.patch
-
+Patch2:              0002-Unshade-cglib-and-asm.patch
-Patch0001:      0001-Disable-android-support.patch
+Patch3:              0003-Fix-OSGi-manifest.patch
-Patch0002:      0002-Unshade-cglib-and-asm.patch
+Patch4:              0004-Port-to-hamcrest-2.1.patch
-Patch0003:      0003-Fix-OSGi-manifest.patch
+BuildArch:           noarch
-
+BuildRequires:       maven-local mvn(cglib:cglib) mvn(junit:junit)
-BuildArch:      noarch
+BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
-
+BuildRequires:       mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires:  maven-local mvn(cglib:cglib) mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       mvn(org.apache.maven.surefire:surefire-junit47)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin) mvn(org.ow2.asm:asm)
+BuildRequires:       mvn(org.apache.maven.surefire:surefire-testng)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit47) mvn(org.testng:testng)
+BuildRequires:       mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.objenesis:objenesis)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-testng) mvn(org.objenesis:objenesis)
+BuildRequires:       mvn(org.ow2.asm:asm) mvn(org.testng:testng)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.apache:apache-jar-resource-bundle)
+BuildRequires:       mvn(org.apache:apache-jar-resource-bundle)
-
+Obsoletes:           %{name}3 < 3.4
-Obsoletes:      %{name}3 < 3.4
+Provides:            %{name}3 = %{version}-%{release}
-Provides:       %{name}3 = %{version}-%{release}
+Obsoletes:           %{name}2 < 2.5.2-10
-Obsoletes:      %{name}2 < 2.5.2-10
-
-
 %description
 EasyMock provides Mock Objects for interfaces in JUnit tests by generating
 them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
@@ -39,27 +36,25 @@ Obsoletes:      %{name}-javadoc < %{version}-%{release}
 The help for easymock to use.
 
 %prep
-%autosetup -n %{name}-%{name}-%{version} -p1
+%autosetup  -n %{name}-%{name}-%{version} -p1
-
+find -name '*.jar' -delete
+find -name '*.class' -delete
+rm -rf website/*
 %pom_remove_plugin :maven-license-plugin
-
+%pom_remove_plugin :maven-timestamp-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :animal-sniffer-maven-plugin
+%pom_remove_plugin :animal-sniffer-maven-plugin core
 rm core/src/main/java/org/easymock/internal/Android*.java
 rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %pom_disable_module test-android
 %pom_remove_dep :dexmaker core
-
 %pom_disable_module test-nodeps
 %pom_remove_plugin :maven-shade-plugin core
-
 %pom_disable_module test-integration
 %pom_disable_module test-osgi
-
 %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin
-
-%pom_remove_plugin :maven-timestamp-plugin
-
 %mvn_file ":easymock{*}" easymock@1 easymock3@1
-
 %pom_xpath_remove pom:extensions
 
 %build
@@ -68,7 +63,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license core/LICENSE.txt
 
@@ -76,5 +70,17 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %license core/LICENSE.txt
 
 %changelog
+* Wed Sep 27 2023 liyanan <thistleslyn@163.com> - 3.6-2
+- Fixed compilation failures caused by hamcrest upgrade
+
+* Thu Aug 13 2020 yanan li <liyanan032@huawei.com> - 3.6-1
+- Update to 3.6-1
+
+* Tue Jan 21 2020 wutao <wutao61@huawei.com> - 3.5-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: modify spec
+
 * Thu Nov 14 2019 wangye<wangye54@huawei.com> - 3.5-5
 - Package init

generate-tarball.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-name=easymock
-version="$(sed -n 's/Version:\s*//p' *.spec)"
-
-# RETRIEVE
-wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
-
-# CLEAN TARBALL
-find -name '*.jar' -delete
-find -name '*.class' -delete
-# Contains minified js of uncertain origin
-rm -r */website
-
-tar cf "../${name}-${version}.tar.gz" *
-cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"