From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 22 May 2013 22:35:44 +0000 (-0700)
Subject: CSPACE-6007: Update project parent POM versions to 3.2.3. Minor cleanup of POM files... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=47e70bfa8f22952be478e9c4ddfe443bc255d9ee;p=tmp%2Fjakarta-migration.git

CSPACE-6007: Update project parent POM versions to 3.2.3. Minor cleanup of POM files, removal of versions managed in upstream POMs, reformatting, etc.
---

diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml
index 76e08c3ff..316686efe 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation-smk/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation.3rdparty</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
index 8768fce21..a522ce605 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/pom.xml
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation.3rdparty</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -17,12 +17,12 @@
     </description>
     
     <build>
-		<resources>
+        <resources>
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
-		</resources>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/services/citation/3rdparty/pom.xml b/services/citation/3rdparty/pom.xml
index 8210f5e70..294b2376e 100644
--- a/services/citation/3rdparty/pom.xml
+++ b/services/citation/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml
index aa731d5e8..96a0c4e2d 100644
--- a/services/citation/client/pom.xml
+++ b/services/citation/client/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,6 @@
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
         </dependency>
     </dependencies>
     
diff --git a/services/citation/jaxb/pom.xml b/services/citation/jaxb/pom.xml
index 02b67aa1b..69fb1ad3b 100644
--- a/services/citation/jaxb/pom.xml
+++ b/services/citation/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/citation/pom.xml b/services/citation/pom.xml
index 0cbb03e8d..ec5a249ca 100644
--- a/services/citation/pom.xml
+++ b/services/citation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/services/citation/service/pom.xml b/services/citation/service/pom.xml
index 44f134558..54abb80f8 100644
--- a/services/citation/service/pom.xml
+++ b/services/citation/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.citation</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.2.3-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+        <!-- CollectionSpace dependencies -->        
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
@@ -71,7 +71,7 @@
             <artifactId>commons-logging</artifactId>
             <version>1.1</version>
         </dependency>
-      <!-- javax -->
+        <!-- javax -->
 
 
         <dependency>