Return-Path: 
 <scm-return-16889-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 51092 invoked from network); 4 Jan 2007 15:26:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Jan 2007 15:26:20 -0000
Received: (qmail 49766 invoked by uid 500); 4 Jan 2007 15:26:02 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 49584 invoked by uid 500); 4 Jan 2007 15:26:01 -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 49545 invoked by uid 99); 4 Jan 2007 15:26:01 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2007 07:26:01 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2007 07:25:04 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2EA831A981C; Thu,  4 Jan 2007 07:23:36 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r492601 - in /geronimo/devtools/eclipse-plugin/trunk: ./
 emf/geronimo-1.1/pom.xml maven-plugins/maven-emf-plugin/pom.xml
 maven-plugins/maven-geronimodevtools-plugin/pom.xml maven-plugins/pom.xml
 pom.xml
Date: Thu, 04 Jan 2007 15:23:35 -0000
To: scm@geronimo.apache.org
From: sppatel@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070104152336.2EA831A981C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sppatel
Date: Thu Jan  4 07:23:35 2007
New Revision: 492601

URL: http://svn.apache.org/viewvc?view=rev&rev=492601
Log:
 r4225@dyn9027152175 (orig r492360):  sppatel | 2007-01-03 19:10:11 -0500
 add exclusion for missing uncessary dependency
 r4226@dyn9027152175 (orig r492363):  sppatel | 2007-01-03 19:13:34 -0500
 add parent pom for m2 plugins
 r4227@dyn9027152175 (orig r492598):  sppatel | 2007-01-04 10:21:31 -0500
 remove unncessary plugin repo add codehaus repo for tranq snapshots

Added:
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Propchange: geronimo/devtools/eclipse-plugin/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan  4 07:23:35 2007
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:492348
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:492598
 47d51c14-9805-4038-8224-40f2b3020a56:/local/G1526-eclipse:3238

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?view=diff&rev=492601&r1=492600&r2=492601
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Thu Jan  4 07:23:35 2007
@@ -179,6 +179,12 @@
             <groupId>openejb</groupId>
             <artifactId>openejb-builder</artifactId>
             <version>${openejbVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>geronimo-spec</groupId>
+                    <artifactId>geronimo-spec-corba</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml?view=diff&rev=492601&r1=492600&r2=492601
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml Thu Jan  4 07:23:35 2007
@@ -24,6 +24,12 @@
     <packaging>maven-plugin</packaging>
     <version>1.0</version>
     <name>Maven EMF Plugin</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
     
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin</connection>
@@ -73,20 +79,4 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>snapshots</id>
-            <name>Maven Central Development Repository</name>
-            <url>http://snapshots.maven.codehaus.org/maven2</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>maven1-ibiblio</id>
-            <name>Maven1 Repository on iBiblio</name>
-            <url>http://www.ibiblio.org/maven/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/pom.xml?view=diff&rev=492601&r1=492600&r2=492601
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/pom.xml Thu Jan  4 07:23:35 2007
@@ -28,10 +28,10 @@
     <name>Geronimo Devtools Maven Plugin</name>
     
     <parent>
-    	<groupId>org.apache.geronimo.devtools</groupId>
-    	<artifactId>geronimo-eclipse-plugin</artifactId> 
-    	<version>1.1</version>
-        <relativePath>../../pom.xml</relativePath>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <scm>

Added: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml?view=auto&rev=492601
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml Thu Jan  4 07:23:35 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.devtools</groupId>
+    <artifactId>maven-plugins</artifactId>
+    <packaging>pom</packaging>
+    <name>${artifactId}</name>
+    <version>1.0</version>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>geronimo-eclipse-plugin</artifactId>
+        <version>1.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modules>
+        <module>maven-emf-plugin</module>
+        <module>maven-geronimodevtools-plugin</module>
+    </modules>
+</project>

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?view=diff&rev=492601&r1=492600&r2=492601
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu Jan  4 07:23:35 2007
@@ -166,7 +166,7 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </snapshots>
             <releases>
-                <enabled>false</enabled>
+                <enabled>true</enabled>
             </releases>
         </repository>
         <repository>
@@ -184,6 +184,20 @@
             </releases>
         </repository>
         <repository>
+            <id>codehaus-snapshots</id>
+            <name>Codehaus Snapshots Repository</name>
+            <url>http://snapshots.repository.codehaus.org</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
             <id>maven1-sppatel</id>
             <name>sppatel Repository on Apache</name>
             <url>http://people.apache.org/~sppatel/repository</url>
@@ -196,17 +210,9 @@
             </releases>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven2-ibiblio-rsync-apache</id>
-            <name>Maven 2 iBiblio rsync repository @ Apache</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-        </pluginRepository>
-    </pluginRepositories>
     <modules>
     <!--<module>modules/eclipse-support</module>-->
-        <module>maven-plugins/maven-emf-plugin</module>
-        <module>maven-plugins/maven-geronimodevtools-plugin</module>
+        <module>maven-plugins</module>
         <module>emf</module>
         <module>plugins</module>
         <module>features</module>