[java-centralized-discovery COMMIT] /branches/REL_1/pom.xml

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Mar 10 14:04:06 2012
New Revision: 2208

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2208&view=rev
Log:
Peg to parent POM v3
Update project version to 1.2
Update libs
Fix up a couple POM warnings

Modified:
    branches/REL_1/pom.xml

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/pom.xml?rev=2208&r1=2207&r2=2208&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Sat Mar 10 14:04:06 2012
@@ -7,12 +7,12 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>TRUNK-SNAPSHOT</version>
+        <version>3</version>
     </parent>
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-discovery-service</artifactId>
-    <version>1.1.4</version>
+    <version>1.2.0</version>
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
 
@@ -47,14 +47,18 @@
     <dependencies>
         <!-- Compile dependencies -->
         <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.opensaml</groupId>
             <artifactId>opensaml</artifactId>
-            <version>2.5.1</version>
+            <version>2.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-core</artifactId>
-            <version>1.3.9</version>
+            <version>1.3.10</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -65,11 +69,15 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-taglib</artifactId>
-            <version>1.3.9</version>
+            <version>1.3.10</version>
             <optional>false</optional>
         </dependency>
 
         <!-- Provided dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
 
         <!-- Runtime dependencies -->
         <dependency>
@@ -102,20 +110,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Managed Dependencies -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <dependency>
             <groupId>${xerces.groupId}</groupId>
             <artifactId>xml-apis</artifactId>
@@ -136,10 +130,15 @@
             <groupId>${xalan.groupId}</groupId>
             <artifactId>xalan</artifactId>
         </dependency>
+
+        <!-- Test dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
         </dependency>
+        
     </dependencies>
 
     <build>
@@ -147,7 +146,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
                 <configuration>
                     <archive>
                         <index>true</index>
@@ -178,7 +176,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2.1</version>
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/bin.xml</descriptor>