geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r784659 - in /geronimo/external/trunk: tomcat-archetype/pom.xml tomcat-parent-6.0.18/pom.xml
Date Mon, 15 Jun 2009 05:59:18 GMT
Author: djencks
Date: Mon Jun 15 05:59:17 2009
New Revision: 784659

URL: http://svn.apache.org/viewvc?rev=784659&view=rev
Log:
GERONIMO-4685 fix (I hope) some dependencies issues Ivan found

Modified:
    geronimo/external/trunk/tomcat-archetype/pom.xml
    geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml

Modified: geronimo/external/trunk/tomcat-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/pom.xml?rev=784659&r1=784658&r2=784659&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/pom.xml Mon Jun 15 05:59:17 2009
@@ -90,6 +90,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_1.0_spec</artifactId>
                 <version>1.1.2-SNAPSHOT</version>
             </dependency>
@@ -112,7 +117,7 @@
             <dependency>
                 <groupId>org.eclipse.jdt</groupId>
                 <artifactId>core</artifactId>
-                <version>3.2.3.v_686_R32x</version>
+                <version>3.3.0-v_771</version>
             </dependency>
             
 
@@ -130,11 +135,6 @@
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>coyote</artifactId>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${groupId}</groupId>
                 <artifactId>jasper</artifactId>
                 <version>${version}</version>
             </dependency>
@@ -145,11 +145,6 @@
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>jasper-jdt</artifactId>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${groupId}</groupId>
                 <artifactId>juli</artifactId>
                 <version>${version}</version>
             </dependency>

Modified: geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml?rev=784659&r1=784658&r2=784659&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml Mon Jun 15 05:59:17 2009
@@ -16,7 +16,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -71,6 +72,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_1.0_spec</artifactId>
                 <version>1.1.2-SNAPSHOT</version>
             </dependency>
@@ -93,9 +99,31 @@
             <dependency>
                 <groupId>org.eclipse.jdt</groupId>
                 <artifactId>core</artifactId>
-                <version>3.2.3.v_686_R32x</version>
+                <version>3.3.0-v_771</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.eclipse.core</groupId>
+                        <artifactId>resources</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.core</groupId>
+                        <artifactId>runtime</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.core</groupId>
+                        <artifactId>filesystem</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse</groupId>
+                        <artifactId>text</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.team</groupId>
+                        <artifactId>core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
-            
+
 
             <!-- internal -->
 
@@ -111,11 +139,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.ext.tomcat</groupId>
-                <artifactId>coyote</artifactId>
-                <version>6.0.18-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>jasper</artifactId>
                 <version>6.0.18-SNAPSHOT</version>
             </dependency>
@@ -126,11 +149,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.ext.tomcat</groupId>
-                <artifactId>jasper-jdt</artifactId>
-                <version>6.0.18-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>juli</artifactId>
                 <version>6.0.18-SNAPSHOT</version>
             </dependency>
@@ -162,14 +180,14 @@
 
         </dependencies>
     </dependencyManagement>
-  <modules>
-    <module>shared</module>
-    <module>juli</module>
-    <module>catalina</module>
-    <module>tribes</module>
-    <module>util</module>
-    <module>catalina-ha</module>
-    <module>jasper</module>
-    <module>jasper-el</module>
-  </modules>
+    <modules>
+        <module>shared</module>
+        <module>juli</module>
+        <module>catalina</module>
+        <module>tribes</module>
+        <module>util</module>
+        <module>catalina-ha</module>
+        <module>jasper</module>
+        <module>jasper-el</module>
+    </modules>
 </project>
\ No newline at end of file



Mime
View raw message