mizdebsk pushed to maven-plugin-testing (master). "Port to plexus-utils 3.0.21 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 06:01:51 UTC 2015
>From a6efe5e52dbcc7f1ffc02f4cb98930234b1c595e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 27 Mar 2015 07:00:33 +0100
Subject: Port to plexus-utils 3.0.21
- Remove legacy maven-shared provides
- Regenerate build-requires
diff --git a/0001-Port-to-plexus-utils-3.0.21.patch b/0001-Port-to-plexus-utils-3.0.21.patch
new file mode 100644
index 0000000..f9e7b49
--- /dev/null
+++ b/0001-Port-to-plexus-utils-3.0.21.patch
@@ -0,0 +1,39 @@
+From 30148a1592f5f6f2626b977cc57ada82c94608fa Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 27 Mar 2015 06:51:35 +0100
+Subject: [PATCH] Port to plexus-utils 3.0.21
+
+---
+ .../main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java | 2 +-
+ pom.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
+index 8b047a7..4d35dc4 100644
+--- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
++++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
+@@ -156,7 +156,7 @@ public abstract class AbstractMojoTestCase
+ XmlStreamReader reader = new XmlStreamReader( is );
+
+ InterpolationFilterReader interpolationFilterReader =
+- new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() );
++ new InterpolationFilterReader( new BufferedReader( reader ), ( Map ) container.getContext().getContextData() );
+
+ PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationFilterReader );
+
+diff --git a/pom.xml b/pom.xml
+index 5f91fad..0731a02 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -194,7 +194,7 @@ under the License.
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+- <version>3.0.15</version>
++ <version>3.0.21</version>
+ <scope>provided</scope>
+ </dependency>
+
+--
+2.1.0
+
diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec
index ddab9f2..21dc43a 100644
--- a/maven-plugin-testing.spec
+++ b/maven-plugin-testing.spec
@@ -1,23 +1,32 @@
Name: maven-plugin-testing
Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Plugin Testing
License: ASL 2.0
URL: http://maven.apache.org/plugin-testing/
+BuildArch: noarch
+
Source0: http://repo1.maven.org/maven2/org/apache/maven/plugin-testing/%{name}/%{version}/%{name}-%{version}-source-release.zip
-BuildArch: noarch
-
-BuildRequires: easymock3
-BuildRequires: junit
-BuildRequires: java-devel
-BuildRequires: maven-local
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: plexus-containers-component-metadata
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-reporting-impl
-BuildRequires: maven-site-plugin
+
+Patch0: 0001-Port-to-plexus-utils-3.0.21.patch
+
+BuildRequires: maven-local
+BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven:maven-aether-provider)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.apache.maven.shared:maven-invoker)
+BuildRequires: mvn(org.apache.maven.wagon:wagon-file)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.easymock:easymock)
%description
The Maven Plugin Testing contains the necessary modules
@@ -32,7 +41,6 @@ API documentation for %{name}.
%package harness
Summary: Maven Plugin Testing Mechanism
Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2
-Provides: maven-shared-plugin-testing-harness = 1:%{version}-%{release}
%description harness
The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
@@ -40,7 +48,6 @@ The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo.
%package tools
Summary: Maven Plugin Testing Tools
Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release}
-Provides: maven-shared-plugin-testing-tools = 1:%{version}-%{release}
%description tools
A set of useful tools to help the Maven Plugin testing.
@@ -48,13 +55,13 @@ A set of useful tools to help the Maven Plugin testing.
%package -n maven-test-tools
Summary: Maven Testing Tool
Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release}
-Provides: maven-shared-test-tools = 1:%{version}-%{release}
%description -n maven-test-tools
Framework to test Maven Plugins with Easymock objects.
%prep
%setup -q
+%patch0 -p1
%pom_remove_plugin :maven-enforcer-plugin
sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java
@@ -63,13 +70,12 @@ sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apa
%mvn_alias : org.apache.maven.shared:
# Tests are skipped due to some test failures most probably caused by issues
# with our plexus container
-%mvn_build -f -s -X
+%mvn_build -f -s
%install
%mvn_install
%files -f .mfiles-%{name}
-%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
%files harness -f .mfiles-%{name}-harness
%files tools -f .mfiles-%{name}-tools
@@ -78,6 +84,11 @@ sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apa
%doc LICENSE NOTICE
%changelog
+* Fri Mar 27 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.3.0-2
+- Port to plexus-utils 3.0.21
+- Remove legacy maven-shared provides
+- Regenerate build-requires
+
* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.3.0-1
- Update to upstream version 3.3.0
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/maven-plugin-testing.git/commit/?h=master&id=a6efe5e52dbcc7f1ffc02f4cb98930234b1c595e
More information about the scm-commits
mailing list