[maven-scm/f17: 4/4] Updated to v1.7

[Tomas Radej]

commit 3881946585d7ab360b6c3bfd46396817d413ed0a
Author: Tomas Radej <tradej at redhat.com>
Date:   Tue Jun 26 14:11:51 2012 +0200

    Updated to v1.7

 009-remove-providers-integrity.patch       |   37 ----------------------------
 011-remove-providers-integrity-fixed.patch |   28 +++++++++++++++++++++
 012-plexus-component-metadata.patch        |   20 +++++++++++++++
 maven-scm.spec                             |   13 +++++++--
 4 files changed, 58 insertions(+), 40 deletions(-)
---
diff --git a/011-remove-providers-integrity-fixed.patch b/011-remove-providers-integrity-fixed.patch
new file mode 100644
index 0000000..802e016
--- /dev/null
+++ b/011-remove-providers-integrity-fixed.patch
@@ -0,0 +1,28 @@
+diff --git a/maven-scm-providers/maven-scm-providers-standard/pom.xml b/maven-scm-providers/maven-scm-providers-standard/pom.xml
+index 68137bf..77496d0 100644
+--- a/maven-scm-providers/maven-scm-providers-standard/pom.xml
++++ b/maven-scm-providers/maven-scm-providers-standard/pom.xml
+@@ -96,11 +96,6 @@
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven.scm</groupId>
+-      <artifactId>maven-scm-provider-integrity</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.maven.scm</groupId>
+       <artifactId>maven-scm-provider-jazz</artifactId>
+       <scope>runtime</scope>
+     </dependency>
+diff --git a/maven-scm-providers/pom.xml b/maven-scm-providers/pom.xml
+index afb8dac..95909b2 100644
+--- a/maven-scm-providers/pom.xml
++++ b/maven-scm-providers/pom.xml
+@@ -49,7 +49,6 @@
+     <module>maven-scm-provider-synergy</module>
+     <module>maven-scm-provider-vss</module>
+     <module>maven-scm-provider-tfs</module>
+-    <module>maven-scm-provider-integrity</module>
+     <module>maven-scm-provider-jazz</module>
+   </modules>
+ 
diff --git a/012-plexus-component-metadata.patch b/012-plexus-component-metadata.patch
new file mode 100644
index 0000000..936a792
--- /dev/null
+++ b/012-plexus-component-metadata.patch
@@ -0,0 +1,20 @@
+diff --git a/maven-scm-providers/maven-scm-provider-jazz/pom.xml b/maven-scm-providers/maven-scm-provider-jazz/pom.xml
+index 249e2cc..4f35d57 100644
+--- a/maven-scm-providers/maven-scm-provider-jazz/pom.xml
++++ b/maven-scm-providers/maven-scm-provider-jazz/pom.xml
+@@ -65,13 +65,13 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <phase>generate-resources</phase>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-scm.spec b/maven-scm.spec
index 4c0c778..d379aba 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           maven-scm
-Version:        1.6
-Release:        3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -46,9 +46,11 @@ Patch1:         007_maven-scm_migration-to-component-metadata.patch
 # remove cvsjava from providers-cvs
 Patch2:         008-Partially-remove-cvs-support-for-removing-of-netbean.patch
 # remove providers-integrity from build (required mks-api packaged for it)
-Patch3:         009-remove-providers-integrity.patch
+Patch3:         011-remove-providers-integrity-fixed.patch
 # set source encoding (tests fail)
 Patch4:         010-set-project-sourceenoding.patch
+# plexus-maven-plugin -> plexus-component-metadata
+Patch5:         012-plexus-component-metadata.patch
 
 BuildArch:      noarch
 
@@ -113,6 +115,7 @@ Javadoc for %{name}.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # We dont have mockito, needed for accurev tests, disable for now
 find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
@@ -179,6 +182,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/*
 
 %changelog
+* Tue Jun 26 2012 Tomas Radej <tradej at redhat.com> - 1.7-1
+- Updated to latest upstream version
+- plexus-maven-plugin -> plexus-component-metadata
+
 * Mon Apr 23 2012 Guido Grazioli <guido.grazioli at gmail.com> - 1.6-3
 - Fix typo