You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/10 02:28:12 UTC
svn commit: r420380 - in /geronimo/sandbox/svkmerge/trunk: ./ etc/
m2-plugins/ modules/ plugins/ plugins/geronimo-packaging-plugin/
Author: jdillon
Date: Sun Jul 9 17:28:11 2006
New Revision: 420380
URL: http://svn.apache.org/viewvc?rev=420380&view=rev
Log:
Bring svkmerge/trunk in sync w/trunk
Modified:
geronimo/sandbox/svkmerge/trunk/ (props changed)
geronimo/sandbox/svkmerge/trunk/etc/explicit_versions.properties
geronimo/sandbox/svkmerge/trunk/etc/project.properties
geronimo/sandbox/svkmerge/trunk/m2-plugins/pom.xml (props changed)
geronimo/sandbox/svkmerge/trunk/modules/project.properties
geronimo/sandbox/svkmerge/trunk/plugins/geronimo-packaging-plugin/project.properties
geronimo/sandbox/svkmerge/trunk/plugins/project.properties
geronimo/sandbox/svkmerge/trunk/pom.xml (props changed)
geronimo/sandbox/svkmerge/trunk/project.properties
Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Jul 9 17:28:11 2006
@@ -1,2 +1,2 @@
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:419806
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:420202
Modified: geronimo/sandbox/svkmerge/trunk/etc/explicit_versions.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/etc/explicit_versions.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/etc/explicit_versions.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/etc/explicit_versions.properties Sun Jul 9 17:28:11 2006
@@ -6,7 +6,7 @@
# groupid///=version (the former are checked first)
#
activeio///=2.0-r118
-activemq///=3.2.4-SNAPSHOT
+activemq///=3.2.4
geronimo///=1.2-SNAPSHOT
openejb///=2.2-SNAPSHOT
tranql/tranql//jar=1.4-SNAPSHOT
Modified: geronimo/sandbox/svkmerge/trunk/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/etc/project.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/etc/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/etc/project.properties Sun Jul 9 17:28:11 2006
@@ -88,7 +88,7 @@
# Dependency Versions
#####################################################
activeio_version=2.0-r118
-activemq_version=3.2.4-SNAPSHOT
+activemq_version=3.2.4
geronimo_version=1.2-SNAPSHOT
openejb_version=2.2-SNAPSHOT
tranql_version=1.4-SNAPSHOT
Modified: geronimo/sandbox/svkmerge/trunk/modules/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/project.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/project.properties Sun Jul 9 17:28:11 2006
@@ -30,6 +30,6 @@
maven.remote.group=apcvs
maven.username=${user.name}
maven.repo.central=apache.org
-maven.repo.central.directory=/www/cvs.apache.org/repository
+maven.repo.central.directory=/www/people.apache.org/repository
Modified: geronimo/sandbox/svkmerge/trunk/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/plugins/geronimo-packaging-plugin/project.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/plugins/geronimo-packaging-plugin/project.properties Sun Jul 9 17:28:11 2006
@@ -22,8 +22,6 @@
maven.compile.source=1.4
maven.compile.target=1.4
-maven.repo.remote=http://cvs.apache.org/repository, http://www.ibiblio.org/maven
-
maven.multiproject.type=plugin
geronimo_version=1.2-SNAPSHOT
Modified: geronimo/sandbox/svkmerge/trunk/plugins/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/plugins/project.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/plugins/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/plugins/project.properties Sun Jul 9 17:28:11 2006
@@ -27,6 +27,6 @@
maven.remote.group=apcvs
maven.username=${user.name}
maven.repo.central=apache.org
-maven.repo.central.directory=/www/cvs.apache.org/repository
+maven.repo.central.directory=/www/people.apache.org/repository
Modified: geronimo/sandbox/svkmerge/trunk/project.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/project.properties?rev=420380&r1=420379&r2=420380&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/project.properties (original)
+++ geronimo/sandbox/svkmerge/trunk/project.properties Sun Jul 9 17:28:11 2006
@@ -53,7 +53,7 @@
maven.username=${user.name}
maven.repo.central=apache.org
-maven.repo.central.directory=/www/cvs.apache.org/repository
+maven.repo.central.directory=/www/people.apache.org/repository