geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r722795 - in /geronimo/server/trunk: plugins/jasper/jasper/src/main/history/dependencies.xml plugins/tomcat/tomcat6/src/main/history/dependencies.xml pom.xml
Date Wed, 03 Dec 2008 07:02:08 GMT
Author: djencks
Date: Tue Dec  2 23:02:08 2008
New Revision: 722795

URL: http://svn.apache.org/viewvc?rev=722795&view=rev
Log:
further fix dependencies from tomcat poms.  Also put the ee6 experiments into a profile named
ee6

Modified:
    geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=722795&r1=722794&r2=722795&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml Tue Dec
 2 23:02:08 2008
@@ -12,11 +12,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=722795&r1=722794&r2=722795&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Tue Dec
 2 23:02:08 2008
@@ -12,6 +12,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>catalina</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=722795&r1=722794&r2=722795&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec  2 23:02:08 2008
@@ -74,6 +74,7 @@
         <openejbVersion>3.1.1-SNAPSHOT</openejbVersion>
         <derbyVersion>10.4.2.0</derbyVersion>
         <tomcatVersion>6.0.18</tomcatVersion>
+        <tomcatPatchedVersion>6.0.18-G678601</tomcatPatchedVersion>
         <tranqlVendorsVersion>1.4</tranqlVendorsVersion>
         <cxfVersion>2.1.3</cxfVersion>
         <axis2Version>SNAPSHOT</axis2Version>
@@ -83,6 +84,7 @@
         <openjpaVersion>1.2.0</openjpaVersion>
         <xbeanVersion>3.5-SNAPSHOT</xbeanVersion>
         <wadiVersion>2.1</wadiVersion>
+        <!-- switch using  -Pee6 -->
         <jetty>jetty6</jetty>
         <!--<jetty>jetty7</jetty>-->
 
@@ -450,7 +452,7 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
-                </exclusions>    
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -1401,7 +1403,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${tomcatPatchedVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.tomcat</groupId>
@@ -1419,13 +1421,21 @@
                         <groupId>org.apache.tomcat</groupId>
                         <artifactId>el-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>catalina</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>annotations-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper-el</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${tomcatPatchedVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.tomcat</groupId>
@@ -1467,7 +1477,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>catalina</artifactId>
-                <version>6.0.18-G678601</version>
+                <version>${tomcatPatchedVersion}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.tomcat</groupId>
@@ -2730,7 +2740,7 @@
                     <exclusion>
                         <groupId>javax.xml.ws</groupId>
                         <artifactId>jaxws-api</artifactId>
-                       </exclusion>
+                    </exclusion>
                     <exclusion>
                         <groupId>javax.xml.soap</groupId>
                         <artifactId>saaj-api</artifactId>
@@ -2758,7 +2768,7 @@
                     <exclusion>
                         <groupId>javax.xml.ws</groupId>
                         <artifactId>jaxws-api</artifactId>
-                       </exclusion>
+                    </exclusion>
                     <exclusion>
                         <groupId>javax.xml.soap</groupId>
                         <artifactId>saaj-api</artifactId>
@@ -2847,7 +2857,7 @@
                     <exclusion>
                         <groupId>javax.xml.soap</groupId>
                         <artifactId>saaj-api</artifactId>
-                     </exclusion>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -2964,7 +2974,7 @@
                         <dependency>
                             <groupId>org.apache.tomcat</groupId>
                             <artifactId>jasper</artifactId>
-                            <version>6.0.18-G678601</version>
+                            <version>${tomcatPatchedVersion}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -3380,19 +3390,6 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-<!--
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
--->
     </repositories>
 
     <distributionManagement>
@@ -3604,6 +3601,21 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>ee6</id>
+            <properties>
+                <!--<jetty>jetty6</jetty>-->
+                <jetty>jetty7</jetty>
+
+                <!--<connectorSuffix></connectorSuffix>-->
+                <connectorSuffix>-1_6</connectorSuffix>
+                <!--<connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>-->
+                <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
+                <!--<txmanagerVersion>2.1.1</txmanagerVersion>-->
+                <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
+            </properties>
+        </profile>
     </profiles>
 
 </project>



Mime
View raw message