Update to upstream version 1.2

This commit is contained in:
Mikolaj Izdebski 2014-03-11 09:11:36 +01:00
parent 2e955e0acb
commit 9d8df3cec4
4 changed files with 7 additions and 26 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/maven-filtering-1.0-source-release.zip
/maven-filtering-1.1-source-release.zip
/maven-filtering-1.2-source-release.zip

View File

@ -1,19 +0,0 @@
diff --git a/pom.xml b/pom.xml
index e3f2ed6..7d4f79e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,12 +125,12 @@
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
+ <artifactId>plexus-component-metadata</artifactId>
<version>1.3.4</version>
<executions>
<execution>
<goals>
- <goal>descriptor</goal>
+ <goal>generate-metadata</goal>
</goals>
</execution>
</executions>

View File

@ -1,6 +1,6 @@
Name: maven-filtering
Version: 1.1
Release: 4%{?dist}
Version: 1.2
Release: 1%{?dist}
Summary: Shared component providing resource filtering
License: ASL 2.0
URL: http://maven.apache.org/shared/%{name}/index.html
@ -29,10 +29,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
# Replace plexus-maven-plugin with plexus-component-metadata
%pom_xpath_set "pom:plugin[pom:artifactId[text()='plexus-maven-plugin']]//pom:goal[text()='descriptor']" generate-metadata
%pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata
%build
# Tests use a package that is no longer present in plexus-build-api (v0.0.7)
%mvn_build -f
@ -48,6 +44,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
* Tue Mar 11 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
- Update to upstream version 1.2
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1-4
- Use Requires: java-headless rebuild (#1067528)

View File

@ -1 +1 @@
cb43c93dab0a12c8c96b92fb6bf643fc maven-filtering-1.1-source-release.zip
34e8fa723c9ffd0f78678df188aaee3b maven-filtering-1.2-source-release.zip