[maven-scm] * Tue Sep 07 2010 Guido Grazioli <guido.grazioli at gmail.com> 0:1.4-1 - Update to upstream 1.4 (#62645

Wed Sep 8 16:45:53 UTC 2010

commit ec5712d39df05d32553b30ec37c36130a6c469d2
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date:   Wed Sep 8 18:42:22 2010 +0200

    * Tue Sep 07 2010 Guido Grazioli <guido.grazioli at gmail.com> 0:1.4-1
    - Update to upstream 1.4 (#626455)
    - Require netbeans-cvsclient instead of netbeans-ide (#572165)

 cvsclient-20060125.pom            |   16 --
 maven-scm-add-plexusutils-dep.xml |    9 -
 maven-scm-jpp-depmap.xml          |   22 ++--
 maven-scm-mapdeps.xsl             |  328 -------------------------------------
 maven-scm.spec                    |   74 +++++----
 5 files changed, 53 insertions(+), 396 deletions(-)
---

diff --git a/maven-scm-jpp-depmap.xml b/maven-scm-jpp-depmap.xml
index b6076e4..006bec5 100644
--- a/maven-scm-jpp-depmap.xml
+++ b/maven-scm-jpp-depmap.xml
@@ -1,5 +1,4 @@
 <dependencies>
-
   <dependency>
 	<maven>
 	  <groupId>regexp</groupId>
@@ -27,15 +26,16 @@
   </dependency>
 
   <dependency>
-	<maven>
-	  <groupId>org.apache.maven.plugin-testing</groupId>
-	  <artifactId>maven-plugin-testing-harness</artifactId>
-	  <version>1.2</version>
-	</maven>
-	<jpp>                                                    
-        <groupId>JPP/maven-shared</groupId>                  
-        <artifactId>plugin-testing-harness</artifactId>      
-        <version>1.2</version>                               
-    </jpp>     
+    <maven>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>1.5.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/plexus</groupId>
+        <artifactId>container-default</artifactId>
+        <version>1.0-alpha-9</version>
+    </jpp>
   </dependency>
+
 </dependencies>
diff --git a/maven-scm.spec b/maven-scm.spec
index 65690e2..ff690c7 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -29,11 +29,11 @@
 #
 
 %global maven_settings_file %{_builddir}/%{name}/settings.xml
-%global namedversion 1.2
+%global namedversion 1.4
 
 Name:           maven-scm
-Version:        1.2
-Release:        6%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -41,22 +41,28 @@ Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
 # svn export 
-#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.2/ maven-scm-1.2/
-# tar cJf maven-scm-1.2.tar.xz maven-scm-1.2/
+#   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.4/ maven-scm-1.4/
+# tar cJf maven-scm-1.4.tar.xz maven-scm-1.4/
 Source0:        %{name}-%{namedversion}.tar.xz
 Source1:        %{name}-jpp-depmap.xml
-Source2:        %{name}-mapdeps.xsl
-Source3:        %{name}-add-plexusutils-dep.xml
 
-# Keeping this here means we don't have to modify the netbeans package
-Source4:        http://repo2.maven.org/maven2/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.pom
+# remove dependency on mockito per accurev provider tests
+Patch0:         001_maven-scm_remove-mockito-test-dep.patch
+# fix package name in svn provider
+Patch1:         002_maven-scm_fix-svn-provider-build.patch
+# fix a missing cast (plexus-container-default version mismatch?)
+Patch3:         004_maven-scm_fix-svn-provider-java.patch
+# fix modello configuration in vss provider pom and the cast as above
+Patch4:         005_maven-scm_fix-vss-provider-pom.patch
+Patch5:         006_maven-scm_fix-vss-provider-java.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  maven2 >= 2.0.4-6
+BuildRequires:  maven2 >= 2.0.6
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
@@ -64,27 +70,33 @@ BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-plugin
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-invoker-plugin
+BuildRequires:  maven-shared-invoker
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-common-poms >= 0:1.0-13
-BuildRequires:  modello >= 1.0-0.a8
-BuildRequires:  modello-maven-plugin >= 1.0-0.a8
-BuildRequires:  netbeans-ide >= 6.7.1
-BuildRequires:  plexus-utils >= 1.2
+BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  maven2-common-poms >= 0:1.0-21
+BuildRequires:  modello >= 1.1
+BuildRequires:  modello-maven-plugin >= 1.1
+BuildRequires:  netbeans-cvsclient
+BuildRequires:  plexus-utils >= 1.5.6
 BuildRequires:  saxon-scripts
 BuildRequires:  tomcat5-jsp-2.0-api
 BuildRequires:  tomcat5-servlet-2.4-api
 BuildRequires:  tomcat5
 BuildRequires:  maven-shared-plugin-testing-harness
 BuildRequires:  maven-doxia-sitetools
+BuildRequires:  plexus-interpolation
 BuildRequires:  bzr
 BuildRequires:  plexus-maven-plugin
+BuildRequires:  plexus-classworlds
 
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
 Requires:       modello >= 1.0-0.a8
 Requires:       modello-maven-plugin >= 1.0-0.a8
-Requires:       netbeans-ide >= 6.7.1
+Requires:       netbeans-cvsclient >= 6.9
 Requires:       jakarta-oro >= 2.0.8
 Requires:       plexus-utils >= 1.2
 Requires:       velocity >= 1.4
@@ -113,27 +125,28 @@ Javadoc for %{name}.
 
 %prep
 %setup -q 
+%patch0 -p1
+%patch1 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # We don't have svm synergy classes, so disable those tests for now
-rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
+#rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
+# 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 '{}' \;
 
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
-# Doing this here means we don't have to modify the netbeans package
-mkdir -p $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
-cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/
-ln -s %{_datadir}/netbeans/ide12/modules/org-netbeans-lib-cvsclient.jar \
-  $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar
-
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-jpp \
-        -e \
+        -e  \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.failure.ignore=true \
         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -170,12 +183,6 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 
 %add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
 
-# link cvsclient.jar in the right place; this has to be moved to netbeans-lib
-# when cvsclient will be split in a subpackage
-ln -s %{_datadir}/netbeans/ide12/modules/org-netbeans-lib-cvsclient.jar \
-  $RPM_BUILD_ROOT/%{_javadir}/cvsclient.jar
-
-
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -207,7 +214,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}/manager-plexus*
 %{_javadir}/%{name}/plugin*
 %{_javadir}/%{name}/provider-*
-%{_javadir}/cvsclient.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
@@ -222,6 +228,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Tue Sep 07 2010 Guido Grazioli <guido.grazioli at gmail.com> 0:1.4-1
+- Update to upstram 1.4 (#626455)
+- Require netbeans-cvsclient instead of netbeans-ide (#572165)
+
 * Mon May 10 2010 Guido Grazioli <guido.grazioli at gmail.com> 0:1.2-6
 - Link netbeans-lib-cvsclient jar in the right place.
 - Switch to xz compression.
