geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r513538 - in /geronimo/server/trunk: configs/jasper/pom.xml configs/jee-specs/pom.xml pom.xml
Date Thu, 01 Mar 2007 22:30:03 GMT
Author: djencks
Date: Thu Mar  1 14:30:01 2007
New Revision: 513538

URL: http://svn.apache.org/viewvc?view=rev&rev=513538
Log:
GERONIMO-2917 move more specs into jee-specs

Modified:
    geronimo/server/trunk/configs/jasper/pom.xml
    geronimo/server/trunk/configs/jee-specs/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/pom.xml?view=diff&rev=513538&r1=513537&r2=513538
==============================================================================
--- geronimo/server/trunk/configs/jasper/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper/pom.xml Thu Mar  1 14:30:01 2007
@@ -88,16 +88,10 @@
         </dependency>
 
         <!-- start myfaces dependencies -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=513538&r1=513537&r2=513538
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Thu Mar  1 14:30:01 2007
@@ -35,6 +35,8 @@
     <packaging>car</packaging>
 
     <dependencies>
+        <!-- geronimo-javaee-deployment_1.1MR3_spec is intentionally missing, it must
be available earlier in the classpath
+        Hopefully we can eliminate this restriction in the future. -->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -58,19 +60,31 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jacc_1.1_spec</artifactId>
         </dependency>
         
+        <!-- should this be here?? -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
         </dependency>
-        
+
+        <!-- almost certainly either the spec or mail jar should leave -->
         <dependency>
             <groupId>org.apache.geronimo.javamail</groupId>
             <artifactId>geronimo-javamail_1.4_mail</artifactId>
@@ -93,6 +107,11 @@
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
         </dependency>
         
@@ -100,12 +119,18 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
         </dependency>
-        
+
+        <!-- TODO GERONIMO-2919 figure out which saaj 1.3 spec jar to use -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.1_spec</artifactId>
         </dependency>
         
+        <!--<dependency>-->
+            <!--<groupId>org.apache.axis2</groupId>-->
+            <!--<artifactId>axis2-saaj-api</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -135,6 +160,11 @@
             <artifactId>jaxws-api</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>
+
         <!-- build order hint -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=513538&r1=513537&r2=513538
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Mar  1 14:30:01 2007
@@ -183,12 +183,19 @@
                 <version>1.1</version>
             </dependency>
 
+            <!-- TODO GERONIMO-2919 figure out which saaj 1.3 spec jar to use -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-saaj_1.1_spec</artifactId>
                 <version>1.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-saaj-api</artifactId>
+                <version>SNAPSHOT</version>
+            </dependency>
+            
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>



Mime
View raw message