diff --git a/.gitignore b/.gitignore
index 56ee4b0..5f68415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-plugin-testing-1.2.tar.xz
/maven-plugin-testing-2.0-alpha-1.tar.xz
+/maven-plugin-testing-2.1-source-release.zip
diff --git a/maven-plugin-testing-depmap.xml b/maven-plugin-testing-depmap.xml
deleted file mode 100644
index 2475f99..0000000
--- a/maven-plugin-testing-depmap.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- org.apache.maven
- maven-archiver
- 2.4
-
-
- JPP
- maven-archiver
- 2.4
-
-
-
-
- org.apache.maven.shared
- maven-test-tools
- 1.0
-
-
- JPP/maven-plugin-testing
- maven-test-tools
- 1.2
-
-
-
-
diff --git a/maven-plugin-testing-harness-AbstractMojoTestCase.patch b/maven-plugin-testing-harness-AbstractMojoTestCase.patch
deleted file mode 100644
index 68b4f30..0000000
--- a/maven-plugin-testing-harness-AbstractMojoTestCase.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java.orig 2010-09-20 20:40:23.409198838 +0800
-+++ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java 2010-09-20 20:41:24.184959518 +0800
-@@ -181,7 +181,7 @@
-
- Mojo mojo = (Mojo) lookup( Mojo.ROLE, groupId + ":" + artifactId + ":" + version + ":" + goal );
-
-- Log mojoLogger = new DefaultLog( getContainer().getLoggerManager().getLoggerForComponent( Mojo.ROLE ) );
-+ Log mojoLogger = new DefaultLog(((org.codehaus.plexus.MutablePlexusContainer)getContainer()).getLoggerManager().getLoggerForComponent( Mojo.ROLE ) );
-
- mojo.setLog( mojoLogger );
-
diff --git a/maven-plugin-testing-harness-ArtifactStub.patch b/maven-plugin-testing-harness-ArtifactStub.patch
deleted file mode 100644
index 279df12..0000000
--- a/maven-plugin-testing-harness-ArtifactStub.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java.sav2 2008-03-18 13:39:00.000000000 +0200
-+++ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ArtifactStub.java 2011-02-10 19:51:44.810981152 +0200
-@@ -62,7 +62,7 @@ public class ArtifactStub
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
-- public int compareTo( Object object )
-+ public int compareTo( Artifact object )
- {
- return 0;
- }
-@@ -497,4 +497,8 @@ public class ArtifactStub
- sb.append( getClassifier() );
- }
- }
-+
-+ public ArtifactMetadata getMetadata(Class metadataClass) {
-+ return null;
-+ }
- }
diff --git a/maven-plugin-testing-harness-SilentLog.patch b/maven-plugin-testing-harness-SilentLog.patch
deleted file mode 100644
index 85f216a..0000000
--- a/maven-plugin-testing-harness-SilentLog.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java.orig 2010-09-17 17:21:00.628814598 +0800
-+++ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/SilentLog.java 2010-09-17 17:22:11.113099358 +0800
-@@ -325,4 +325,10 @@
- {
- return null;
- }
-+
-+ public void setThreshold( int currentThreshold )
-+ {
-+ //this.currentThreshold = currentThreshold;
-+ }
-+
- }
diff --git a/maven-plugin-testing-harness-pom.patch b/maven-plugin-testing-harness-pom.patch
deleted file mode 100644
index 6ed5b46..0000000
--- a/maven-plugin-testing-harness-pom.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- maven-plugin-testing-harness/pom.xml.orig 2010-09-20 20:09:03.589974798 +0800
-+++ maven-plugin-testing-harness/pom.xml 2010-09-20 20:11:27.724063086 +0800
-@@ -34,6 +34,16 @@
-
-
- org.apache.maven
-+ maven-artifact
-+ 2.0.6
-+
-+
-+ org.codehaus.plexus
-+ plexus-container-default
-+ 1.5.4
-+
-+
-+ org.apache.maven
- maven-project
- 2.0
-
diff --git a/maven-plugin-testing-maven3-missing-methods.patch b/maven-plugin-testing-maven3-missing-methods.patch
deleted file mode 100644
index c9e98bb..0000000
--- a/maven-plugin-testing-maven3-missing-methods.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur maven-plugin-testing-2.0-alpha-1.orig/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java maven-plugin-testing-2.0-alpha-1/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java
---- maven-plugin-testing-2.0-alpha-1.orig/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2009-09-19 14:55:30.000000000 +0200
-+++ maven-plugin-testing-2.0-alpha-1/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactRepository.java 2011-11-09 19:21:57.940268463 +0100
-@@ -212,6 +212,21 @@
-
- }
-
-+ public boolean isProjectAware()
-+ {
-+ return false;
-+ }
-+
-+ public List getMirroredRepositories()
-+ {
-+ return null;
-+ }
-+
-+ public void setMirroredRepositories( List mirroredRepositories )
-+ {
-+
-+ }
-+
- public void setReleaseUpdatePolicy( ArtifactRepositoryPolicy policy )
- {
-
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index f599313..0c9662f 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,19 +1,15 @@
%global ver_suffix -alpha-1
Name: maven-plugin-testing
-Version: 2.0
-Release: 4.alpha1%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Summary: Maven Plugin Testing
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-testing/
-#svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-2.0-alpha-1
-#tar caf maven-plugin-testing-2.0-alpha-1.tar.xz maven-plugin-testing-2.0-alpha-1
-Source0: %{name}-%{version}%{ver_suffix}.tar.xz
-
-Patch0: %{name}-maven3-missing-methods.patch
+Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
@@ -54,6 +50,9 @@ API documentation for %{name}.
Summary: Maven Plugin Testing Mechanism
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: plexus-archiver
+Requires: plexus-utils
+BuildRequires: maven-surefire-provider-junit4
Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
@@ -64,6 +63,8 @@ The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
Summary: Maven Plugin Testing Tools
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: maven-shared-invoker
+Requires: plexus-utils
Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release}
Provides: maven-shared-plugin-testing-tools = 1:%{version}-%{release}
@@ -74,6 +75,8 @@ A set of useful tools to help the Maven Plugin testing.
Summary: Maven Testing Tool
Group: Development/Libraries
Requires: maven-plugin-testing = %{version}-%{release}
+Requires: easymock3
+Requires: plexus-utils
Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
Provides: maven-shared-test-tools = 1:%{version}-%{release}
@@ -81,22 +84,21 @@ Provides: maven-shared-test-tools = 1:%{version}-%{release}
Framework to test Maven Plugins with Easymock objects.
%prep
-%setup -q -n %{name}-%{version}%{ver_suffix}
-
-%patch0 -p1
+%setup -q
%build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:aggregate
-#tests are skipped due to some test failures most probably caused by issues with our plexus container
+# Tests are skipped due to some test failures most probably caused by issues
+# with our plexus container
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}%{ver_suffix}.jar \
+install -m 644 maven-plugin-testing-harness/target/%{name}-harness-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/%{name}-harness.jar
-install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}%{ver_suffix}.jar \
+install -m 644 maven-plugin-testing-tools/target/%{name}-tools-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/%{name}-tools.jar
-install -m 644 maven-test-tools/target/maven-test-tools-%{version}%{ver_suffix}.jar \
+install -m 644 maven-test-tools/target/maven-test-tools-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/maven-test-tools.jar
# poms
@@ -115,11 +117,6 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%add_maven_depmap -f tools -a "org.apache.maven.shared:%{name}-tools" JPP.%{name}-%{name}-tools.pom %{name}/%{name}-tools.jar
%add_maven_depmap -f maven-test-tools -a "org.apache.maven.shared:maven-test-tools" JPP.%{name}-maven-test-tools.pom %{name}/maven-test-tools.jar
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%{_mavenpomdir}/JPP.%{name}-%{name}.pom
%{_mavendepmapfragdir}/%{name}
@@ -143,6 +140,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavendepmapfragdir}/%{name}-maven-test-tools
%changelog
+* Mon Jan 07 2013 Tomas Radej - 2.1-1
+- Updated to latest upstream version
+- Cleanup - removed patches, old files etc.
+- Added requires to subpackages
+
* Thu Jul 19 2012 Fedora Release Engineering - 2.0-4.alpha1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index c0ab830..b1e9e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b966b2d07d5727da8247f7ca4907dea maven-plugin-testing-2.0-alpha-1.tar.xz
+c3ec130f445df5e955d060b288f854a0 maven-plugin-testing-2.1-source-release.zip