geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r495394 - /geronimo/server/trunk/pom.xml
Date Thu, 11 Jan 2007 21:59:48 GMT
Author: jdillon
Date: Thu Jan 11 13:59:47 2007
New Revision: 495394

URL: http://svn.apache.org/viewvc?view=rev&rev=495394
Log:
Cleaned up dependencyManagement, removed duplicate definitions, removed stax:stax-api 1.0
(leaving 1.0.1)
Removed incubator repo, picked up from genesis 1.1

Modified:
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=495394&r1=495393&r2=495394
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jan 11 13:59:47 2007
@@ -100,15 +100,17 @@
                   a geronimo-dependency.xml, and until that is changed we need
                   to keep using this old m1-based artifact
             -->
+            <!--
             <dependency>
-                <!--
+                <!- -
                 <groupId>org.apache.geronimo.specs</groupId>
-                -->
+                - ->
                 <groupId>geronimo-spec</groupId>
                 <artifactId>geronimo-spec-corba</artifactId>
                 <version>1.0</version>
             </dependency>
-
+            -->
+            
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ejb_2.1_spec</artifactId>
@@ -190,12 +192,6 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-                <version>1.0.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-saaj_1.1_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
@@ -213,7 +209,6 @@
                 <version>1.1-SNAPSHOT</version>
             </dependency>
 
-            <!-- jee5 specs -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
@@ -226,6 +221,30 @@
                 <version>1.0-SNAPSHOT</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
+            
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the
repository:
@@ -233,13 +252,13 @@
                   http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema
 
                   The full source is here with restricted access:
-
-                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-j2ee_1.4/trunk
+                  
+                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-jee_5/trunk
             -->
             <dependency>
                 <groupId>org.apache.geronimo.schema</groupId>
-                <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                <version>1.1-SNAPSHOT</version>
+                <artifactId>geronimo-schema-jee_5</artifactId>
+                <version>1.0-SNAPSHOT</version>
             </dependency>
             
             <!--
@@ -249,15 +268,15 @@
                   http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema
 
                   The full source is here with restricted access:
-                  
-                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-jee_5/trunk
+
+                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-j2ee_1.4/trunk
             -->
             <dependency>
                 <groupId>org.apache.geronimo.schema</groupId>
-                <artifactId>geronimo-schema-jee_5</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+                <version>1.1-SNAPSHOT</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-all</artifactId>
@@ -419,31 +438,17 @@
                 <artifactId>regexp</artifactId>
                 <version>1.3</version>
             </dependency>
-
+            
+            <!--
+            FIXME: Upgrade to a newer version of scout
+            -->
+            
             <dependency>
                 <groupId>scout</groupId>
                 <artifactId>scout</artifactId>
                 <version>0.5</version>
             </dependency>
-
-            <dependency>
-                <groupId>stax</groupId>
-                <artifactId>stax-api</artifactId>
-                <version>1.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xmlbeans</groupId>
-                        <artifactId>xmlbeans-jsr173-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.tranql</groupId>
-                <artifactId>tranql</artifactId>
-                <version>1.4.1</version>
-            </dependency>
-
+            
             <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
@@ -742,7 +747,13 @@
                 <artifactId>openejb-yoko</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
-
+            
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql</artifactId>
+                <version>1.4.1</version>
+            </dependency>
+            
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-ra</artifactId>
@@ -926,55 +937,6 @@
                 <version>0.9.5.2</version>
             </dependency>
 
-
-            <!--jee5 stuff -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <!--  <version>1.0.1</version>   -->
-                <version>1.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                <!--  <version>1.0</version>   -->
-                <version>1.1-SNAPSHOT</version>
-            </dependency>
-
-            <!-- javamail 1.4 config -->
-            <!--<dependency>-->
-            <!--<groupId>javax.mail</groupId>-->
-            <!--<artifactId>mail</artifactId>-->
-            <!--<version>1.4</version>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-            <!--<groupId>javax.activation</groupId>-->
-            <!--<artifactId>activation</artifactId>-->
-            <!--<version>1.1</version>-->
-            <!--</dependency>-->
-            <dependency>
-                <groupId>org.apache.geronimo.schema</groupId>
-                <artifactId>geronimo-schema-jee_5</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty</artifactId>
@@ -1002,6 +964,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-metacode</artifactId>
@@ -1017,6 +980,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-common-utilities</artifactId>
@@ -1032,6 +996,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-core</artifactId>
@@ -1047,6 +1012,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-bindings-xml</artifactId>
@@ -1062,6 +1028,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-bindings-soap</artifactId>
@@ -1077,6 +1044,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-databinding-jaxb</artifactId>
@@ -1092,6 +1060,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -1107,6 +1076,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-frontend-simple</artifactId>
@@ -1122,6 +1092,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-transports-http</artifactId>
@@ -1137,6 +1108,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-tools-common</artifactId>
@@ -1158,16 +1130,19 @@
                 <artifactId>stax-api</artifactId>
                 <version>1.0.1</version>
             </dependency>
+            
             <dependency>
                 <groupId>woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
                 <version>3.0.2</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.ws.commons</groupId>
                 <artifactId>XmlSchema</artifactId>
                 <version>1.1</version>
             </dependency>
+            
             <dependency>
                 <groupId>javax.xml.soap</groupId>
                 <artifactId>saaj-api</artifactId>
@@ -1179,6 +1154,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
@@ -1190,6 +1166,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>com.sun.xml.messaging.saaj</groupId>
                 <artifactId>saaj-impl</artifactId>
@@ -1217,21 +1194,25 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
                 <version>2.0-rc2</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
                 <version>2.0-rc2</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
                 <version>2.0-rc2</version>
             </dependency>
+            
             <dependency>
                 <groupId>javax.xml.ws</groupId>
                 <artifactId>jaxws-api</artifactId>
@@ -1250,6 +1231,7 @@
                 <artifactId>myfaces-api</artifactId>
                 <version>1.2.0-SNAPSHOT</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.apache.myfaces.core</groupId>
                 <artifactId>myfaces-impl</artifactId>
@@ -1314,6 +1296,8 @@
                 <!--
                 FIXME: Should not configure war to assume jsp by default
                 -->
+                
+                <!-- FIXME: Use 2.0.2 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -1328,7 +1312,8 @@
                         </archive>
                     </configuration>
                 </plugin>
-
+                
+                <!-- FIXME: Use 2.3 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
@@ -1488,6 +1473,7 @@
         NOTE: The default repositories are picked up by Genesis, but need to
               specify where Genesis lives to pick it up + any additional repositories.
         -->
+        
         <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
@@ -1500,21 +1486,6 @@
             </snapshots>
             <releases>
                 <enabled>false</enabled>
-            </releases>
-        </repository>
-
-        <repository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
             </releases>
         </repository>
     </repositories>



Mime
View raw message