geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1143633 - in /geronimo/server/trunk: plugins/uddi/uddi-db/pom.xml pom.xml
Date Thu, 07 Jul 2011 02:16:51 GMT
Author: rwonly
Date: Thu Jul  7 02:16:51 2011
New Revision: 1143633

URL: http://svn.apache.org/viewvc?rev=1143633&view=rev
Log:
remove the useless dependencies

Modified:
    geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=1143633&r1=1143632&r2=1143633&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Thu Jul  7 02:16:51 2011
@@ -94,9 +94,8 @@
 
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.derby</groupId>
-                        <artifactId>derby</artifactId>
-                        <!-- HACK: For some reason this is not picked up from dependencyManagement
-->
+                        <groupId>org.apache.geronimo.bundles</groupId>
+                        <artifactId>derby-all</artifactId>
                         <version>${derbyVersion}</version>
                     </dependency>
                 </dependencies>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1143633&r1=1143632&r2=1143633&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jul  7 02:16:51 2011
@@ -72,7 +72,7 @@
         <openejbVersion>4.0.0-SNAPSHOT</openejbVersion>
         <openjpaVersion>2.1.1-SNAPSHOT</openjpaVersion>
         <openwebbeansVersion>1.1.1-SNAPSHOT</openwebbeansVersion>
-        <derbyVersion>10.6.1.0</derbyVersion>
+        <derbyVersion>10.6.1.0_1</derbyVersion>
         <cxfVersion>2.1.10</cxfVersion>
         <axis2Version>1.7.0</axis2Version>
         <axiomVersion>1.2.12</axiomVersion>
@@ -680,33 +680,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>${derbyVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbynet</artifactId>
-                <version>${derbyVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbyclient</artifactId>
-                <version>${derbyVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbytools</artifactId>
-                <version>${derbyVersion}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>derby-all</artifactId>
-                <version>${derbyVersion}_1</version>
+                <version>${derbyVersion}</version>
             </dependency>
 
             <dependency>
@@ -807,12 +783,6 @@
             </dependency>
 
             <dependency>
-                <groupId>xml-resolver</groupId>
-                <artifactId>xml-resolver</artifactId>
-                <version>1.2</version>
-            </dependency>
-
-            <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
                 <version>1.3.1</version>



Mime
View raw message