[maven-scm] Update to 1.6 release
Guido Grazioli
guidograzioli at fedoraproject.org
Mon Apr 9 02:53:42 UTC 2012
commit 066120bb8228584f052d3d807bee585a97638740
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date: Mon Apr 9 12:53:34 2012 +1000
Update to 1.6 release
- Fix typo in description
- Remove unused patches 001 (mockito now available), 004 and 006
- Update patch 007 (plexus-containers-component-metadata)
- Move source encoding setting to separate patch
.gitignore | 1 +
001_maven-scm_remove-mockito-test-dep.patch | 15 --------
004_maven-scm_fix-svn-provider-java.patch | 19 ----------
006_maven-scm_fix-vss-provider-java.patch | 19 ----------
...maven-scm_migration-to-component-metadata.patch | 31 ++++++++++++++++
...emove-cvs-support-for-removing-of-netbean.patch | 14 -------
009-remove-providers-integrity.patch | 37 ++++++++++++++++++++
010-set-project-sourceenoding.patch | 10 +++++
maven-scm.spec | 32 +++++++++++------
sources | 2 +-
10 files changed, 100 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 18aa7f1..59f06a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-scm-1.2.tar.xz
/maven-scm-1.4.tar.xz
maven-scm-1.5-source-release.zip
+/maven-scm-1.6-source-release.zip
diff --git a/007_maven-scm_migration-to-component-metadata.patch b/007_maven-scm_migration-to-component-metadata.patch
index a39150f..4352b71 100644
--- a/007_maven-scm_migration-to-component-metadata.patch
+++ b/007_maven-scm_migration-to-component-metadata.patch
@@ -1,4 +1,35 @@
diff -Naur maven-scm-1.5.orig/maven-scm-client/pom.xml maven-scm-1.5/maven-scm-client/pom.xml
+--- maven-scm-1.6.orig/pom.xml 2011-11-29 09:12:02.000000000 +1100
++++ maven-scm-1.6/pom.xml 2012-04-09 11:52:46.413000191 +1000
+@@ -305,8 +305,8 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
++ <version>1.5.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+--- maven-scm-1.6.orig/maven-scm-providers/maven-scm-provider-integrity/pom.xml 2011-11-29 09:11:54.000000000 +1100
++++ maven-scm-1.6/maven-scm-providers/maven-scm-provider-integrity/pom.xml 2012-04-09 11:57:23.708000156 +1000
+@@ -68,13 +68,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>
--- maven-scm-1.5.orig/maven-scm-client/pom.xml 2011-03-28 22:40:54.000000000 +0200
+++ maven-scm-1.5/maven-scm-client/pom.xml 2011-11-15 15:43:14.201177167 +0100
@@ -103,7 +103,7 @@
diff --git a/008-Partially-remove-cvs-support-for-removing-of-netbean.patch b/008-Partially-remove-cvs-support-for-removing-of-netbean.patch
index 503b4c5..44e2340 100644
--- a/008-Partially-remove-cvs-support-for-removing-of-netbean.patch
+++ b/008-Partially-remove-cvs-support-for-removing-of-netbean.patch
@@ -54,20 +54,6 @@ index 18cbd35..33c5757 100644
<artifactId>maven-scm-provider-gitexe</artifactId>
<scope>runtime</scope>
</dependency>
-diff --git a/pom.xml b/pom.xml
-index a5ab2ad..8114634 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -33,6 +33,9 @@
- <artifactId>maven-scm</artifactId>
- <version>1.5</version>
- <packaging>pom</packaging>
-+ <properties>
-+ <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-+ </properties>
-
- <name>Maven SCM</name>
- <description>Maven SCM provides a common API for doing SCM operations.</description>
--
1.7.7.6
diff --git a/009-remove-providers-integrity.patch b/009-remove-providers-integrity.patch
new file mode 100644
index 0000000..bf25127
--- /dev/null
+++ b/009-remove-providers-integrity.patch
@@ -0,0 +1,37 @@
+--- maven-scm-1.6.orig/maven-scm-providers/pom.xml 2011-11-29 09:12:02.000000000 +1100
++++ maven-scm-1.6/maven-scm-providers/pom.xml 2012-04-09 12:17:06.386000022 +1000
+@@ -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>
+ </modules>
+
+ <dependencyManagement>
+--- maven-scm-1.6.orig/pom.xml 2012-04-09 11:58:35.592000023 +1000
++++ maven-scm-1.6/pom.xml 2012-04-09 12:18:55.677000004 +1000
+@@ -200,11 +200,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-integrity</artifactId>
+- <version>${project.version}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+--- maven-scm-1.6.orig/maven-scm-providers/maven-scm-providers-standard/pom.xml 2012-04-09 12:20:30.211000034 +1000
++++ maven-scm-1.6/maven-scm-providers/maven-scm-providers-standard/pom.xml 2012-04-09 12:24:22.104000034 +1000
+@@ -94,10 +99,5 @@
+ <artifactId>maven-scm-provider-tfs</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-integrity</artifactId>
+- <scope>runtime</scope>
+- </dependency>
+ </dependencies>
+ </project>
diff --git a/010-set-project-sourceenoding.patch b/010-set-project-sourceenoding.patch
new file mode 100644
index 0000000..d4a0373
--- /dev/null
+++ b/010-set-project-sourceenoding.patch
@@ -0,0 +1,10 @@
+--- maven-scm-1.6.orig/pom.xml 2012-04-09 12:25:25.142000034 +1000
++++ maven-scm-1.6/pom.xml 2012-04-09 12:28:40.715000036 +1000
+@@ -41,6 +41,7 @@
+ <properties>
+ <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/scm/</siteDeployUrl>
+ <siteUrl>http://maven.apache.org/scm/</siteUrl>
++ <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+ </properties>
+
+ <mailingLists>
diff --git a/maven-scm.spec b/maven-scm.spec
index d3d9150..70d3d59 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -29,8 +29,8 @@
#
Name: maven-scm
-Version: 1.5
-Release: 5%{?dist}
+Version: 1.6
+Release: 1%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -39,15 +39,16 @@ URL: http://maven.apache.org/scm
Source0: http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-jpp-depmap.xml
-# remove dependency on mockito per accurev provider tests
-Patch0: 001_maven-scm_remove-mockito-test-dep.patch
-# fix a missing cast (plexus-container-default version mismatch?)
-Patch1: 004_maven-scm_fix-svn-provider-java.patch
# fix modello configuration in vss provider pom and the cast as above
-Patch2: 005_maven-scm_fix-vss-provider-pom.patch
-Patch3: 006_maven-scm_fix-vss-provider-java.patch
-Patch4: 007_maven-scm_migration-to-component-metadata.patch
-Patch5: 008-Partially-remove-cvs-support-for-removing-of-netbean.patch
+Patch0: 005_maven-scm_fix-vss-provider-pom.patch
+# replace plexus-maven-plugin for plexus-component-metadata
+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
+# set source encoding (tests fail)
+Patch4: 010-set-project-sourceenoding.patch
BuildArch: noarch
@@ -75,6 +76,7 @@ BuildRequires: bzr
BuildRequires: subversion
BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-classworlds
+BuildRequires: mockito
Requires: junit >= 3.8.2
Requires: apache-commons-collections >= 3.1
@@ -86,7 +88,7 @@ Requires: maven
%description
Maven SCM supports Maven plugins (e.g. maven-release-plugin) and other
-tools (e.g. Continum) in providing them a common API for doing SCM operations.
+tools (e.g. Continuum) in providing them a common API for doing SCM operations.
%package test
Summary: Tests for %{name}
@@ -111,7 +113,6 @@ 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 '{}' \;
@@ -175,6 +176,13 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/*
%changelog
+* Mon Apr 09 2012 Guido Grazioli <guido.grazioli at gmail.com> - 1.6-1
+- Update to 1.6 release
+- Fix typo in description
+- Remove unused patches 001 (mockito now available), 004 and 006
+- Update patch 007 (plexus-containers-component-metadata)
+- Move source encoding setting to separate patch
+
* Fri Feb 3 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.5-5
- Remove cvsjava provider to get rid of netbeans-cvsclient dep
diff --git a/sources b/sources
index 988cde5..f50d8b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da090d412eb53a2e36042b0c37888f0d maven-scm-1.5-source-release.zip
+ccdb4b61cf82ef0a69cad05c4f23189d maven-scm-1.6-source-release.zip
More information about the scm-commits
mailing list