CSPACE-1159: Our Maven artifacts now implicitly inherit their <version> value from...

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index 9ef05f661e73b12bc650eded025253c6df97b6b9..1fd6cf2816c94750df68fe3c7b39a05d3f428314 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -5,10 +5,11 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
-    <version>1.0</version>\r
+    <version>0.6-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.collectionspace.services</groupId>\r
   <artifactId>nuxeo-platform-collectionspace</artifactId>\r
   <packaging>pom</packaging>\r
   <name>Nuxeo CS extensions</name>\r

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 825d536f6c80ff900454e7b7d495be99a27630d5..49da988d6715e02f76370612dc3c577edec1badc 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -4,13 +4,12 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
-    <version>1.0</version>\r
     <packaging>pom</packaging>\r
     <name>services.3rdparty.nuxeo</name>\r
 \r
@@ -19,68 +18,56 @@
     </modules>\r
 \r
     <dependencies>       \r
+        <dependency>\r
+            <groupId>org.osgi</groupId>\r
+            <artifactId>org.osgi.core</artifactId>\r
+            <version>4.1.0</version>\r
+        </dependency>        \r
         <!-- jboss -->\r
         <dependency>\r
             <groupId>jboss</groupId>\r
             <artifactId>jboss-remoting</artifactId>\r
             <version>2.2.2.SP8</version>\r
             <scope>provided</scope>\r
-        </dependency>\r
-        <!-- nuxeo -->\r
-\r
+        </dependency>        \r
+        <!-- Nuxeo -->\r
         <dependency>\r
             <groupId>org.nuxeo.common</groupId>\r
-            <artifactId>nuxeo-common</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-common</artifactId>            \r
             <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-runtime</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-api</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-client</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-query</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-query</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-schema</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-schema</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-io</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-io</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-facade</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-core-facade</artifactId>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime-osgi</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <artifactId>nuxeo-runtime-osgi</artifactId>            \r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.osgi</groupId>\r
-            <artifactId>org.osgi.core</artifactId>\r
-            <version>4.1.0</version>\r
-        </dependency>\r
-\r
     </dependencies>\r
-    \r
 \r
 </project>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index afc215ba6697ec085a4d19a9bb02ae8b71837ce9..50daba51866622a34335aea5c498f419e126d3cf 100644 (file)
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>org.collectionspace.services</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.3rdparty</artifactId>
-    <packaging>pom</packaging>
     <name>services.3rdparty</name>
+    <packaging>pom</packaging>
 
     <modules>
         <module>nuxeo</module>
@@ -18,6 +18,52 @@
     
     <dependencyManagement>
         <dependencies>
+            <!--
+            <dependency>
+                <groupId>org.nuxeo.common</groupId>
+                <artifactId>nuxeo-common</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.runtime</groupId>
+                <artifactId>nuxeo-runtime</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.runtime</groupId>
+                <artifactId>nuxeo-runtime-osgi</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-api</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-client</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-query</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-schema</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-io</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.nuxeo.ecm.core</groupId>
+                <artifactId>nuxeo-core-facade</artifactId>
+                <version>1.5.1-SNAPSHOT</version>
+            </dependency> -->
          </dependencies>
     </dependencyManagement>
 

diff --git a/build.properties b/build.properties
index d8f869199de5d0e20309f827752393a25e32472c..02aa390a17821b371dc146f63644ce04d0252a0e 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 host=127.0.0.1\r
 #cspace\r
-cspace.release=0.4\r
+cspace.release=0.6-SNAPSHOT\r
 cspace.services.release=cspace-services-${cspace.release}\r
 cspace.services.war=cspace-services.war\r
 domain.cspace=cspace\r

diff --git a/pom.xml b/pom.xml
index 0acd7e37a9f4d17dbbd65cf20c4b5a72d13af85e..63a6bc586d6f3c52976312ec096dc6b1f6c9676a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,18 +5,19 @@
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services</artifactId>\r
+    <version>0.6-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
     <name>services</name>\r
 \r
     <properties>\r
-        <cspace.services.client.version>0.5-SNAPSHOT</cspace.services.client.version>\r
         <jboss.version>4.2.3.GA</jboss.version>\r
         <jboss.ejb.version>3.0</jboss.ejb.version>\r
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
         <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>\r
         <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>\r
+        <cspace.services.version>0.6-SNAPSHOT</cspace.services.version>\r
+        <cspace.services.client.version>0.6.1-SNAPSHOT</cspace.services.client.version>\r
     </properties>\r
 \r
     <distributionManagement>\r
@@ -123,7 +124,7 @@
                 <updatePolicy>never</updatePolicy>\r
             </snapshots>\r
         </repository>\r
-        \r
+\r
         <repository>\r
             <id>public</id>\r
             <url>http://maven.nuxeo.org/public</url>\r
@@ -135,7 +136,7 @@
                 <enabled>false</enabled>\r
             </snapshots>\r
         </repository>\r
-        \r
+\r
         <repository>\r
             <id>nuxeo-public</id>\r
             <name>nuxeo-public</name>\r
@@ -160,7 +161,7 @@
             </snapshots>\r
         </repository>\r
 \r
-<!--\r
+        <!--\r
  -->\r
 \r
 \r
@@ -213,7 +214,6 @@
                         <show>public</show>\r
                     </configuration>\r
                 </plugin>\r
-\r
                 <plugin>\r
                     <groupId>org.apache.maven.plugins</groupId>\r
                     <artifactId>maven-compiler-plugin</artifactId>\r
@@ -240,7 +240,6 @@
                     <artifactId>maven-war-plugin</artifactId>\r
                     <version>2.0.1</version>\r
                     <configuration>\r
-\r
                         <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
                         <archive>\r
                             <manifest>\r
@@ -249,12 +248,22 @@
                         </archive>\r
                     </configuration>\r
                 </plugin>\r
-\r
             </plugins>\r
         </pluginManagement>\r
+\r
     </build>\r
     <dependencyManagement>\r
         <dependencies>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-api</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-log4j12</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
             <dependency>\r
                 <groupId>net.java.dev.jaxb2-commons</groupId>\r
                 <artifactId>jaxb-fluent-api</artifactId>\r
@@ -267,22 +276,58 @@
                 <scope>test</scope>\r
                 <classifier>jdk15</classifier>\r
             </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-api</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-log4j12</artifactId>\r
-                <version>1.5.2</version>\r
-            </dependency>\r
             <dependency>\r
                 <groupId>mysql</groupId>\r
                 <artifactId>mysql-connector-java</artifactId>\r
                 <version>5.1.5</version>\r
                 <scope>test</scope>\r
             </dependency>\r
+            <!-- Nuxeo Dependencies with versions -->\r
+            <dependency>\r
+                <groupId>org.nuxeo.common</groupId>\r
+                <artifactId>nuxeo-common</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.runtime</groupId>\r
+                <artifactId>nuxeo-runtime</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.runtime</groupId>\r
+                <artifactId>nuxeo-runtime-osgi</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-api</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-client</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-query</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-schema</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-io</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.nuxeo.ecm.core</groupId>\r
+                <artifactId>nuxeo-core-facade</artifactId>\r
+                <version>1.5.1-SNAPSHOT</version>\r
+            </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r
 \r
@@ -291,15 +336,14 @@
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-project-info-reports-plugin</artifactId>\r
-                <configuration>\r
-                </configuration>\r
-               <reportSets>\r
-                       <reportSet>\r
-                  <reports>\r
-                     <report>dependencies</report>\r
-                  </reports>\r
-               </reportSet>\r
-               </reportSets>\r
+                <configuration> </configuration>\r
+                <reportSets>\r
+                    <reportSet>\r
+                        <reports>\r
+                            <report>dependencies</report>\r
+                        </reports>\r
+                    </reportSet>\r
+                </reportSets>\r
             </plugin>\r
             <!--            <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 4b9bc103ab0f8b8984110919b90ce517d849c776..13ef943a1d10621c39dc11fd0cddce2c011b80ef 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.IntegrationTests</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.IntegrationTests</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
         <dependency>\r
@@ -23,11 +23,43 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionObject dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.client</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.relation.client</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
+<!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -60,36 +92,6 @@
             <artifactId>commons-httpclient</artifactId>\r
             <version>3.1</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>        \r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.intake.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.relation.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
     </dependencies>\r
     \r
     <build>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 879c13d487f8aed484c5b2bc8b59730099b3f9fc..1a8e115ca549d77241e9d32c9babb962b997c354 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -4,23 +4,22 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
-\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.jaxrs.provider</artifactId>\r
-    <packaging>war</packaging>\r
-    <version>1.0</version>\r
     <name>services.jaxrs.provider</name>\r
+    <packaging>war</packaging>\r
+    \r
     <properties>\r
         <cs.release>0.5</cs.release>\r
         <spring.version>3.0.0.RELEASE</spring.version>\r
         <spring.security.version>3.0.1.RELEASE</spring.security.version>\r
     </properties>\r
+    \r
     <dependencies>\r
-\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
@@ -29,73 +28,72 @@
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>log4j</groupId>\r
             <artifactId>log4j</artifactId>\r
             <version>1.2.14</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-\r
+<!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.id.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.dimension.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.contact.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.acquisition.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.relation.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <!--dependency>\r
             <groupId>org.collectionspace.services</groupId>\r

diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index f09e3e1fca25220c2e59023d035e8bc6c0f8cbb5..575fb539a0d6d390c08b64bc018dd188f797079d 100644 (file)
--- a/services/PerformanceTests/pom.xml
+++ b/services/PerformanceTests/pom.xml
@@ -3,13 +3,13 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.PerformanceTests</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.PerformanceTests</name>\r
 \r
     <dependencies>\r
@@ -23,11 +23,43 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.client</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.relation.client</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+    <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -60,36 +92,6 @@
             <artifactId>commons-httpclient</artifactId>\r
             <version>3.1</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>        \r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.intake.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.relation.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
     </dependencies>\r
     \r
     <build>\r

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index 52c5a3f965a3bdcee09320f010e0c228f0865727..11e75fc37dbc4c59f3c9676988e49fccd631f81b 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -2,18 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.account</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.account.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.account.client</name>\r
+    \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
@@ -29,33 +28,38 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        <!-- Needed if/when client test framework files are moved into\r
-/services/client/src/test from /services/client/src/main -->     \r
-<!--    <dependency>\r
+\r
+        <!-- Needed if/when client test framework files are moved into -->\r
+        <!-- /services/client/src/test from /services/client/src/main -->\r
+\r
+        <dependency>\r
+            <groupId>mysql</groupId>\r
+            <artifactId>mysql-connector-java</artifactId>\r
+            <scope>test</scope>\r
+        </dependency>        \r
+        <!-- <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
             <scope>test</scope>\r
             <type>test-jar</type>\r
-        </dependency>-->\r
-\r
+        </dependency> -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
-        </dependency>\r
+        </dependency>       \r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
             <version>1.1.GA</version>\r
-            <!-- filter out unwanted jars -->\r
             <exclusions>\r
                 <exclusion>\r
                     <groupId>tjws</groupId>\r
@@ -78,12 +82,6 @@
             <artifactId>commons-httpclient</artifactId>\r
             <version>3.1</version>\r
         </dependency>\r
-\r
-\r
-        <dependency>\r
-            <groupId>mysql</groupId>\r
-            <artifactId>mysql-connector-java</artifactId>\r
-        </dependency>\r
     </dependencies>\r
 \r
     <build>\r

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index eab43b6b05e13553ae89c5daad0bd41a904fc351..f2c68c394ba2fb1abf6179d62e0ee99b585e1c5c 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -2,18 +2,17 @@
 <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">
-
     <parent>
-        <artifactId>org.collectionspace.services.account</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.account</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.account.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.account.jaxb</name>
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -26,6 +25,13 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--
+            <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.client</artifactId>
+            <version>${project.version}</version>
+            </dependency>
+        -->        
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -60,13 +66,6 @@
             <artifactId>testng</artifactId>
             <version>5.6</version>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.client</artifactId>
-            <version>${cspace.services.client.version}</version>
-        </dependency>
--->        
     </dependencies>
 
     <build>

diff --git a/services/account/pom.xml b/services/account/pom.xml
index dfff467a85a31b5fe577667046859ed5064d1ee5..7d82f8c45906c9c94011463b6d91495a82e0802e 100644 (file)
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.account</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.account</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index bf8f35f7f9bb077e1187eabf9126eeed11d154f2..105e2459dff856a14815fde1cf11f24309f34769 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -2,22 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.account.pstore</artifactId>\r
-    <version>1.0</version>\r
     <name>services.account.pstore</name>\r
+\r
     <properties>\r
         <sql.file>account.sql</sql.file>\r
         <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>\r
     </properties>\r
+\r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
@@ -30,11 +30,13 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+    <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+    <!-- External dependencies -->        \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml
index 327d1bd1ac6dc438e17e244d177d8e0ffe7beec4..7fb025b62175dd0c1d9b3dea9a307577bcdd05d7 100644 (file)
--- a/services/account/service/pom.xml
+++ b/services/account/service/pom.xml
@@ -1,44 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.account.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.account.service</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+        </dependency>\r
+        <!-- CollectionSpace Dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-        </dependency>\r
-\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index c97ec1a61393b085a78b5cb76cba3ac1751b09bc..98a5f77a3c618809ae2619c0ec1098943d60d98a 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.acquisition.jar" value="org.collectionspace.services.acquisition.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.acquisition.jar" value="org.collectionspace.services.acquisition.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 260d49250b93f9588da2dbe530997e2f7d65ae20..031a6c72da0892ff592aac34fb7c002b0f796c5a 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
@@ -1,19 +1,34 @@
 <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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.acquisition.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.acquisition.3rdparty.nuxeo</name>
-    <description>
-        Acquisition Nuxeo Document Type
-    </description>
+    <packaging>jar</packaging>
+    <description> Acquisition Nuxeo Document Type </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml
index 77e456623dedb38d667e3b182809b7fca97aa618..09478e0fc68befebc68723873b38f7e9f4da2994 100644 (file)
--- a/services/acquisition/3rdparty/pom.xml
+++ b/services/acquisition/3rdparty/pom.xml
@@ -3,13 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.acquisition</artifactId>\r
+        <version>0.6-SNAPSHOT</version> \r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>\r
     <packaging>pom</packaging>\r
     <name>services.acquisition.3rdparty</name>\r

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index 7cfe4b51faba38c5d0b8399d16ab04440f455964..ab957e1d155c5470667bd879ba108eba184f8255 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -2,19 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.acquisition</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.acquisition.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
-    <packaging>jar</packaging>\r
     <name>services.acquisition.client</name>\r
+    <packaging>jar</packaging>\r
     \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
@@ -28,22 +26,23 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace Dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.acquisition.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -63,7 +62,6 @@
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
             <version>1.0.2.GA</version>\r
-            <!-- filter out unwanted jars -->\r
             <exclusions>\r
                 <exclusion>\r
                     <groupId>tjws</groupId>\r

diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index a89dcfdce8a3eba9cfe0c6bff9aad178a1ede595..ffe4c80390a5a100c38506fdedc500b3500eea9a 100644 (file)
--- a/services/acquisition/jaxb/pom.xml
+++ b/services/acquisition/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.acquisition.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.acquisition.jaxb</name>
     
     <dependencies>
@@ -32,6 +30,7 @@
             <version>0.4.1.4</version>
         </dependency>
     </dependencies>
+    
     <build>
         <finalName>collectionspace-services-acquisition-jaxb</finalName>
         <defaultGoal>install</defaultGoal>

diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml
index 2d431e5c4f288fd9f770a2788ab458707bd759d8..038f17a8c65561bbc13c8168c288d4d05e900962 100644 (file)
--- a/services/acquisition/pom.xml
+++ b/services/acquisition/pom.xml
@@ -2,17 +2,16 @@
 <!-- A comment. -->\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.acquisition</name>\r
-\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index e3a9d80aa732f0b0eca395aa473b764cf19dec07..da429159b568426ed8a563d03f9cd42917110133 100644 (file)
--- a/services/acquisition/service/pom.xml
+++ b/services/acquisition/service/pom.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.acquisition.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.acquisition.service</name>\r
+    <packaging>jar</packaging>    \r
 \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.acquisition.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        \r
-        <dependency>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
+<!--       <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
             <version>4.1</version>\r
@@ -36,11 +33,7 @@
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
             <version>5.6</version>\r
-        </dependency>\r
-        \r
-\r
-      <!-- javax -->\r
-\r
+        </dependency>        \r
 \r
         <dependency>\r
             <groupId>javax.security</groupId>\r
@@ -48,16 +41,13 @@
             <version>1.0.01</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>dom4j</groupId>\r
             <artifactId>dom4j</artifactId>\r
             <version>1.6.1</version>\r
             <scope>provided</scope>\r
-        </dependency>\r
+        </dependency>        \r
         \r
-        <!-- jboss -->\r
-\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
@@ -78,10 +68,8 @@
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-multipart-provider</artifactId>\r
             <version>1.0.2.GA</version>\r
-        </dependency>\r
+        </dependency>        \r
         \r
-        <!-- nuxeo -->\r
-\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
@@ -93,7 +81,6 @@
                 </exclusion>\r
             </exclusions>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>org.restlet</groupId>\r
             <artifactId>org.restlet</artifactId>\r
@@ -108,8 +95,7 @@
             <groupId>com.noelios.restlet</groupId>\r
             <artifactId>com.noelios.restlet</artifactId>\r
             <version>1.0.7</version>\r
-        </dependency>\r
-\r
+        </dependency> -->\r
     </dependencies>\r
     \r
     <build>\r

diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index 0e195083bf39c29b4abcd5b0b02c617d7bd44fd1..691247356838854bb0d665d41acc843f91c64c83 100644 (file)
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -4,16 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.authentication</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.authentication</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.authentication.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.authentication.client</name>\r
+    \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
@@ -26,16 +26,18 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!--\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -45,7 +47,6 @@
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
             <version>1.0.2.GA</version>\r
-            <!-- filter out unwanted jars -->\r
             <exclusions>\r
                 <exclusion>\r
                     <groupId>tjws</groupId>\r
@@ -71,7 +72,7 @@
         <dependency>\r
             <groupId>mysql</groupId>\r
             <artifactId>mysql-connector-java</artifactId>\r
-        </dependency>\r
+        </dependency> -->\r
     </dependencies>\r
 \r
     <build>\r

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 2aa9d5597b09ac6fc7686cca50229c5fa695a1d5..3f91d0bf4153963bd1bdb6b9514a78b6da6bef77 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -4,20 +4,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <artifactId>org.collectionspace.services.authentication</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.authentication</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.authentication.jaxb</name>
+    
     <properties>
         <sql.file>authentication.sql</sql.file>
         <sql.dir>src/main/resources/db/mysql</sql.dir>
     </properties>
+    
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -30,6 +31,7 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+<!--        
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -46,7 +48,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -60,11 +62,12 @@
             <groupId>org.jvnet.hyperjaxb3</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
+<!--        
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>5.6</version>
-        </dependency>
+        </dependency> -->
     </dependencies>
 
     <build>

diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index da983b4434900c66ca522b90f29a3ac46acb06da..8a68881dcd009ad4af020d066bb428883620e2e4 100644 (file)
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.authentication</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.authentication</name>\r
+    <packaging>pom</packaging>\r
 \r
     <properties>\r
     </properties>\r

diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index 1233816f6211e3f3d8adef0318050cb57339c09e..5a3d258f2c1311cb0c1141cd69e71337f56adf4f 100644 (file)
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/pom.xml
@@ -4,20 +4,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.authentication</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.authentication</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.authentication.pstore</artifactId>\r
-    <version>1.0</version>\r
     <name>services.authentication.pstore</name>\r
+    \r
     <properties>\r
         <sql.file>authentication.sql</sql.file>\r
         <sql.dir>${basedir}/src/main/resources/db/mysql</sql.dir>\r
     </properties>\r
+    \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
@@ -30,11 +31,13 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+<!--        \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -43,7 +46,7 @@
         <dependency>\r
             <groupId>mysql</groupId>\r
             <artifactId>mysql-connector-java</artifactId>\r
-        </dependency>\r
+        </dependency> -->\r
     </dependencies>\r
 \r
     <build>\r

diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index 846eb22a7884f4037015d40fc21ba54804d31d09..3b376aeb6cbed4ab1954e5f7165725a192aa2ac7 100644 (file)
--- a/services/authentication/service/pom.xml
+++ b/services/authentication/service/pom.xml
@@ -1,40 +1,47 @@
 <?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">
     <parent>
-        <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.authentication</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authentication.service</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0</version>
     <name>services.authentication.service</name>
+    <packaging>jar</packaging>
 
     <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
+<!--        <jboss.version>4.2.3.GA</jboss.version>
         <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -->
         <spring.security.version>3.0.1.RELEASE</spring.security.version>
     </properties>
 
     <dependencies>
-        <!-- slf4j not available due to classloading issues perhaps -->
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>        
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1.1</version>
         </dependency>
-
-        <!-- utilities -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.1</version>
             <scope>test</scope>
         </dependency>
-
         <!-- javax -->
         <dependency>
             <groupId>javax.security</groupId>
@@ -42,8 +49,6 @@
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- jboss -->
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-log4j</artifactId>
@@ -54,14 +59,12 @@
             <artifactId>jbosssx</artifactId>
             <version>4.2.3.GA</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
             <version>${spring.security.version}</version>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
     <build>

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 47433f6743067daf529ca7c6f965a03eb3d273bc..6c924319ab53da7a2d7e6c0574bfcaaa5c7625a9 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.client</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.client</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
@@ -26,6 +21,13 @@
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
+<!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+<!-- External dependencies -->        \r
         <dependency>\r
             <groupId>org.apache.maven.plugins</groupId>\r
             <artifactId>maven-surefire-plugin</artifactId>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index 98b76c9f210a025f88e8fce1e85659b637a78663..a8d21320d2b69d1c6dc60704249e147e9e7b8618 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -12,7 +12,7 @@
     <property name="src" location="src"/>\r
     <property name="build" location="build"/>\r
     <property name="dist"  location="dist"/>\r
-    <property name="nuxeo.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-1.0.jar"/>\r
+    <property name="nuxeo.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-${cspace.release}.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index bd8d6b3b16e4053221dfa402ccb2e620921e8846..41682aef303bf28b1467fd6baa730d13db55a386 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -3,17 +3,35 @@
     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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.collectionobject.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.collectionobject.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
         CollectionObject Nuxeo document type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index 1dcd0d1c9676d7716e623a5b3cd5663b01f4b2ff..1e63800ce04f1da84888c570987b60c89370c11e 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -2,21 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.collectionobject.3rdparty</name>\r
+    <packaging>pom</packaging>\r
     <description>\r
-    3rd party build for collectionobject service\r
+        3rd party build for collectionobject service\r
     </description>\r
 \r
     <modules>\r

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index c71cab02838d2328946fbe445df915d177d26e7e..412c071ee4bd430415f75c0ad147f96fb009867a 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -2,17 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.collectionobject.client</name>\r
     \r
     <dependencies>\r
@@ -27,22 +25,23 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <artifactId>org.collectionspace.services.client</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -102,5 +101,4 @@
             </plugin>\r
         </plugins>\r
     </build>\r
-</project>\r
-\r
+</project>
\ No newline at end of file

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 6dd085c3f3f143b8504817955753c8840cde873b..017da7bc7f148bca7fc2d7c47c72eaede195ea96 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
-        <artifactId>org.collectionspace.services.collectionobject</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.collectionobject.jaxb</name>
     
     <dependencies>

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 5ed43d0020ebc69b55c70dce7c687b5fe6b14542..e263cefc8d14768b77c63bcb0f26636aee5bdf0c 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>        \r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.collectionobject</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index d581a8df3ce0db8adf73544b14e7dc35e6a57c97..ce28d5478ebae20671f83cf3a797f06f2b195968 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -4,24 +4,24 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
     <packaging>jar</packaging>
-    <version>1.0</version>
     <name>collectionobject.client.sample</name>
+    <version>0.6-SNAPSHOT</version>
     
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
-            <version>1.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     

diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index e0975c72b8d0fa2f3cc2cf5e6c2bb252d07cad2a..9e615e7e5ab8a7a70d7382923d95a878d2866cb5 100644 (file)
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -1,55 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.collectionobject.service</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+        </dependency>\r
+<!-- CollectionSpace dependencies -->        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.relation.service</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-        </dependency>\r
-        \r
+<!-- External dependencies -->        \r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
@@ -76,7 +74,6 @@
         </dependency>\r
       <!-- javax -->\r
 \r
-\r
         <dependency>\r
             <groupId>javax.security</groupId>\r
             <artifactId>jaas</artifactId>\r
@@ -144,7 +141,6 @@
             <artifactId>com.noelios.restlet</artifactId>\r
             <version>1.0.7</version>\r
         </dependency> -->\r
-\r
     </dependencies>\r
     \r
     <build>\r

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 44214b6eeba5ac5f47dbb3d83540f2a813bcd712..b5a3f6ee400c6f6bfbbb414af9f559e6d802f378 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -1,20 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.common</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.common</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
-\r
-        <!-- utilities -->\r
+        <!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.authentication.service</artifactId>\r
+            <version>${project.version}</version>\r
+            <scope>provided</scope>\r
+        </dependency>        \r
+        <!-- Utilities -->\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
@@ -30,7 +42,6 @@
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
         <!-- javax -->\r
-\r
         <dependency>\r
             <groupId>javax.servlet</groupId>\r
             <artifactId>servlet-api</artifactId>\r
@@ -120,7 +131,6 @@
             <scope>provided</scope>\r
         </dependency>\r
         <!-- nuxeo -->\r
-\r
         <dependency>\r
             <groupId>org.nuxeo.common</groupId>\r
             <artifactId>nuxeo-common</artifactId>\r
@@ -196,19 +206,6 @@
             <artifactId>jaxen</artifactId>\r
             <version>1.1.1</version>\r
         </dependency>\r
-\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
-            <version>1.0</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.authentication.service</artifactId>\r
-            <version>1.0</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
     </dependencies>\r
 \r
     <build>\r

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
index d40865744d03e50b1b5ad7b894225dfafb221807..28d9f083ac038025a053503038995de8addfe72a 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
@@ -12,7 +12,7 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.contact.jar" value="org.collectionspace.services.contact.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.contact.jar" value="org.collectionspace.services.contact.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index 1f1d2ddf67f3686cd2a138d01007e396b83219cc..350e1b4298f6e2a01bb6721d940ef96860b07959 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
@@ -3,17 +3,35 @@
   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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.contact.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.contact.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Contact Nuxeo Document Type
+        Contact Nuxeo Document Type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml
index 22963b2fe5d08247a06815021211bed51e658381..272058fc717005a8397b27569ff93cb748ca8809 100644 (file)
--- a/services/contact/3rdparty/pom.xml
+++ b/services/contact/3rdparty/pom.xml
@@ -3,18 +3,18 @@
   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>
-        <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.contact</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
-    <packaging>pom</packaging>
     <name>services.contact.3rdparty</name>
+    <packaging>pom</packaging>
     <description>
-    3rd party build for contact service
+        3rd party build for contact service
     </description>
 
     <modules>

diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index 78d93048c72b3fb777a1f22d26df8786608d599b..239eec16f1a8270e134ab86ca5d6771d5c7f7532 100644 (file)
--- a/services/contact/client/pom.xml
+++ b/services/contact/client/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.contact.client</artifactId>
-    <version>${cspace.services.client.version}</version>
     <name>services.contact.client</name>
     
     <dependencies>
@@ -27,17 +25,18 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.contact.jaxb</artifactId>
-            <version>1.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>${cspace.services.client.version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+        <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index 8c51c0ded51f222cadb188bef58b9e74310bd9ab..a93fc9d7bd55263c2e769ef8ae4fab19e8f1390b 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
-        <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.contact</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.contact.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.contact.jaxb</name>
     
     <dependencies>
@@ -32,6 +30,7 @@
             <version>0.4.1.4</version>
         </dependency>
     </dependencies>
+    
     <build>
         <finalName>collectionspace-services-contact-jaxb</finalName>
         <defaultGoal>install</defaultGoal>

diff --git a/services/contact/pom.xml b/services/contact/pom.xml
index d4de6595c707cda69883879ebcc5a74b6032b245..d108c0ef19a2b293369692af18e9ab741cce2dc4 100644 (file)
--- a/services/contact/pom.xml
+++ b/services/contact/pom.xml
@@ -4,15 +4,14 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.contact</artifactId>
-    <packaging>pom</packaging>
     <name>services.contact</name>
-
+    <packaging>pom</packaging>
 
     <modules>
         <module>jaxb</module>

diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml
index f2222de2ebaea4cb5048a85d7e345152c705893e..34096754d49921cbe9a156099fe5daa4e91ab087 100644 (file)
--- a/services/contact/service/pom.xml
+++ b/services/contact/service/pom.xml
@@ -1,45 +1,37 @@
 <?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">
-
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.contact.service</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0</version>
     <name>services.contact.service</name>
+    <packaging>jar</packaging>
 
     <dependencies>
-    
-        <!-- Note: removed JUnit and Restlet dependencies -->
-        <!-- Aron 2009-12-10 -->
-    
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
-            <version>1.0</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.contact.jaxb</artifactId>
-            <version>1.0</version>
+            <version>${project.version}</version>
         </dependency>
-        
+        <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>5.6</version>
-        </dependency>
-        
+        </dependency>        
 
       <!-- javax -->
 
-
         <dependency>
             <groupId>javax.security</groupId>
             <artifactId>jaas</artifactId>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
index d6dee72f7ff13ebb1ab0ea335875a44547b4ce13..5ad7d273b7861b418bddbc6bb3f7acdbcc8388df 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
@@ -12,7 +12,7 @@
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
-    <property name="nuxeo.dimension.jar" value="org.collectionspace.services.dimension.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.dimension.jar" value="org.collectionspace.services.dimension.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index b101725789bd6e6faea9266b994419eeb03ec832..1e12e77952253ffb629685573b7f594a6dc944a6 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -3,17 +3,35 @@
   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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.dimension.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.dimension.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Dimension Nuxeo Document Type
+        Dimension Nuxeo Document Type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml
index 122b075978f845fb4344b3215d46e81eae20b337..aae31ccc87da15679868d841ce506efa9b5f6aac 100644 (file)
--- a/services/dimension/3rdparty/pom.xml
+++ b/services/dimension/3rdparty/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.dimension</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.dimension</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.dimension.3rdparty</name>\r
+    <packaging>pom</packaging>\r
     <description>\r
-    3rd party build for dimension service\r
+        3rd party build for dimension service\r
     </description>\r
 \r
     <modules>\r

diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index 148d7d3ea81eb1ea2e79c324aa51609074493976..905185939832c595a336b9492e95d3b41ce530ae 100644 (file)
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -4,15 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.dimension</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.dimension</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.dimension.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.dimension.client</name>\r
     \r
     <dependencies>\r
@@ -27,17 +26,18 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.dimension.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index d4a35986325d95e8bbe81c0640e23853f9463d50..660085bfaad9997ad8466d13fecbecc7e39c89e1 100644 (file)
--- a/services/dimension/jaxb/pom.xml
+++ b/services/dimension/jaxb/pom.xml
@@ -4,15 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
-        <artifactId>org.collectionspace.services.dimension</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.dimension</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.dimension.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.dimension.jaxb</name>
     
     <dependencies>
@@ -32,6 +31,7 @@
             <version>0.4.1.4</version>
         </dependency>
     </dependencies>
+    
     <build>
         <finalName>collectionspace-services-dimension-jaxb</finalName>
         <defaultGoal>install</defaultGoal>

diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml
index 73a938a0d93e5e23197a9befa1ed410f82ebe41b..8c1be2250c341939d811d0470503910ab1721f16 100644 (file)
--- a/services/dimension/pom.xml
+++ b/services/dimension/pom.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <!-- A comment. -->\r
 <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">\r
+\r
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.dimension</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.dimension</name>\r
-\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index 97ce3ddb26657cb3efcbca0fdc9b320e3a3dbed4..91fa782600e2d6f6da89b0a77d00c29181bd6ca2 100644 (file)
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -2,30 +2,30 @@
 <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">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.dimension</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.dimension</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.dimension.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.dimension.service</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.dimension.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
@@ -38,17 +38,14 @@
             <version>5.6</version>\r
         </dependency>\r
         \r
-\r
       <!-- javax -->\r
 \r
-\r
         <dependency>\r
             <groupId>javax.security</groupId>\r
             <artifactId>jaas</artifactId>\r
             <version>1.0.01</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>dom4j</groupId>\r
             <artifactId>dom4j</artifactId>\r
@@ -81,11 +78,10 @@
         </dependency>\r
         \r
         <!-- nuxeo -->\r
-\r
+        \r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r
@@ -94,6 +90,7 @@
             </exclusions>\r
         </dependency>\r
 \r
+        <!-- Restlet -->\r
         <dependency>\r
             <groupId>org.restlet</groupId>\r
             <artifactId>org.restlet</artifactId>\r

diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index 3c0ba46beed939e71c473cd687316775d4bde72e..ba67c97b6996259399b740dc60a0aed17bf62b66 100644 (file)
--- a/services/id/3rdparty/pom.xml
+++ b/services/id/3rdparty/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  pom.xml
  
@@ -22,16 +21,17 @@
 <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">
-  
-    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>org.collectionspace.services.id</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.id</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+        
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.id.3rdparty</artifactId>
-    <packaging>pom</packaging>
     <name>services.id.3rdparty</name>
-    <description>3rd party build for ID service</description>
-
+    <packaging>pom</packaging>
+    <description>
+        3rd party build for ID service
+    </description>
 </project>

diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index 3b35a5b85140ffcc447f6b3306a82ae0ee775dee..e7a7f7748570e998cc8a41e8c6821bc402bd5c2b 100644 (file)
--- a/services/id/client/pom.xml
+++ b/services/id/client/pom.xml
@@ -2,19 +2,17 @@
 <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">
-
     <parent>
-        <artifactId>org.collectionspace.services.id</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.id</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.id.client</artifactId>
-    <version>1.0</version>
     <name>services.id.client</name>
-    
+
     <dependencies>
         <!-- keep slf4j dependencies on the top -->
         <dependency>
@@ -27,12 +25,13 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- CollectionSpace -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>${cspace.services.client.version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+        <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -61,7 +60,7 @@
             <version>1.0.2.GA</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>cspace-services-id-client</finalName>
         <plugins>

diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index 110a83c6b5ffcb2e8f5b679193c29b8835f28481..12932d9db0782b29a02d6fa3eecd87af9708d408 100644 (file)
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -24,19 +24,17 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <artifactId>org.collectionspace.services.id</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
+    <artifactId>org.collectionspace.services.id</artifactId>
+    <version>0.6-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.collectionspace.services</groupId>
   <artifactId>org.collectionspace.services.id.jaxb</artifactId>
-  <version>1.0</version>
   <name>services.id.jaxb</name>
   
-  <dependencies>
-  
+  <dependencies>  
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>

diff --git a/services/id/pom.xml b/services/id/pom.xml
index 997f5e9c33d8c4ab890546761a4355fe1098a829..103f1b1ce7919bc60b82e366c66533e21492b506 100644 (file)
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -20,21 +20,17 @@
   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">
-
   <parent>
-    <artifactId>org.collectionspace.services.main</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
+    <artifactId>org.collectionspace.services.main</artifactId>
+    <version>0.6-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.collectionspace.services</groupId>
-  <version>1.0</version>
   <artifactId>org.collectionspace.services.id</artifactId>
-  <!-- The POM packaging type is required for parent and/or multimodule aggregator projects. -->
-  <packaging>pom</packaging>
   <name>services.id</name>
-
+  <packaging>pom</packaging>
   
   <modules>
     <!--module>jaxb</module-->
@@ -45,7 +41,6 @@
   </modules>
 
   <build>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 8efbe4eb02c28d42fe859e05db80b7fabc4ce3fc..f80e6c5ce019ce1693f42b1557c7786438d7bed7 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -24,14 +24,13 @@
   <parent>
     <artifactId>org.collectionspace.services.id</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
+    <version>0.6-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.collectionspace.services</groupId>
   <artifactId>org.collectionspace.services.id.service</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
   <name>services.id.service</name>
 
   <dependencies>
@@ -40,7 +39,7 @@
     <dependency>
       <groupId>org.collectionspace.services</groupId>
       <artifactId>org.collectionspace.services.common</artifactId>
-      <version>1.0</version>
+      <version>${project.version}</version>
     </dependency>
     
     <!-- JUnit, a testing framework. -->

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index 31cebfcab99d0b3febc75283c7bfc65c9abb84e4..a9b2e6bf750218ff365612a6c82e37c145856bc1 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.intake.jar" value="org.collectionspace.services.intake.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.intake.jar" value="org.collectionspace.services.intake.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index fdef1d2fc423fcb8d5810bc5aba45588e46cd397..529a0553c0c39ff03b5e3dda0f56ec7ffbab7cd6 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -1,19 +1,38 @@
 <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">
+
     <parent>
         <groupId>org.collectionspace.services</groupId>
-        <artifactId>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.intake.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.intake.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Intake Nuxeo Document Type
+        Intake Nuxeo Document Type
     </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index cb30c2e39b4c1a0942b67e956d701173ba35ace3..417e1097d24abbe856a3aa74e181618d8a3f43c1 100644 (file)
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/pom.xml
@@ -5,16 +5,17 @@
     <parent>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.intake.3rdparty</name>\r
+    <packaging>pom</packaging>\r
+    \r
     <description>\r
-    3rd party build for intake service\r
+        3rd party build for intake service\r
     </description>\r
 \r
     <modules>\r

diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 866d4a5d928717aa69b7fa7550146c3d5e5197fe..e54ea185f3fdee3e1bddf3857ee7012c32072670 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -2,17 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.intake</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.intake.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.intake.client</name>\r
     \r
     <dependencies>\r
@@ -27,22 +25,23 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+<!-- CollectionSpace dependencies -->        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+<!-- External dependencies -->        \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index 8dce3b89ce95a9259fbe3fcc06013fd766ab06e3..4171a00a169357b471dfce8abd4a7e013d1b9d2a 100644 (file)
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.intake.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.intake.jaxb</name>
     
     <dependencies>
@@ -32,6 +30,7 @@
             <version>0.4.1.4</version>
         </dependency>
     </dependencies>
+    
     <build>
         <finalName>collectionspace-services-intake-jaxb</finalName>
         <defaultGoal>install</defaultGoal>

diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index 80fbea3b87debf11993b8a896686aa20da61dcc5..9c9cd2ed9a18a4c3884503466827d656b627c0ff 100644 (file)
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -2,17 +2,16 @@
 <!-- A comment. -->\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.intake</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.intake</name>\r
-\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r
@@ -48,7 +47,6 @@
                         <archive>\r
                             <manifest>\r
                                 <addClasspath>true</addClasspath>\r
-\r
                             </manifest>\r
                         </archive>\r
                     </configuration>\r

diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 71c1a17527c5de34a4e6b4dc2c7224470f0bed01..042909d27d878052a6787dfe021f66bbf9e9dc0b 100644 (file)
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -2,35 +2,34 @@
 <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">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.intake</artifactId>        \r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.intake.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.intake.service</name>\r
+    <packaging>jar</packaging>       \r
 \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+        <!-- External dependencies -->        \r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
@@ -43,10 +42,8 @@
             <version>5.6</version>\r
         </dependency>\r
         \r
-\r
       <!-- javax -->\r
 \r
-\r
         <dependency>\r
             <groupId>javax.security</groupId>\r
             <artifactId>jaas</artifactId>\r
@@ -90,7 +87,6 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r
@@ -114,7 +110,6 @@
             <artifactId>com.noelios.restlet</artifactId>\r
             <version>1.0.7</version>\r
         </dependency>\r
-\r
     </dependencies>\r
     \r
     <build>\r

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
index 4911978cdc57ab669e048bd8b6604b9b138c86f5..0d659f651d8bf3c7b809c466f677fdebcc3aafd4 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.organization.jar" value="org.collectionspace.services.organization.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.organization.jar" value="org.collectionspace.services.organization.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index 20f4a3b3faef544f5abcd26fe0b1fff189c6f0e1..3fdb0afc8341a472f3e9514eade9f4232c6f49f2 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
@@ -3,17 +3,35 @@
   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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.organization.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.organization.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Organization Nuxeo Document Type
+        Organization Nuxeo Document Type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml
index d790b56f8c249fdb73391f7d705cf8d1179880b7..3ade652d6419c73f2a6bac818f524da1106aad32 100644 (file)
--- a/services/organization/3rdparty/pom.xml
+++ b/services/organization/3rdparty/pom.xml
@@ -3,16 +3,16 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.organization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.organization</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.organization.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.organization.3rdparty</name>\r
+    <packaging>pom</packaging>\r
     <description>\r
     3rd party build for organization service\r
     </description>\r

diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 36c12f4f9bfa3e10ea9494731ac184bde2a779ce..ad452dc4352f59563e7ab99afd13ad9768fa9473 100644 (file)
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -2,17 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.organization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.organization</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.organization.client</name>\r
     \r
     <dependencies>\r
@@ -27,21 +25,23 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.contact.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml
index a45fd58518e182b4055b5a767a4b9b60338c329c..1827e4a9dd635561ba8af7e499b6896eb0c29a88 100644 (file)
--- a/services/organization/import/pom.xml
+++ b/services/organization/import/pom.xml
@@ -2,37 +2,45 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.importer</artifactId>\r
-    <version>1.0</version>\r
     <name>services.organization.importer</name>\r
     \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+            <version>1.5.2</version>\r
+        </dependency>\r
+        <!--          <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>1.5.2</version>\r
+            </dependency> -->\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
 <!--         \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
@@ -40,16 +48,6 @@
             <version>5.6</version>\r
         </dependency>\r
  -->        \r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-<!--          <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency> -->\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r

diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index 22259af533f5ea9d10a402bb9da2640a62a68d57..4987cd59bec6195b96bc9e470ede87a1c381eb91 100644 (file)
--- a/services/organization/jaxb/pom.xml
+++ b/services/organization/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.organization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.organization.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.organization.jaxb</name>
     
     <dependencies>

diff --git a/services/organization/pom.xml b/services/organization/pom.xml
index dad8a7e7273b8b661d41ea6d73ed0ea7bf101b12..42b1a3c57fcd8a048308f9f5cd1a05d6dd4a5d2d 100644 (file)
--- a/services/organization/pom.xml
+++ b/services/organization/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.organization</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.organization</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml
index 38517d1183aa8c29152fa77d80fe09b5b9b50227..35c5c6418052b063d0d5b797ce06a3b98c607a95 100644 (file)
--- a/services/organization/service/pom.xml
+++ b/services/organization/service/pom.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.organization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.organization</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.organization.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.organization.service</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+        </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.contact.service</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!-- External dependencies -->        \r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
index 18f85460644957c134c59ac17e45dcbde8c71939..518f463fced1dc1abf9ef71be5cb0ea4f5fa1308 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.person.jar" value="org.collectionspace.services.person.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.person.jar" value="org.collectionspace.services.person.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index 21d3cd73a101f3f44a15495ac5ac67c88f95240b..a42b62e649bd39d2271be9b4d0530d902c47efd7 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
@@ -3,17 +3,35 @@
   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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.person.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.person.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.person.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Person Nuxeo Document Type
+        Person Nuxeo Document Type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index 328c6de5526884f143d74e9689848e7576fe2dae..08c37777bc2fa306905d0c5de837fbd7e9006874 100644 (file)
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.person</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.person</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.person.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.person.3rdparty</name>\r
+    <packaging>pom</packaging>\r
     <description>\r
-    3rd party build for person service\r
+        3rd party build for person service\r
     </description>\r
 \r
     <modules>\r

diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index c7a937ab341202bc36ad1fbcfa7581391f324273..e12fe3816f850c3581db9d946a185f2a209f0d9a 100644 (file)
--- a/services/person/client/pom.xml
+++ b/services/person/client/pom.xml
@@ -2,17 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.person</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.person</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.person.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.person.client</name>\r
     \r
     <dependencies>\r
@@ -27,21 +25,23 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.contact.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml
index 9634f3934cb3f8c2f3a1d685a705e2e2b67e9f83..f60723624fde384e6194b00a73901b364f851c09 100644 (file)
--- a/services/person/import/pom.xml
+++ b/services/person/import/pom.xml
@@ -2,37 +2,45 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.person.importer</artifactId>\r
-    <version>1.0</version>\r
     <name>services.person.importer</name>\r
     \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+            <version>1.5.2</version>\r
+        </dependency>\r
+        <!-- <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>1.5.2</version>\r
+            </dependency> -->\r
+        <!-- CollectionSpace Dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
-        </dependency>\r
-        \r
+            <version>${project.version}</version>\r
+        </dependency>        \r
 <!--         \r
         <dependency>\r
             <groupId>org.testng</groupId>\r
@@ -40,16 +48,6 @@
             <version>5.6</version>\r
         </dependency>\r
  -->        \r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency>\r
-<!--          <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
-            <version>1.5.2</version>\r
-        </dependency> -->\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r

diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index 2616fc9ed14f2be181c1614a08c5288faea06245..6b29d7b9617f742f1b4b091c37a12ff001be6903 100644 (file)
--- a/services/person/jaxb/pom.xml
+++ b/services/person/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.person</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.person.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.person.jaxb</name>
     
     <dependencies>

diff --git a/services/person/pom.xml b/services/person/pom.xml
index bc16f227db759dc3c400c474a75436cd88a71ee6..6bb4f76dbecd87d12301b097123456a4a5aaab2b 100644 (file)
--- a/services/person/pom.xml
+++ b/services/person/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.person</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.person</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml
index cc51f0dbd535ee04d0f0ef96ddd68546e7c0c380..e356df97143bc02fbbc90c6f0e02e5478b3351d8 100644 (file)
--- a/services/person/service/pom.xml
+++ b/services/person/service/pom.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.person</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.person</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.person.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.person.service</name>\r
-\r
+    <packaging>jar</packaging>\r
+    \r
     <dependencies>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+        </dependency>\r
+<!-- CollectionSpace dependencies -->        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.contact.service</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!-- External dependencies -->        \r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r

diff --git a/services/pom.xml b/services/pom.xml
index 2c270c449a6f6e504be1302bc8c13600e4edc9a6..cba498b3ca3560ab10af7e46dd97281a73522735 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -1,16 +1,16 @@
 <?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">
     <parent>
-        <artifactId>org.collectionspace.services</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.main</artifactId>
-    <packaging>pom</packaging>
     <name>services.main</name>
+    <packaging>pom</packaging>
 
     <modules>
         <module>authentication</module>
@@ -18,7 +18,7 @@
         <module>client</module>
         <module>account</module>
         <module>relation</module>
-        <!--module>query</module-->
+<!--        <module>query</module> -->
         <module>acquisition</module>
         <module>vocabulary</module>
         <module>organization</module>
@@ -72,6 +72,7 @@
                         <target>1.5</target>
                     </configuration>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
@@ -79,6 +80,7 @@
                         <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
                     </configuration>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -88,12 +90,17 @@
                         <archive>
                             <manifest>
                                 <addClasspath>true</addClasspath>
-
                             </manifest>
                         </archive>
                     </configuration>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
@@ -109,8 +116,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
-
             </plugins>
         </pluginManagement>
         <plugins>
@@ -256,7 +261,6 @@
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
                 <version>5.1.5</version>
-                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index e0553420a00a54b37388d8e3c6e9f0919e12a6d1..8df95b279484e8197b5872f6bb7895f9527f1571 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
-    <property name="nuxeo.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-1.0.jar"/>\r
+    <property name="nuxeo.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-${cspace.release}.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index 86768f6eb874f954f33895ac141ebe02da268847..a4f500a925cac34f2f515847153ae054993af9f7 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -1,19 +1,36 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
-    <parent>\r
-               <groupId>org.collectionspace.services</groupId>\r
-               <artifactId>nuxeo-platform-collectionspace</artifactId>\r
-               <version>1.0</version>\r
-    </parent>\r
-\r
-    <modelVersion>4.0.0</modelVersion>\r
+  <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
-    <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>\r
-    <packaging>jar</packaging>\r
-    <name>services.relation.3rdparty.nuxeo</name>\r
-    <description>CollectionSpace relation Nuxeo document type.</description>\r
+    <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
+    <version>0.6-SNAPSHOT</version>\r
+  </parent>\r
+\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.collectionspace.services</groupId>\r
+  <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>\r
+  <name>services.relation.3rdparty.nuxeo</name>\r
+  <packaging>jar</packaging>\r
+  <description>\r
+    CollectionSpace relation Nuxeo document type.\r
+  </description>\r
 \r
+  <build>\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-jar-plugin</artifactId>\r
+        <configuration>\r
+          <archive>\r
+            <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>\r
+            <manifestEntries>\r
+              <Bundle-Version>${eclipseVersion}</Bundle-Version>\r
+              <Bundle-ManifestVersion>2</Bundle-ManifestVersion>\r
+            </manifestEntries>\r
+          </archive>\r
+        </configuration>\r
+      </plugin>\r
+    </plugins>\r
+  </build>\r
 </project>\r

diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index 5ec58caecff652486ca14ecf0dc3791619c21452..bacfaae35425eb8c6c7e332d6620dc1b7ef7e71a 100644 (file)
--- a/services/relation/3rdparty/pom.xml
+++ b/services/relation/3rdparty/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <artifactId>org.collectionspace.services.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>
-    <packaging>pom</packaging>
     <name>services.relation.3rdparty</name>
+    <packaging>pom</packaging>
     <description>
-    3rd party build for relation service
+        3rd party build for relation service
     </description>
 
     <modules>

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index b984bb0a495efd98e4e61b8340d8e6145a3b7030..34bca716a1fc9f678fa6b39cec45ef5356a68b6a 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -2,21 +2,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.relation</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.relation</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.relation.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.relation.client</name>\r
-    \r
+\r
     <dependencies>\r
-                <!-- keep slf4j dependencies on the top -->\r
+        <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
@@ -27,7 +25,7 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
-<!--        <dependency>\r
+        <!-- <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.relation.jaxb</artifactId>\r
             <version>1.0</version>\r
@@ -35,16 +33,14 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-\r
-\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r
@@ -78,7 +74,7 @@
             <version>3.1</version>\r
         </dependency>\r
     </dependencies>\r
-    \r
+\r
     <build>\r
         <finalName>cspace-services-relation-client</finalName>\r
         <plugins>\r

diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index 29e583cbe624f8b68f870467037b98ca2de0dbc1..77dd2fc391639fb3cf53207b108eb346000d00ee 100644 (file)
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.relation</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.relation</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>service</module>\r

diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml
index 147f85cfdea2372a5e57275b085d29fcf1c2920b..86e47c0fed3235aefe239f9c1381cadba13e7f1e 100644 (file)
--- a/services/relation/service/pom.xml
+++ b/services/relation/service/pom.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.relation</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.relation</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.relation.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.relation.service</name>\r
+    <packaging>jar</packaging>\r
 \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
 <!--        <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r

diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index f051ea8bba224e92b2bf1562dc507bc8333e79d8..6c511f3c9e82efe7c014306026ab9c1104afe21a 100644 (file)
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -2,18 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <artifactId>org.collectionspace.services.security</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.security.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.security.client</name>\r
+    \r
     <dependencies>\r
         <!-- keep slf4j dependencies on the top -->\r
         <dependency>\r
@@ -26,27 +25,29 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <!-- authentication tests use CollectionObject service and Account service -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.authentication.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/security/pom.xml b/services/security/pom.xml
index 66208325797acd39a313f494f01808952f935a0f..ea60987cce28299017cf216a316e794ccdd38822 100644 (file)
--- a/services/security/pom.xml
+++ b/services/security/pom.xml
@@ -3,14 +3,14 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.security</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.security</name>\r
+    <packaging>pom</packaging>\r
 \r
     <properties>\r
     </properties>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 00e25fec9968b662781b23f3e1a6d9de898f6b02..473adccef3659474b617952125588a2d2ac5812e 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -10,7 +10,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="nuxeo.vocabulary.jar" value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-1.0.jar"/>
+    <property name="nuxeo.vocabulary.jar" value="org.collectionspace.services.vocabulary.3rdparty.nuxeo-${cspace.release}.jar"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index 43cbbbc937563b74c68f09cb272f47304f46e8f8..79680c10df6594d2126eadc8f227557760bc4ad8 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
@@ -3,17 +3,35 @@
   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>nuxeo-platform-collectionspace</artifactId>
-        <version>1.0</version>
+        <artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <version>1.0</version>
     <artifactId>org.collectionspace.services.vocabulary.3rdparty.nuxeo</artifactId>
-    <packaging>jar</packaging>
     <name>services.vocabulary.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
     <description>
-    Vocabulary Nuxeo Document Type
+        Vocabulary Nuxeo Document Type
     </description>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>

diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml
index dd59afb535e57560b9ab8254979091ee8b00ec03..4d81b937215bc58ad2e333953a9b936effe33c9d 100644 (file)
--- a/services/vocabulary/3rdparty/pom.xml
+++ b/services/vocabulary/3rdparty/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
     <parent>\r
-        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.vocabulary.3rdparty</name>\r
+    <packaging>pom</packaging>\r
     <description>\r
-    3rd party build for vocabulary service\r
+        3rd party build for vocabulary service\r
     </description>\r
 \r
     <modules>\r

diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index 38f004fce55380a853866b423f807d8a4380944c..790864d6dcfb2d547ef64c3da22f486b3607fe31 100644 (file)
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -4,15 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
 \r
     <parent>\r
-        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary.client</artifactId>\r
-    <version>${cspace.services.client.version}</version>\r
     <name>services.vocabulary.client</name>\r
     \r
     <dependencies>\r
@@ -27,17 +26,18 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-        \r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml
index 3f4ac7202e9529b8b1d46f531acf46892d5e137d..c49afeb625b131418569b272f93dc2c34e21d4e0 100644 (file)
--- a/services/vocabulary/import/pom.xml
+++ b/services/vocabulary/import/pom.xml
@@ -2,17 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"\r
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary.importer</artifactId>\r
-    <version>1.0</version>\r
     <name>services.vocabulary.importer</name>\r
 \r
     <dependencies>\r
@@ -25,22 +23,22 @@
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.client</artifactId>\r
-            <version>${cspace.services.client.version}</version>\r
+            <version>${project.version}</version>\r
         </dependency>\r
-\r
         <!--\r
         <dependency>\r
             <groupId>org.testng</groupId>\r

diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index 80c4cdd20522d4b927e0032f233841441dd7c4d7..8b2a062a438dd1783fb880ea14fb3f83b3e9ac50 100644 (file)
--- a/services/vocabulary/jaxb/pom.xml
+++ b/services/vocabulary/jaxb/pom.xml
@@ -2,17 +2,15 @@
 <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">
-
     <parent>
         <artifactId>org.collectionspace.services.vocabulary</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>1.0</version>
+        <version>0.6-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>
-    <version>1.0</version>
     <name>services.vocabulary.jaxb</name>
     
     <dependencies>

diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml
index 9872b9467920ccb10cd853fa029af7f2d3e23b04..b8c5ee844fcd45eed67a13616bac4335d50b9759 100644 (file)
--- a/services/vocabulary/pom.xml
+++ b/services/vocabulary/pom.xml
@@ -3,14 +3,14 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
+    \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <version>1.0</version>\r
     <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-    <packaging>pom</packaging>\r
     <name>services.vocabulary</name>\r
+    <packaging>pom</packaging>\r
 \r
     <modules>\r
         <module>jaxb</module>\r

diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index 0323438f3a35b04649c592630a71528f0dda9f28..53cce253df35699b2d8cb76657e39ae61dc72e7b 100644 (file)
--- a/services/vocabulary/service/pom.xml
+++ b/services/vocabulary/service/pom.xml
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-\r
     <parent>\r
-        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>1.0</version>\r
+        <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
+        <version>0.6-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.vocabulary.service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>1.0</version>\r
     <name>services.vocabulary.service</name>\r
-\r
+    <packaging>jar</packaging>\r
+    \r
     <dependencies>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.common</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
-            <version>1.0</version>\r
-        </dependency>                          \r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-api</artifactId>\r
@@ -33,6 +21,18 @@
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
+        <!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r