[maven-plugin-testing] Build against easymock3.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Jul 25 07:20:10 UTC 2013


commit 03ed2984cb7de2ea1b933d7e88c262e13f1c3784
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Jul 25 10:19:52 2013 +0300

    Build against easymock3.

 maven-plugin-testing.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index 48d0c07..0fb9bbb 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,13 +1,13 @@
 Name:           maven-plugin-testing
 Version:        2.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Maven Plugin Testing
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugin-testing/
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
 BuildArch: noarch
 
-BuildRequires: easymock2
+BuildRequires: easymock3
 BuildRequires: junit
 BuildRequires: java-devel
 BuildRequires: maven-local
@@ -16,8 +16,7 @@ BuildRequires: maven-source-plugin
 BuildRequires: plexus-containers-component-metadata
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-reporting-impl
-#BuildRequires: maven-test-tools
+BuildRequires: maven-reporting-impl
 
 %description
 The Maven Plugin Testing contains the necessary modules
@@ -57,6 +56,8 @@ Framework to test Maven Plugins with Easymock objects.
 %prep
 %setup -q
 
+sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
+
 %build
 %mvn_alias : org.apache.maven.shared:
 # Tests are skipped due to some test failures most probably caused by issues 
@@ -75,6 +76,9 @@ Framework to test Maven Plugins with Easymock objects.
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Jul 25 2013 Alexander Kurtakov <akurtako at redhat.com> 2.1-8
+- Build against easymock3.
+
 * Mon Apr 22 2013 Michal Srb <msrb at redhat.com> - 2.1-7
 - Another rebuild (Fix artifactId=None issue)
 


More information about the scm-commits mailing list