rpms/maven-scm/devel .cvsignore, NONE, 1.1 maven-scm-jpp-depmap.xml, 1.1, 1.2 sources, 1.2, 1.3 maven-scm.spec, 1.14, 1.15
Alexander Kurtakov
akurtakov at fedoraproject.org
Sat Sep 12 11:32:42 UTC 2009
- Previous message: rpms/purple-microblog/devel .cvsignore, 1.6, 1.7 import.log, 1.2, 1.3 purple-microblog.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message: rpms/sugar-chat/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-chat.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/maven-scm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22569/devel
Modified Files:
maven-scm-jpp-depmap.xml sources maven-scm.spec
Added Files:
.cvsignore
Log Message:
Update to upstream 1.2.
--- NEW FILE .cvsignore ---
maven-scm-1.2.tar.gz
Index: maven-scm-jpp-depmap.xml
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven-scm-jpp-depmap.xml 20 Mar 2007 05:10:02 -0000 1.1
+++ maven-scm-jpp-depmap.xml 12 Sep 2009 11:32:42 -0000 1.2
@@ -1,343 +1,4 @@
<dependencies>
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>scm</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>api</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-client</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>client</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-manager-plexus</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>manager-plexus</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-managers</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>managers</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>plugin</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-providers</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>providers</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-bazaar</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-bazaar</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-clearcase</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-clearcase</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-providers-cvs</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>providers-cvs</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsjava</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-cvsjava</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs-commons</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-cvs-commons</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-cvsexe</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvstest</artifactId>
- <version>1.0-beta-3</version>
- <scope>test</scope>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-cvstest</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-local</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-local</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-perforce</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-perforce</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-starteam</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-starteam</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-providers-svn</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>providers-svn</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-svnjava</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn-commons</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-svn-commons</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svnexe</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-svnexe</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svntest</artifactId>
- <version>1.0-beta-3</version>
- <scope>test</scope>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-svntest</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-vss</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>provider-vss</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-site</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>site</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-test</artifactId>
- <version>1.0-beta-3</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-scm</groupId>
- <artifactId>test</artifactId>
- <version>1.0-beta-3</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- </maven>
- <jpp>
- <groupId>JPP/plexus</groupId>
- <artifactId>container-default</artifactId>
- <version>1.0-alpha-9</version>
- </jpp>
- </dependency>
<dependency>
<maven>
@@ -354,84 +15,6 @@
<dependency>
<maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>2.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>parent</artifactId>
- <version>2.0</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>project</artifactId>
- <version>2.0</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>2.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>settings</artifactId>
- <version>2.0</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>plugin-api</artifactId>
- <version>2.0</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-6</version>
- </maven>
- <jpp>
- <groupId>JPP/modello</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>1.0-alpha-6</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </jpp>
- </dependency>
-
- <dependency>
- <maven>
<groupId>org.tmate</groupId>
<artifactId>javasvn</artifactId>
<version>1.0.3</version>
@@ -443,22 +26,16 @@
</jpp>
</dependency>
- <!-- needed for cvsjava; disabled for now since we don't have this -->
<dependency>
<maven>
- <groupId>org.netbeans.lib</groupId>
- <artifactId>cvsclient</artifactId>
- <version>20051129</version>
- </maven>
- </dependency>
-
- <!-- needed for svnjava; disabled for now since we don't have this -->
- <dependency>
- <maven>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.1</version>
- </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>
</dependency>
</dependencies>
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 31 Aug 2009 19:03:52 -0000 1.2
+++ sources 12 Sep 2009 11:32:42 -0000 1.3
@@ -1 +1,2 @@
0c5a74ab3350d80fb2a2072eb3c7a096 maven-scm-1.0-rc1.tar.gz
+c4a4502e9cd656ffa8701d411584a3de maven-scm-1.2.tar.gz
Index: maven-scm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-scm/devel/maven-scm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- maven-scm.spec 1 Sep 2009 15:43:26 -0000 1.14
+++ maven-scm.spec 12 Sep 2009 11:32:42 -0000 1.15
@@ -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/n
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 <akurtako at redhat.com> 0:1.2-1
+- Update to upstream 1.2.
+
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 1.0-0.5.rc1.2
- Bump release
- Previous message: rpms/purple-microblog/devel .cvsignore, 1.6, 1.7 import.log, 1.2, 1.3 purple-microblog.spec, 1.11, 1.12 sources, 1.7, 1.8
- Next message: rpms/sugar-chat/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sugar-chat.spec, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list