geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r373797 - in /geronimo/trunk: assemblies/j2ee-installer/project.xml configs/console-tomcat/project.xml
Date Tue, 31 Jan 2006 11:45:39 GMT
Author: jsisson
Date: Tue Jan 31 03:45:18 2006
New Revision: 373797

URL: http://svn.apache.org/viewcvs?rev=373797&view=rev
Log:
GERONIMO-1441 - comment out, consolidate or remove duplicate dependencies that cause "Build
path contains duplicate entry" errors in eclipse 3.1.1 projects (merged from 1.0 branch).

Modified:
    geronimo/trunk/assemblies/j2ee-installer/project.xml
    geronimo/trunk/configs/console-tomcat/project.xml

Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=373797&r1=373796&r2=373797&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Tue Jan 31 03:45:18 2006
@@ -507,15 +507,16 @@
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <geronimo.assemble>library</geronimo.assemble>
-            </properties>
-        </dependency>
+        <!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>geronimo</groupId>
+        #    <artifactId>geronimo-deploy-tool</artifactId>
+        #    <version>${pom.currentVersion}</version>
+        #    <properties>
+        #        <geronimo.assemble>library</geronimo.assemble>
+        #    </properties>
+        #</dependency>
+        -->
 
         <dependency>
             <groupId>geronimo</groupId>
@@ -550,6 +551,7 @@
             <version>${geronimo_spec_qname_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
+                <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
 
@@ -616,14 +618,16 @@
         </dependency>
 
         <!--dependencies for online-deployer -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-            <version>${geronimo_spec_j2ee_deployment_version}</version>
-            <properties>
-                <geronimo.assemble>library</geronimo.assemble>
-            </properties>
-        </dependency>
+        <!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        #    <version>${geronimo_spec_j2ee_deployment_version}</version>
+        #    <properties>
+        #        <geronimo.assemble>library</geronimo.assemble>
+        #    </properties>
+        #</dependency>
+        -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
@@ -787,6 +791,7 @@
             <version>${geronimo_spec_j2ee_deployment_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
+                <geronimo.assemble>library</geronimo.assemble>
             </properties>
         </dependency>
         <dependency>
@@ -853,14 +858,16 @@
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
-            <version>${geronimo_spec_qname_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
+        <!-- 
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-qname_1.1_spec</artifactId>
+        #    <version>${geronimo_spec_qname_version}</version>
+        #    <properties>
+        #        <geronimo.assemble>repository</geronimo.assemble>
+        #    </properties>
+        #</dependency>
+        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.1_spec</artifactId>
@@ -1151,12 +1158,6 @@
         </dependency>
         <dependency>
             <groupId>tomcat</groupId>
-            <artifactId>catalina</artifactId>
-            <version>${tomcat_version}</version>
-            <url>http://jakarta.apache.org/tomcat/</url>
-        </dependency>
-        <dependency>
-            <groupId>tomcat</groupId>
             <artifactId>catalina-optional</artifactId>
             <version>${tomcat_version}</version>
             <url>http://jakarta.apache.org/tomcat/</url>
@@ -1306,29 +1307,37 @@
         </dependency>
 
         <!-- Specification dependencies to preload into the repository -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-            <version>${geronimo_spec_j2ee_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-            <version>${geronimo_spec_activation_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <version>${geronimo_spec_javamail_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-corba_2.3_spec</artifactId>
-            <version>${geronimo_spec_corba_version}</version>
-        </dependency>
+        <!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+        #    <version>${geronimo_spec_j2ee_version}</version>
+        #</dependency>
+        -->
+
+		<!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        #    <version>${geronimo_spec_activation_version}</version>
+        #</dependency>
+		-->
+
+        <!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+        #    <version>${geronimo_spec_javamail_version}</version>
+        #</dependency>
+        -->
+
+		<!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>org.apache.geronimo.specs</groupId>
+        #    <artifactId>geronimo-corba_2.3_spec</artifactId>
+        #    <version>${geronimo_spec_corba_version}</version>
+        #</dependency>
+        -->
 
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
@@ -1461,11 +1470,13 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-util</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
+        <!-- duplicate dependency - commented out to avoid eclipse project errors
+        #<dependency>
+        #    <groupId>geronimo</groupId>
+        #    <artifactId>geronimo-util</artifactId>
+        #    <version>${pom.currentVersion}</version>
+        #</dependency>
+        -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-web-builder</artifactId>

Modified: geronimo/trunk/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.xml?rev=373797&r1=373796&r2=373797&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.xml (original)
+++ geronimo/trunk/configs/console-tomcat/project.xml Tue Jan 31 03:45:18 2006
@@ -254,11 +254,6 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${geronimo_version}</version>
         </dependency>



Mime
View raw message