geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r794950 - in /geronimo/server/branches/2.1: ./ plugins/clustering/wadi-clustering/ plugins/console/console-core/ plugins/jasper/geronimo-jasper/ plugins/jasper/jasper/ plugins/tomcat/geronimo-tomcat6-builder/ plugins/tomcat/geronimo-tomcat6...
Date Fri, 17 Jul 2009 03:21:41 GMT
Author: kevan
Date: Fri Jul 17 03:21:31 2009
New Revision: 794950

URL: http://svn.apache.org/viewvc?rev=794950&view=rev
Log:
GERONIMO-4751 Move Tomcat version to 6.0.20. Use the new generated org.apache.geronimo.ext.tomcat
version. So delete old versions from repository

Removed:
    geronimo/server/branches/2.1/repository/org/apache/tomcat/
Modified:
    geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml
    geronimo/server/branches/2.1/plugins/console/console-core/pom.xml
    geronimo/server/branches/2.1/plugins/jasper/geronimo-jasper/pom.xml
    geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/pom.xml

Modified: geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml Fri Jul 17 03:21:31
2009
@@ -57,12 +57,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>tribes</artifactId>
         </dependency>
         

Modified: geronimo/server/branches/2.1/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/pom.xml Fri Jul 17 03:21:31
2009
@@ -78,9 +78,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>6.0.18</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/branches/2.1/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jasper/geronimo-jasper/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jasper/geronimo-jasper/pom.xml Fri Jul 17 03:21:31
2009
@@ -34,17 +34,44 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
+          <groupId>org.apache.geronimo.ext.tomcat</groupId>
+          <artifactId>shared</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>core</artifactId>
+            <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>
+
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper-el</artifactId>
         </dependency>
 
@@ -59,32 +86,6 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- these are normally transitive dependencies of the tomcat-jasper jar -->
-        <!-- if our hacked jasper copy gets a pom we won't need these -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>juli</artifactId>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>catalina</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jasper/jasper/pom.xml Fri Jul 17 03:21:31 2009
@@ -64,17 +64,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>shared</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper-el</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Fri Jul 17
03:21:31 2009
@@ -66,30 +66,24 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>jasper-el</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>shared</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <!-- TODO remove this WTF??? why isn't this picked up from geronimo-web-2.5-builder?
-->
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/pom.xml Fri Jul 17 03:21:31
2009
@@ -60,12 +60,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>catalina</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>catalina-ha</artifactId>
         </dependency>
 
@@ -77,17 +77,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.tomcat.extras</groupId>
             <artifactId>juli</artifactId>
         </dependency>

Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/pom.xml Fri Jul 17 03:21:31 2009
@@ -79,23 +79,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>catalina</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>catalina-ha</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tribes</artifactId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>util</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>coyote</artifactId>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>tribes</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Fri Jul 17 03:21:31 2009
@@ -72,7 +72,9 @@
         -->
         <openejbVersion>3.0.1</openejbVersion>
         <derbyVersion>10.4.2.0</derbyVersion>
-        <tomcatVersion>6.0.18</tomcatVersion>
+        <externalTomcatVersion>6.0.20-SNAPSHOT</externalTomcatVersion>
+        <tomcatVersion>6.0.20</tomcatVersion>
+        <eclipseVersion>3.3.0-v_771</eclipseVersion>
         <tranqlVendorsVersion>1.4</tranqlVendorsVersion>
         <dojoVersion>1.0.2</dojoVersion>
         <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
@@ -1188,21 +1190,21 @@
 
             <!-- Tomcat web container -->
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>jasper</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>jasper-el</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>jasper-jdt</artifactId>
-                <version>${tomcatVersion}</version>
+                <groupId>org.eclipse.jdt</groupId>
+                <artifactId>core</artifactId>
+                <version>${eclipseVersion}</version>
             </dependency>
 
             <dependency>
@@ -1218,33 +1220,39 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>catalina</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>catalina-ha</artifactId>
-                <version>${tomcatVersion}</version>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <artifactId>util</artifactId>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tribes</artifactId>
-                <version>${tomcatVersion}</version>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <artifactId>shared</artifactId>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>coyote</artifactId>
-                <version>${tomcatVersion}</version>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <artifactId>catalina-ha</artifactId>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <artifactId>tribes</artifactId>
+                <version>${externalTomcatVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>juli</artifactId>
-                <version>${tomcatVersion}</version>
+                <version>${externalTomcatVersion}</version>
             </dependency>
 
             <!-- WADI support -->
@@ -2187,9 +2195,9 @@
                         </dependency>
 
                         <dependency>
-                            <groupId>org.apache.tomcat</groupId>
+                            <groupId>org.apache.geronimo.ext.tomcat</groupId>
                             <artifactId>jasper</artifactId>
-                            <version>6.0.18-G678601</version>
+                            <version>${externalTomcatVersion}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -2532,11 +2540,12 @@
     <repositories>
         <!--
         NOTE: The default repositories are picked up by Genesis.
-              We only need to include apache-snapshots for Genesis SNAPSHOTs.
+              We need the apache-snapshot repo, since it isn't defined by Genesis 1.3.1.

+        -->
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <url>http://repository.apache.org/snapshots/</url>
             <layout>default</layout>
             <snapshots>
                 <enabled>true</enabled>
@@ -2547,7 +2556,6 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-        -->
     </repositories>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>

Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=794950&r1=794949&r2=794950&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Fri Jul 17 03:21:31 2009
@@ -63,23 +63,6 @@
             <type>tgz</type>
         </dependency>
 
-        <!-- See GERONIMO-3010  These artifacts are here temporarily while we discuss
the proposed change in
-        managed object lifecycle handling with the tomcat team.  One way or another it should
be gone in a couple
-        of weeks -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper</artifactId>
-        </dependency>
-        <!-- This is an additional patch until 6.0.19 is released -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-el</artifactId>
-        </dependency>
-
         <!-- add the following for wsgen -->
         <dependency>
             <groupId>com.sun.xml.ws</groupId>



Mime
View raw message