geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r404911 - in /geronimo/branches/1.1: configs/j2ee-deployer/project.xml configs/javamail/project.xml configs/rmi-naming/project.xml modules/mail/maven.xml modules/mail/project.xml
Date Mon, 08 May 2006 03:51:12 GMT
Author: djencks
Date: Sun May  7 20:51:10 2006
New Revision: 404911

URL: http://svn.apache.org/viewcvs?rev=404911&view=rev
Log:
GERONIMO-1977 remove some extraneous dependencies on corba spec and mail

Added:
    geronimo/branches/1.1/modules/mail/maven.xml
Modified:
    geronimo/branches/1.1/configs/j2ee-deployer/project.xml
    geronimo/branches/1.1/configs/javamail/project.xml
    geronimo/branches/1.1/configs/rmi-naming/project.xml
    geronimo/branches/1.1/modules/mail/project.xml

Modified: geronimo/branches/1.1/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-deployer/project.xml?rev=404911&r1=404910&r2=404911&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-deployer/project.xml Sun May  7 20:51:10 2006
@@ -108,14 +108,6 @@
 
         <!-- common libraries used by all builders -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>

Modified: geronimo/branches/1.1/configs/javamail/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/javamail/project.xml?rev=404911&r1=404910&r2=404911&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/javamail/project.xml (original)
+++ geronimo/branches/1.1/configs/javamail/project.xml Sun May  7 20:51:10 2006
@@ -68,17 +68,14 @@
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
 
-        </dependency>
     </dependencies>
 </project>
 

Modified: geronimo/branches/1.1/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/project.xml?rev=404911&r1=404910&r2=404911&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/project.xml Sun May  7 20:51:10 2006
@@ -61,14 +61,6 @@
 
 <!--  Individual Spec references  -->
         <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-corba</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-            <properties>
-                <geronimo.dependency>true</geronimo.dependency>
-            </properties>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
             <version>${geronimo_spec_activation_version}</version>
@@ -112,14 +104,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
             <version>${geronimo_spec_j2ee_management_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
             <properties>
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>

Added: geronimo/branches/1.1/modules/mail/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/mail/maven.xml?rev=404911&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/mail/maven.xml (added)
+++ geronimo/branches/1.1/modules/mail/maven.xml Sun May  7 20:51:10 2006
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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: 355877 $ $Date: 2005-12-10 18:48:27 -0800 (Sat, 10 Dec 2005) $ -->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven">
+    
+    <!-- Construct dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
+
+</project>

Modified: geronimo/branches/1.1/modules/mail/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/mail/project.xml?rev=404911&r1=404910&r2=404911&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/mail/project.xml (original)
+++ geronimo/branches/1.1/modules/mail/project.xml Sun May  7 20:51:10 2006
@@ -45,6 +45,13 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-dependency-plugin</artifactId>
+            <version>${geronimo_dependency_plugin_version}</version>
+            <type>plugin</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
@@ -65,6 +72,9 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
             <version>${geronimo_spec_javamail_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>
 
         <dependency>



Mime
View raw message