From a30fd7a91f5b62593b0337a757f4db7cdea1b000 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sep 12 2009 11:32:42 +0000 Subject: Update to upstream 1.2. --- diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..fd64dd1 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +maven-scm-1.2.tar.gz diff --git a/maven-scm-jpp-depmap.xml b/maven-scm-jpp-depmap.xml index a5aa48c..b6076e4 100644 --- a/maven-scm-jpp-depmap.xml +++ b/maven-scm-jpp-depmap.xml @@ -1,343 +1,4 @@ - - - org.apache.maven.scm - maven-scm - 1.0-beta-3 - - - JPP/maven-scm - scm - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-api - 1.0-beta-3 - - - JPP/maven-scm - api - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-client - 1.0-beta-3 - - - JPP/maven-scm - client - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-manager-plexus - 1.0-beta-3 - - - JPP/maven-scm - manager-plexus - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-managers - 1.0-beta-3 - - - JPP/maven-scm - managers - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-plugin - 1.0-beta-3 - - - JPP/maven-scm - plugin - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-providers - 1.0-beta-3 - - - JPP/maven-scm - providers - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-bazaar - 1.0-beta-3 - - - JPP/maven-scm - provider-bazaar - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-clearcase - 1.0-beta-3 - - - JPP/maven-scm - provider-clearcase - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-providers-cvs - 1.0-beta-3 - - - JPP/maven-scm - providers-cvs - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-cvsjava - 1.0-beta-3 - - - JPP/maven-scm - provider-cvsjava - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-cvs-commons - 1.0-beta-3 - - - JPP/maven-scm - provider-cvs-commons - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-cvsexe - 1.0-beta-3 - - - JPP/maven-scm - provider-cvsexe - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-cvstest - 1.0-beta-3 - test - - - JPP/maven-scm - provider-cvstest - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-local - 1.0-beta-3 - - - JPP/maven-scm - provider-local - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-perforce - 1.0-beta-3 - - - JPP/maven-scm - provider-perforce - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-starteam - 1.0-beta-3 - - - JPP/maven-scm - provider-starteam - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-providers-svn - 1.0-beta-3 - - - JPP/maven-scm - providers-svn - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-svnjava - 1.0-beta-3 - - - JPP/maven-scm - provider-svnjava - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-svn-commons - 1.0-beta-3 - - - JPP/maven-scm - provider-svn-commons - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-svnexe - 1.0-beta-3 - - - JPP/maven-scm - provider-svnexe - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-svntest - 1.0-beta-3 - test - - - JPP/maven-scm - provider-svntest - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-provider-vss - 1.0-beta-3 - - - JPP/maven-scm - provider-vss - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-site - 1.0-beta-3 - - - JPP/maven-scm - site - 1.0-beta-3 - - - - - - org.apache.maven.scm - maven-scm-test - 1.0-beta-3 - - - JPP/maven-scm - test - 1.0-beta-3 - - - - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-9 - - - JPP/plexus - container-default - 1.0-alpha-9 - - @@ -354,84 +15,6 @@ - org.apache.maven - maven-parent - 2.0 - - - JPP/maven2 - parent - 2.0 - - - - - - org.apache.maven - maven-project - 2.0 - - - JPP/maven2 - project - 2.0 - - - - - - org.apache.maven - maven-settings - 2.0 - - - JPP/maven2 - settings - 2.0 - - - - - - org.apache.maven - maven-plugin-api - 2.0 - - - JPP/maven2 - plugin-api - 2.0 - - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-6 - - - JPP/modello - maven-plugin - 1.0-alpha-6 - - - - - - junit - junit - 3.8.1 - - - JPP - junit - 3.8.1 - - - - - org.tmate javasvn 1.0.3 @@ -443,22 +26,16 @@ - - org.netbeans.lib - cvsclient - 20051129 - - - - - - - org.codehaus.plexus - plexus-utils - 1.1 + org.apache.maven.plugin-testing + maven-plugin-testing-harness + 1.2 + + JPP/maven-shared + plugin-testing-harness + 1.2 + - diff --git a/maven-scm.spec b/maven-scm.spec index 38bc004..85acf93 100644 --- a/maven-scm.spec +++ b/maven-scm.spec @@ -29,11 +29,11 @@ # %define maven_settings_file %{_builddir}/%{name}/settings.xml -%define namedversion 1.0-rc1 +%define namedversion 1.2 Name: maven-scm -Version: 1.0 -Release: 0.5.rc1.2%{?dist} +Version: 1.2 +Release: 1%{?dist} Epoch: 0 Summary: Common API for doing SCM operations License: ASL 2.0 @@ -41,8 +41,8 @@ Group: Development/Libraries URL: http://maven.apache.org/scm # svn export -# http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.0-rc1/ maven-scm/ -# tar czf maven-scm-1.0-rc1.tar.gz maven-scm/ +# http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.2/ maven-scm-1.2/ +# tar czf maven-scm-1.2.tar.gz maven-scm-1.2/ Source0: %{name}-%{namedversion}.tar.gz Source1: %{name}-jpp-depmap.xml Source2: %{name}-mapdeps.xsl @@ -74,6 +74,7 @@ BuildRequires: tomcat5-jsp-2.0-api BuildRequires: tomcat5-servlet-2.4-api BuildRequires: tomcat5 BuildRequires: maven-shared-plugin-testing-harness +BuildRequires: bzr Requires: junit >= 3.8.2 Requires: jakarta-commons-collections >= 3.1 @@ -107,18 +108,10 @@ Group: Documentation Javadoc for %{name}. %prep -%setup -q -n %{name} +%setup -q -#FIXME: Bazaar tests fail since the executable is no available. Disable -# the tests. -rm -rf maven-scm-providers/maven-scm-provider-bazaar/src/test - -%build - -(cd maven-scm-api -cp -p pom.xml pom.xml.noplexusutils.xml -saxon -o pom.xml pom.xml.noplexusutils.xml %{SOURCE2} map=%{SOURCE3} -) +# 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 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL @@ -129,13 +122,13 @@ cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/ ln -s %{_datadir}/netbeans/ide11/modules/org-netbeans-lib-cvsclient.jar \ $MAVEN_REPO_LOCAL/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar -# 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 - +%build +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mvn-jpp \ -e \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven.test.failure.ignore=true \ + -Dmaven2.jpp.depmap.file=%{SOURCE1} \ install javadoc:javadoc %install @@ -203,21 +196,8 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}/client* %{_javadir}/%{name}/manager-plexus* %{_javadir}/%{name}/plugin* -%{_javadir}/%{name}/provider-bazaar* -%{_javadir}/%{name}/provider-clearcase* -%{_javadir}/%{name}/provider-local* -%{_javadir}/%{name}/provider-hg* -%{_javadir}/%{name}/provider-perforce* -%{_javadir}/%{name}/provider-cvs-commons* -%{_javadir}/%{name}/provider-cvsexe* -%{_javadir}/%{name}/provider-cvsjava* -%{_javadir}/%{name}/provider-svn-commons* -%{_javadir}/%{name}/provider-svnexe* -%{_javadir}/%{name}/provider-starteam* -%{_javadir}/%{name}/provider-synergy* -%{_javadir}/%{name}/provider-vss* +%{_javadir}/%{name}/provider-* %{_mavendepmapfragdir} -%doc LICENSE.txt NOTICE.txt %files test %defattr(-,root,root,-) @@ -230,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/* %changelog +* Sat Sep 12 2009 Alexander Kurtakov 0:1.2-1 +- Update to upstream 1.2. + * Tue Sep 01 2009 Andrew Overholt 1.0-0.5.rc1.2 - Bump release diff --git a/sources b/sources index b792e53..00eaaf6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0c5a74ab3350d80fb2a2072eb3c7a096 maven-scm-1.0-rc1.tar.gz +c4a4502e9cd656ffa8701d411584a3de maven-scm-1.2.tar.gz