[picocontainer-scm] [picocontainer] [3150] java/nanocontainer/trunk: Organised dependencies.

Revision

3150

Author

mauro

Date

2006-12-26 15:41:02 -0600 (Tue, 26 Dec 2006)

Log Message

Organised dependencies.

Modified Paths

• java/nanocontainer/trunk/container/pom.xml
• java/nanocontainer/trunk/container-aop/pom.xml
• java/nanocontainer/trunk/pom.xml

Diff

Modified: java/nanocontainer/trunk/container/pom.xml (3149 => 3150)

--- java/nanocontainer/trunk/container/pom.xml	2006-12-26 21:26:09 UTC (rev 3149)
+++ java/nanocontainer/trunk/container/pom.xml	2006-12-26 21:41:02 UTC (rev 3150)
@@ -32,14 +32,6 @@
       <groupId>xpp3</groupId>
       <artifactId>xpp3_min</artifactId>
     </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-asm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
     <!-- Test scoped dependencies -->
     <dependency>
       <groupId>org.picocontainer</groupId>

Modified: java/nanocontainer/trunk/container-aop/pom.xml (3149 => 3150)

--- java/nanocontainer/trunk/container-aop/pom.xml	2006-12-26 21:26:09 UTC (rev 3149)
+++ java/nanocontainer/trunk/container-aop/pom.xml	2006-12-26 21:41:02 UTC (rev 3150)
@@ -17,10 +17,6 @@
             <artifactId>nanocontainer</artifactId>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>nanocontainer-testmodel</artifactId>
-        </dependency>
-        <dependency>
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
             <version>1.0</version>
@@ -30,5 +26,29 @@
             <artifactId>dynaop</artifactId>
             <version>1.0-beta</version>
         </dependency>
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+            <optional>true</optional>
+        </dependency>
+        <!--  test scoped dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>nanocontainer-testmodel</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-asm</artifactId>
+            <version>1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Modified: java/nanocontainer/trunk/pom.xml (3149 => 3150)

--- java/nanocontainer/trunk/pom.xml	2006-12-26 21:26:09 UTC (rev 3149)
+++ java/nanocontainer/trunk/pom.xml	2006-12-26 21:41:02 UTC (rev 3150)
@@ -123,6 +123,11 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.picocontainer</groupId>
+                <artifactId>picocontainer</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
                 <groupId>${pom.groupId}</groupId>
                 <artifactId>nanocontainer</artifactId>
                 <version>${pom.version}</version>
@@ -152,23 +157,8 @@
                 <artifactId>nanocontainer-booter</artifactId>
                 <version>${pom.version}</version>
             </dependency>
+            <!-- optional dependencies -->
             <dependency>
-                <groupId>org.picocontainer</groupId>
-                <artifactId>picocontainer</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.picocontainer</groupId>
-                <artifactId>picocontainer-gems</artifactId>
-                <version>1.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.picocontainer</groupId>
-                <artifactId>picocontainer-tck</artifactId>
-                <version>1.2</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
@@ -198,26 +188,20 @@
                 <version>1.1.3.4.O</version>
                 <optional>true</optional>
             </dependency>
-              <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib-asm</artifactId>
-                <version>1.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>cglib</groupId>
-                        <artifactId>cglib</artifactId>
-                    </exclusion>
-                </exclusions>
-                <optional>true</optional>
-            </dependency>
+            <!-- Test scoped dependencies -->
             <dependency>
-                <groupId>oro</groupId>
-                <artifactId>oro</artifactId>
-                <version>2.0.8</version>
-                <optional>true</optional>
+                <groupId>org.picocontainer</groupId>
+                <artifactId>picocontainer-gems</artifactId>
+                <version>1.2</version>
+                <scope>test</scope>
             </dependency>
-            <!-- Test scoped dependencies -->
             <dependency>
+                <groupId>org.picocontainer</groupId>
+                <artifactId>picocontainer-tck</artifactId>
+                <version>1.2</version>
+                <scope>test</scope>
+            </dependency>            
+            <dependency>
                 <groupId>${pom.groupId}</groupId>
                 <artifactId>nanocontainer-testmodel</artifactId>
                 <version>${pom.version}</version>
@@ -244,7 +228,7 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- test time only -->
+        <!-- test scoped only -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email