rpms/maven2-common-poms/devel JPP-avalon-framework.pom, NONE, 1.1.2.1 JPP-avalon-logkit.pom, NONE, 1.1.2.1 maven2-common-poms-jpp-depmap.xml, 1.2, 1.2.2.1 maven2-common-poms.spec, 1.5, 1.5.2.1 sources, 1.2, 1.2.2.1
Fernando Nasser
fnasser at fedoraproject.org
Mon May 11 18:23:02 UTC 2009
Author: fnasser
Update of /cvs/extras/rpms/maven2-common-poms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32033
Modified Files:
Tag: private-newmaven-branch
maven2-common-poms-jpp-depmap.xml maven2-common-poms.spec
sources
Added Files:
Tag: private-newmaven-branch
JPP-avalon-framework.pom JPP-avalon-logkit.pom
Log Message:
Update for maven 2.0.8 pre-bootstrap
--- NEW FILE JPP-avalon-framework.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.3</version>
</project>
--- NEW FILE JPP-avalon-logkit.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2.2</version>
</project>
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.2 -r 1.2.2.1 maven2-common-poms-jpp-depmap.xml
Index: maven2-common-poms-jpp-depmap.xml
===================================================================
RCS file: /cvs/extras/rpms/maven2-common-poms/devel/maven2-common-poms-jpp-depmap.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- maven2-common-poms-jpp-depmap.xml 20 Mar 2007 14:11:06 -0000 1.2
+++ maven2-common-poms-jpp-depmap.xml 11 May 2009 18:22:32 -0000 1.2.2.1
@@ -127,7 +127,7 @@
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>saxpath</artifactId>
+ <artifactId>jaxen</artifactId>
<version>1.0-FCS</version>
</jpp>
</dependency>
@@ -286,36 +286,36 @@
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</maven>
<jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>plugin-tools</artifactId>
- <version>2.0.4</version>
+ <groupId>JPP/maven-plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-converter</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>model-converter</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>core</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
@@ -478,12 +478,12 @@
<maven>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>1.5.2</version>
+ <version>2.3</version>
</maven>
<jpp>
<groupId>JPP/maven-surefire</groupId>
<artifactId>surefire</artifactId>
- <version>1.5.2</version>
+ <version>2.3</version>
</jpp>
</dependency>
<dependency>
@@ -501,37 +501,85 @@
<dependency>
<maven>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>2.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-surefire</groupId>
+ <artifactId>api</artifactId>
+ <version>2.3</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>1.5.2</version>
+ <version>2.3</version>
</maven>
<jpp>
<groupId>JPP/maven-surefire</groupId>
<artifactId>booter</artifactId>
- <version>1.5.2</version>
+ <version>2.3</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-providers</artifactId>
+ <version>2.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-surefire</groupId>
+ <artifactId>providers</artifactId>
+ <version>2.3</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit</artifactId>
+ <version>2.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-surefire</groupId>
+ <artifactId>junit</artifactId>
+ <version>2.3</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-root</artifactId>
+ <version>1.1</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-surefire</groupId>
+ <artifactId>surefire-root</artifactId>
+ <version>1.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>artifact-manager</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0.4</version>
+ <version>2.2</version>
</maven>
<jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>archiver</artifactId>
- <version>2.0.4</version>
+ <groupId>JPP</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.2</version>
</jpp>
</dependency>
<dependency>
@@ -541,33 +589,33 @@
<version>2.0.2</version>
</maven>
<jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>plugin-tools-api</artifactId>
- <version>2.0.4</version>
+ <groupId>JPP/maven-plugin-tools</groupId>
+ <artifactId>api</artifactId>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-test</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</maven>
<jpp>
<groupId>JPP/maven2</groupId>
<artifactId>artifact-test</artifactId>
- <version>2.0.4</version>
+ <version>2.0.7</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.apache.maven</groupId>
[...2037 lines suppressed...]
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-core</artifactId>
+ <version>1.0-alpha-15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>core</artifactId>
+ <version>1.0-alpha-15</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-site</artifactId>
+ <version>1.0-alpha-15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>site</artifactId>
+ <version>1.0-alpha-15</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-ojb</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-ojb</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-jpa</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-jpa</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-hibernate-store</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-hibernate-store</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-ldap</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-ldap</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-prevayler</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-prevayler</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-dom4j</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-dom4j</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugins-sandbox</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugins-sandbox</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-stash</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-stash</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-dtd</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-dtd</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-velocity</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-velocity</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-jdbc</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>plugin-jdbc</artifactId>
+ <version>1.0-alpha-4-SNAPSHOT</version>
+ </jpp>
+ </dependency>
+
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello</artifactId>
+ <version>1.0-alpha-15</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/modello</groupId>
+ <artifactId>modello</artifactId>
+ <version>1.0-alpha-15</version>
+ </jpp>
+ </dependency>
+
+ <!-- Wagon WEBDAV support is disabled in fedora because we do not wish to
+ import a dependency of it (jakarta slide, which is now officially
+ a dead project)
+ -->
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-1</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven2</groupId>
+ <artifactId>empty-dep</artifactId>
+ <version>1.0-beta-1</version>
+ </jpp>
+ </dependency>
</dependencies>
-
Index: maven2-common-poms.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2-common-poms/devel/maven2-common-poms.spec,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -p -r1.5 -r1.5.2.1
--- maven2-common-poms.spec 25 Feb 2009 23:53:32 -0000 1.5
+++ maven2-common-poms.spec 11 May 2009 18:22:32 -0000 1.5.2.1
@@ -33,10 +33,10 @@
Name: %{parent}-%{subname}
Version: 1.0
-Release: 5.4%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Common poms for maven2
-License: ASL 2.0 and BSD
+License: Apache Software License, BSD
Group: Development/Java
URL: http://jpackage.org/
@@ -59,6 +59,10 @@ packages.
%prep
%setup -q -n %{name}
+# update logkit version to 1.2.2
+sed -i "s|1.0.1|1.2.2|" JPP.excalibur-logkit.pom
+
+
tar xzf %{SOURCE2}
%build
@@ -88,14 +92,18 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/maven2
%changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-5.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Fri Feb 06 2009 Yong Yang <yyang at redhat.com> 1.0-7
+- Fix release tag
+- Fix JPP.excalibur-logkit.pom's version by sed
+
+* Tue Jan 06 2009 Yong Yang <yyang at redhat.com> 1.0-6jpp.1
+- Import into jpackage devel
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-4.4
-- drop repotag
+* Mon Jan 07 2008 Deepak Bhole <dbhole at redhat.com> 1.0-5jpp.1
+- Update for maven 2.0.8
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-4jpp.3
-- fix license tag
+* Thu Jul 26 2007 Deepak Bhole <dbhole at redhat.com> 1.0-4jpp.3
+- Updated depmap
* Thu Mar 15 2007 Deepak Bhole <dbhole at redhat.com> 1.0-4jpp.2
- Updated depmap to make javax-servlet be tomcat-2.4-servlet-api
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maven2-common-poms/devel/sources,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- sources 14 Mar 2007 15:25:51 -0000 1.2
+++ sources 11 May 2009 18:22:32 -0000 1.2.2.1
@@ -1,2 +1,2 @@
e1a697356772cf0dc7badade59aa922b maven2-common-poms-docs.tar.gz
-d2a002146837474e38af818a0049ff83 maven2-common-poms-src.tar.gz
+1c5984e16007290912b8eaaeaaf27c14 maven2-common-poms-src.tar.gz
More information about the scm-commits
mailing list