Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 67765 invoked from network); 10 Jul 2006 02:09:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Jul 2006 02:09:17 -0000 Received: (qmail 53441 invoked by uid 500); 10 Jul 2006 02:09:17 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 53295 invoked by uid 500); 10 Jul 2006 02:09:16 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 53284 invoked by uid 99); 10 Jul 2006 02:09:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jul 2006 19:09:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jul 2006 19:09:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CB99D1A981A; Sun, 9 Jul 2006 19:08:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420402 - in /geronimo/sandbox/svkmerge/m2migration: ./ etc/explicit_versions.properties etc/project.properties modules/project.properties plugins/geronimo-packaging-plugin/project.properties plugins/project.properties project.properties Date: Mon, 10 Jul 2006 02:08:54 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060710020855.CB99D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Sun Jul 9 19:08:53 2006 New Revision: 420402 URL: http://svn.apache.org/viewvc?rev=420402&view=rev Log: Sync svkmerge/m2migration to latest changes from svkmerge/trunk Modified: geronimo/sandbox/svkmerge/m2migration/ (props changed) geronimo/sandbox/svkmerge/m2migration/etc/explicit_versions.properties geronimo/sandbox/svkmerge/m2migration/etc/project.properties geronimo/sandbox/svkmerge/m2migration/modules/project.properties geronimo/sandbox/svkmerge/m2migration/plugins/geronimo-packaging-plugin/project.properties geronimo/sandbox/svkmerge/m2migration/plugins/project.properties geronimo/sandbox/svkmerge/m2migration/project.properties Propchange: geronimo/sandbox/svkmerge/m2migration/ ------------------------------------------------------------------------------ --- svk:merge (original) +++ svk:merge Sun Jul 9 19:08:53 2006 @@ -1,2 +1,2 @@ -13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395 -13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:419396 +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:420380 +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:420202 Modified: geronimo/sandbox/svkmerge/m2migration/etc/explicit_versions.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/etc/explicit_versions.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/etc/explicit_versions.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/etc/explicit_versions.properties Sun Jul 9 19:08:53 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/m2migration/etc/project.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/etc/project.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/etc/project.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/etc/project.properties Sun Jul 9 19:08:53 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/m2migration/modules/project.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/project.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/modules/project.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/modules/project.properties Sun Jul 9 19:08:53 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/m2migration/plugins/geronimo-packaging-plugin/project.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/plugins/geronimo-packaging-plugin/project.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/plugins/geronimo-packaging-plugin/project.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/plugins/geronimo-packaging-plugin/project.properties Sun Jul 9 19:08:53 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/m2migration/plugins/project.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/plugins/project.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/plugins/project.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/plugins/project.properties Sun Jul 9 19:08:53 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/m2migration/project.properties URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/project.properties?rev=420402&r1=420401&r2=420402&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/project.properties (original) +++ geronimo/sandbox/svkmerge/m2migration/project.properties Sun Jul 9 19:08:53 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