Return-Path: 
 <scm-return-15283-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 48130 invoked from network); 7 Oct 2006 19:55:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Oct 2006 19:55:22 -0000
Received: (qmail 33440 invoked by uid 500); 7 Oct 2006 19:55:21 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 33303 invoked by uid 500); 7 Oct 2006 19:55:21 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 33292 invoked by uid 99); 7 Oct 2006 19:55:21 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org)
 (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Oct 2006 12:55:21 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME
Received: from [140.211.166.113] ([140.211.166.113:63297]
 helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP
	id 63/30-11753-72608254 for <scm@geronimo.apache.org>;
 Sat, 07 Oct 2006 12:55:19 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7EACD1A981D; Sat,  7 Oct 2006 12:55:17 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r454003 - in /geronimo/server/trunk:
 modules/geronimo-tomcat/pom.xml pom.xml
Date: Sat, 07 Oct 2006 19:55:17 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061007195517.7EACD1A981D@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Sat Oct  7 12:55:16 2006
New Revision: 454003

URL: http://svn.apache.org/viewvc?view=rev&rev=454003
Log:
Update commons-modeler to the latest 2.0 (which is in an m2 repo, so we can drop the legacy m1 repo hack)

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?view=diff&rev=454003&r1=454002&r2=454003
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Sat Oct  7 12:55:16 2006
@@ -290,26 +290,6 @@
             </plugin>
         </plugins>
     </build>
-    
-    <!--
-    HACK: Need to include the Apache m1 snapshot repo to pick up commons-modeler
-    -->
-    <repositories>
-        <repository>
-            <id>apache-snapshots-m1</id>
-            <name>Apache Maven 1 Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m1-snapshot-repository</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    
+
 </project>
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=454003&r1=454002&r2=454003
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Oct  7 12:55:16 2006
@@ -536,7 +536,7 @@
             <dependency>
                 <groupId>commons-modeler</groupId>
                 <artifactId>commons-modeler</artifactId>
-                <version>20060524</version>
+                <version>2.0</version>
             </dependency>
 
             <dependency>