[openejb-scm] [2556] trunk/openejb3: Cleaned up dependencies across all modules

[dblevins]

Title: [2556] trunk/openejb3: Cleaned up dependencies across all modules

Revision

2556

Author

dblevins

Date

2006-03-14 16:16:30 -0500 (Tue, 14 Mar 2006)

Log Message

Cleaned up dependencies across all modules

Modified Paths

• trunk/openejb3/container/openejb-core/pom.xml
• trunk/openejb3/container/openejb-loader/pom.xml
• trunk/openejb3/openejb-itests/pom.xml
• trunk/openejb3/pom.xml
• trunk/openejb3/server/openejb-client/pom.xml
• trunk/openejb3/server/openejb-ejbd/pom.xml
• trunk/openejb3/server/openejb-http/pom.xml

Diff

Modified: trunk/openejb3/container/openejb-core/pom.xml (2555 => 2556)

--- trunk/openejb3/container/openejb-core/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/container/openejb-core/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -70,9 +70,24 @@
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>castor</groupId>
+      <artifactId>castor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-reflect</artifactId>
-      <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -81,6 +96,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>idb</groupId>
+      <artifactId>idb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.openejb</groupId>
       <artifactId>openejb-itests</artifactId>
       <version>3.0-SNAPSHOT</version>

Modified: trunk/openejb3/container/openejb-loader/pom.xml (2555 => 2556)

--- trunk/openejb3/container/openejb-loader/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/container/openejb-loader/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -12,6 +12,10 @@
   <name>OpenEJB :: Container :: Loader</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>

Modified: trunk/openejb3/openejb-itests/pom.xml (2555 => 2556)

--- trunk/openejb3/openejb-itests/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/openejb-itests/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -12,14 +12,14 @@
   <name>OpenEJB :: iTests</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
+      <scope>compile</scope>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.openejb</groupId>-->
-      <!--<artifactId>openejb-core</artifactId>-->
-      <!--<version>3.0-SNAPSHOT</version>-->
-    <!--</dependency>-->
   </dependencies>
 </project>

Modified: trunk/openejb3/pom.xml (2555 => 2556)

--- trunk/openejb3/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -71,42 +71,49 @@
       <url>http://snapshots.maven.codehaus.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_3.0_spec</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-      <version>1.0</version>
-    </dependency>                        
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.4_spec</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>castor</groupId>
-      <artifactId>castor</artifactId>
-      <version>1.0M1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-    </dependency>
-    <dependency>
-      <groupId>idb</groupId>
-      <artifactId>idb</artifactId>
-      <version>3.26</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <version>2.2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>castor</groupId>
+        <artifactId>castor</artifactId>
+        <version>1.0M3</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.12</version>
+      </dependency>
+      <dependency>
+        <groupId>idb</groupId>
+        <artifactId>idb</artifactId>
+        <version>3.26</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

Modified: trunk/openejb3/server/openejb-client/pom.xml (2555 => 2556)

--- trunk/openejb3/server/openejb-client/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/server/openejb-client/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -12,6 +12,10 @@
   <name>OpenEJB :: Server :: Client</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>

Modified: trunk/openejb3/server/openejb-ejbd/pom.xml (2555 => 2556)

--- trunk/openejb3/server/openejb-ejbd/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/server/openejb-ejbd/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -28,6 +28,15 @@
   </build>
   <dependencies>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>idb</groupId>
+      <artifactId>idb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.openejb</groupId>
       <artifactId>openejb-core</artifactId>
       <version>3.0-SNAPSHOT</version>

Modified: trunk/openejb3/server/openejb-http/pom.xml (2555 => 2556)

--- trunk/openejb3/server/openejb-http/pom.xml	2006-03-14 21:00:57 UTC (rev 2555)
+++ trunk/openejb3/server/openejb-http/pom.xml	2006-03-14 21:16:30 UTC (rev 2556)
@@ -33,6 +33,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>idb</groupId>
+      <artifactId>idb</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>