[java-metadata-aggregator COMMIT] in /trunk: aggregator-cli/pom.xml aggregator-parent/pom.xml aggregator-pipeline/pom...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Apr  4 17:27:46 2012
New Revision: 221

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=221&view=rev
Log:
Add java-support as a managed dep in the parent POM
Move to use the X.X-SNAPSHOT version name for our in-development projects to prevent patch releases from causing a problem
Re-org OpenSAML and IdP module lists just to make it easier to comment out impl modules

Modified:
    trunk/aggregator-cli/pom.xml
    trunk/aggregator-parent/pom.xml
    trunk/aggregator-pipeline/pom.xml

Modified: trunk/aggregator-cli/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-cli/pom.xml?rev=221&r1=220&r2=221&view=diff
==============================================================================
--- trunk/aggregator-cli/pom.xml (original)
+++ trunk/aggregator-cli/pom.xml Wed Apr  4 17:27:46 2012
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth.metadata</groupId>
         <artifactId>aggregator-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>TRUNK-SNAPSHOT</version>
         <relativePath>../aggregator-parent</relativePath>
     </parent>
 
@@ -25,11 +25,6 @@
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>jargs</groupId>

Modified: trunk/aggregator-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-parent/pom.xml?rev=221&r1=220&r2=221&view=diff
==============================================================================
--- trunk/aggregator-parent/pom.xml (original)
+++ trunk/aggregator-parent/pom.xml Wed Apr  4 17:27:46 2012
@@ -20,7 +20,7 @@
     
     <groupId>net.shibboleth.metadata</groupId>
     <artifactId>aggregator-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>TRUNK-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -105,9 +104,7 @@
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
-            <version>1.0.0</version>
             <type>test-jar</type>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>
@@ -118,6 +115,11 @@
     <dependencyManagement>
         <dependencies>
             <!-- Compile Dependencies -->
+            <dependency>
+                <groupId>net.shibboleth.ext</groupId>
+                <artifactId>spring-extensions</artifactId>
+                <version>1.0.0</version>
+            </dependency>
 
             <!-- Provided Dependencies -->
 

Modified: trunk/aggregator-pipeline/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/pom.xml?rev=221&r1=220&r2=221&view=diff
==============================================================================
--- trunk/aggregator-pipeline/pom.xml (original)
+++ trunk/aggregator-pipeline/pom.xml Wed Apr  4 17:27:46 2012
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth.metadata</groupId>
         <artifactId>aggregator-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>TRUNK-SNAPSHOT</version>
         <relativePath>../aggregator-parent</relativePath>
     </parent>
 
@@ -20,10 +20,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>            
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
         </dependency>
 
         <!-- Provided Dependencies -->