diff --git a/.gitignore b/.gitignore index c34d818..e764615 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/maven-filtering-plexus.patch b/maven-filtering-plexus.patch deleted file mode 100644 index f8295fe..0000000 --- a/maven-filtering-plexus.patch +++ /dev/null @@ -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 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - 1.3.4 - - - -- descriptor -+ generate-metadata - - - diff --git a/maven-filtering.spec b/maven-filtering.spec index 479375a..ef3638d 100644 --- a/maven-filtering.spec +++ b/maven-filtering.spec @@ -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 - 1.2-1 +- Update to upstream version 1.2 + * Tue Mar 04 2014 Stanislav Ochotnicky - 1.1-4 - Use Requires: java-headless rebuild (#1067528) diff --git a/sources b/sources index bfab86c..0913028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb43c93dab0a12c8c96b92fb6bf643fc maven-filtering-1.1-source-release.zip +34e8fa723c9ffd0f78678df188aaee3b maven-filtering-1.2-source-release.zip