[java-sig-commits] [maven-scm] Remove cvsjava provider to get rid of netbeans-cvsclient dep
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu Feb 9 18:04:51 UTC 2012
commit aa5f38c09a2642977aab4cfc5e6d9b152cf622b1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Feb 3 16:00:56 2012 +0100
Remove cvsjava provider to get rid of netbeans-cvsclient dep
...emove-cvs-support-for-removing-of-netbean.patch | 73 ++++++++++++++++++++
maven-scm.spec | 18 +++---
2 files changed, 82 insertions(+), 9 deletions(-)
---
diff --git a/008-Partially-remove-cvs-support-for-removing-of-netbean.patch b/008-Partially-remove-cvs-support-for-removing-of-netbean.patch
new file mode 100644
index 0000000..503b4c5
--- /dev/null
+++ b/008-Partially-remove-cvs-support-for-removing-of-netbean.patch
@@ -0,0 +1,73 @@
+From 043796bba077c032474acab967fe031de3bdaeb9 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Fri, 3 Feb 2012 15:36:14 +0100
+Subject: [PATCH] Partially remove cvs support for removing of
+ netbeans-cvsclient
+
+---
+ maven-scm-client/pom.xml | 4 ----
+ .../maven-scm-providers-cvs/pom.xml | 1 -
+ .../maven-scm-providers-standard/pom.xml | 5 -----
+ pom.xml | 3 +++
+ 4 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/maven-scm-client/pom.xml b/maven-scm-client/pom.xml
+index 177bf53..e7fdf50 100644
+--- a/maven-scm-client/pom.xml
++++ b/maven-scm-client/pom.xml
+@@ -58,10 +58,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-cvsjava</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ </dependency>
+ <dependency>
+diff --git a/maven-scm-providers/maven-scm-providers-cvs/pom.xml b/maven-scm-providers/maven-scm-providers-cvs/pom.xml
+index dc21897..d53c277 100644
+--- a/maven-scm-providers/maven-scm-providers-cvs/pom.xml
++++ b/maven-scm-providers/maven-scm-providers-cvs/pom.xml
+@@ -37,7 +37,6 @@
+ <modules>
+ <module>maven-scm-provider-cvs-commons</module>
+ <module>maven-scm-provider-cvsexe</module>
+- <module>maven-scm-provider-cvsjava</module>
+ <module>maven-scm-provider-cvstest</module>
+ </modules>
+ </project>
+diff --git a/maven-scm-providers/maven-scm-providers-standard/pom.xml b/maven-scm-providers/maven-scm-providers-standard/pom.xml
+index 18cbd35..33c5757 100644
+--- a/maven-scm-providers/maven-scm-providers-standard/pom.xml
++++ b/maven-scm-providers/maven-scm-providers-standard/pom.xml
+@@ -56,11 +56,6 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-cvsjava</artifactId>
+- <scope>runtime</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+ <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/maven-scm.spec b/maven-scm.spec
index 0f71147..d3d9150 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
Name: maven-scm
Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -47,6 +47,7 @@ Patch1: 004_maven-scm_fix-svn-provider-java.patch
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
BuildArch: noarch
@@ -66,7 +67,6 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven2-common-poms >= 0:1.0-21
BuildRequires: modello >= 1.1
-BuildRequires: netbeans-cvsclient
BuildRequires: plexus-utils >= 1.5.6
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-doxia-sitetools
@@ -79,15 +79,11 @@ BuildRequires: plexus-classworlds
Requires: junit >= 3.8.2
Requires: apache-commons-collections >= 3.1
Requires: modello >= 1.0-0.a8
-Requires: netbeans-cvsclient >= 6.9
Requires: jakarta-oro >= 2.0.8
Requires: plexus-utils >= 1.2
Requires: velocity >= 1.4
Requires: maven
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
-
%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.
@@ -115,15 +111,16 @@ 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 '{}' \;
+
%build
-# -Dmaven.test.skip=true \
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
+mvn-rpmbuild -X\
+ -Dmaven.test.skip=true \
-Dmaven.local.depmap.file=%{SOURCE1} \
install javadoc:aggregate
@@ -178,6 +175,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/*
%changelog
+* Fri Feb 3 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.5-5
+- Remove cvsjava provider to get rid of netbeans-cvsclient dep
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the java-sig-commits
mailing list