From 1a22ca3203ed156fa74c0df528083ca8e9eb92cd Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Fri, 12 Mar 2010 20:50:29 +0000 Subject: [PATCH] CSPACE-1159: Our Maven artifacts now implicitly inherit their value from their parent pom file. Our top level pom on the trunk is currently set to "0.6-SNAPSHOT." Also, all CS artifacts that depend on other CS artifacts now depend on the current pom version (the pom variable ${project.version}) of those artifacts. --- .../nuxeo-platform-collectionspace/pom.xml | 3 +- 3rdparty/nuxeo/pom.xml | 47 ++++----- 3rdparty/pom.xml | 52 +++++++++- build.properties | 2 +- pom.xml | 98 ++++++++++++++----- services/IntegrationTests/pom.xml | 72 +++++++------- services/JaxRsServiceProvider/pom.xml | 36 ++++--- services/PerformanceTests/pom.xml | 68 ++++++------- services/account/client/pom.xml | 38 ++++--- services/account/jaxb/pom.xml | 21 ++-- services/account/pom.xml | 8 +- services/account/pstore/pom.xml | 10 +- services/account/service/pom.xml | 31 +++--- .../nuxeo-platform-cs-acquisition/build.xml | 2 +- .../nuxeo-platform-cs-acquisition/pom.xml | 35 +++++-- services/acquisition/3rdparty/pom.xml | 6 +- services/acquisition/client/pom.xml | 18 ++-- services/acquisition/jaxb/pom.xml | 5 +- services/acquisition/pom.xml | 9 +- services/acquisition/service/pom.xml | 34 ++----- services/authentication/client/pom.xml | 15 +-- services/authentication/jaxb/pom.xml | 13 ++- services/authentication/pom.xml | 8 +- services/authentication/pstore/pom.xml | 13 ++- services/authentication/service/pom.xml | 31 +++--- services/client/pom.xml | 20 ++-- .../build.xml | 2 +- .../pom.xml | 26 ++++- services/collectionobject/3rdparty/pom.xml | 8 +- services/collectionobject/client/pom.xml | 22 ++--- services/collectionobject/jaxb/pom.xml | 6 +- services/collectionobject/pom.xml | 8 +- .../collectionobject/sample/sample/pom.xml | 8 +- services/collectionobject/service/pom.xml | 40 ++++---- services/common/pom.xml | 39 ++++---- .../nuxeo-platform-cs-contact/build.xml | 2 +- .../nuxeo-platform-cs-contact/pom.xml | 28 +++++- services/contact/3rdparty/pom.xml | 10 +- services/contact/client/pom.xml | 11 +-- services/contact/jaxb/pom.xml | 7 +- services/contact/pom.xml | 7 +- services/contact/service/pom.xml | 20 ++-- .../nuxeo-platform-cs-dimension/build.xml | 2 +- .../nuxeo-platform-cs-dimension/pom.xml | 28 +++++- services/dimension/3rdparty/pom.xml | 10 +- services/dimension/client/pom.xml | 12 +-- services/dimension/jaxb/pom.xml | 6 +- services/dimension/pom.xml | 8 +- services/dimension/service/pom.xml | 21 ++-- services/id/3rdparty/pom.xml | 16 +-- services/id/client/pom.xml | 15 ++- services/id/jaxb/pom.xml | 8 +- services/id/pom.xml | 11 +-- services/id/service/pom.xml | 5 +- .../nuxeo-platform-cs-intake/build.xml | 2 +- .../3rdparty/nuxeo-platform-cs-intake/pom.xml | 29 +++++- services/intake/3rdparty/pom.xml | 9 +- services/intake/client/pom.xml | 15 ++- services/intake/jaxb/pom.xml | 5 +- services/intake/pom.xml | 10 +- services/intake/service/pom.xml | 23 ++--- .../nuxeo-platform-cs-organization/build.xml | 2 +- .../nuxeo-platform-cs-organization/pom.xml | 28 +++++- services/organization/3rdparty/pom.xml | 8 +- services/organization/client/pom.xml | 14 +-- services/organization/import/pom.xml | 32 +++--- services/organization/jaxb/pom.xml | 4 +- services/organization/pom.xml | 8 +- services/organization/service/pom.xml | 32 +++--- .../nuxeo-platform-cs-person/build.xml | 2 +- .../3rdparty/nuxeo-platform-cs-person/pom.xml | 28 +++++- services/person/3rdparty/pom.xml | 10 +- services/person/client/pom.xml | 14 +-- services/person/import/pom.xml | 34 +++---- services/person/jaxb/pom.xml | 4 +- services/person/pom.xml | 8 +- services/person/service/pom.xml | 34 +++---- services/pom.xml | 22 +++-- .../nuxeo-platform-cs-relation/build.xml | 2 +- .../nuxeo-platform-cs-relation/pom.xml | 43 +++++--- services/relation/3rdparty/pom.xml | 8 +- services/relation/client/pom.xml | 22 ++--- services/relation/pom.xml | 7 +- services/relation/service/pom.xml | 10 +- services/security/client/pom.xml | 15 +-- services/security/pom.xml | 6 +- .../nuxeo-platform-cs-vocabulary/build.xml | 2 +- .../nuxeo-platform-cs-vocabulary/pom.xml | 28 +++++- services/vocabulary/3rdparty/pom.xml | 10 +- services/vocabulary/client/pom.xml | 12 +-- services/vocabulary/import/pom.xml | 12 +-- services/vocabulary/jaxb/pom.xml | 4 +- services/vocabulary/pom.xml | 6 +- services/vocabulary/service/pom.xml | 32 +++--- 94 files changed, 925 insertions(+), 752 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index 9ef05f661..1fd6cf281 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -5,10 +5,11 @@ org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - 1.0 + 0.6-SNAPSHOT 4.0.0 + org.collectionspace.services nuxeo-platform-collectionspace pom Nuxeo CS extensions diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml index 825d536f6..49da988d6 100644 --- a/3rdparty/nuxeo/pom.xml +++ b/3rdparty/nuxeo/pom.xml @@ -4,13 +4,12 @@ org.collectionspace.services org.collectionspace.services.3rdparty - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - 1.0 pom services.3rdparty.nuxeo @@ -19,68 +18,56 @@ + + org.osgi + org.osgi.core + 4.1.0 + jboss jboss-remoting 2.2.2.SP8 provided - - - + + org.nuxeo.common - nuxeo-common - ${nuxeo.version.1.5} + nuxeo-common provided org.nuxeo.runtime - nuxeo-runtime - ${nuxeo.version.1.5} + nuxeo-runtime org.nuxeo.ecm.core - nuxeo-core-api - ${nuxeo.version.1.5} + nuxeo-core-api org.nuxeo.ecm.core - nuxeo-core-client - ${nuxeo.version.1.5} + nuxeo-core-client org.nuxeo.ecm.core - nuxeo-core-query - ${nuxeo.version.1.5} + nuxeo-core-query org.nuxeo.ecm.core - nuxeo-core-schema - ${nuxeo.version.1.5} + nuxeo-core-schema org.nuxeo.ecm.core - nuxeo-core-io - ${nuxeo.version.1.5} + nuxeo-core-io org.nuxeo.ecm.core - nuxeo-core-facade - ${nuxeo.version.1.5} + nuxeo-core-facade org.nuxeo.runtime - nuxeo-runtime-osgi - ${nuxeo.version.1.5} + nuxeo-runtime-osgi - - org.osgi - org.osgi.core - 4.1.0 - - - diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index afc215ba6..50daba518 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -3,14 +3,14 @@ org.collectionspace.services org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.3rdparty - pom services.3rdparty + pom nuxeo @@ -18,6 +18,52 @@ + diff --git a/build.properties b/build.properties index d8f869199..02aa390a1 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ host=127.0.0.1 #cspace -cspace.release=0.4 +cspace.release=0.6-SNAPSHOT cspace.services.release=cspace-services-${cspace.release} cspace.services.war=cspace-services.war domain.cspace=cspace diff --git a/pom.xml b/pom.xml index 0acd7e37a..63a6bc586 100644 --- a/pom.xml +++ b/pom.xml @@ -5,18 +5,19 @@ 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services + 0.6-SNAPSHOT pom services - 0.5-SNAPSHOT 4.2.3.GA 3.0 UTF-8 5.2.1-SNAPSHOT 1.5.1-SNAPSHOT + 0.6-SNAPSHOT + 0.6.1-SNAPSHOT @@ -123,7 +124,7 @@ never - + public http://maven.nuxeo.org/public @@ -135,7 +136,7 @@ false - + nuxeo-public nuxeo-public @@ -160,7 +161,7 @@ - @@ -213,7 +214,6 @@ public - org.apache.maven.plugins maven-compiler-plugin @@ -240,7 +240,6 @@ maven-war-plugin 2.0.1 - WEB-INF/lib/*.jar @@ -249,12 +248,22 @@ - + + + org.slf4j + slf4j-api + 1.5.2 + + + org.slf4j + slf4j-log4j12 + 1.5.2 + net.java.dev.jaxb2-commons jaxb-fluent-api @@ -267,22 +276,58 @@ test jdk15 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - mysql mysql-connector-java 5.1.5 test + + + org.nuxeo.common + nuxeo-common + 1.5.1-SNAPSHOT + + + org.nuxeo.runtime + nuxeo-runtime + 1.5.1-SNAPSHOT + + + org.nuxeo.runtime + nuxeo-runtime-osgi + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-api + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-client + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-query + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-schema + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-io + 1.5.1-SNAPSHOT + + + org.nuxeo.ecm.core + nuxeo-core-facade + 1.5.1-SNAPSHOT + @@ -291,15 +336,14 @@ org.apache.maven.plugins maven-project-info-reports-plugin - - - - - - dependencies - - - + + + + + dependencies + + + + + org.collectionspace.services + org.collectionspace.services.common + ${project.version} + org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.collectionobject.jaxb + ${project.version} + + org.collectionspace.services + org.collectionspace.services.collectionobject.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.intake.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.intake.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.relation.client + ${project.version} + + org.testng testng @@ -60,36 +92,6 @@ commons-httpclient 3.1 - - org.collectionspace.services - org.collectionspace.services.common - 1.0 - - - org.collectionspace.services - org.collectionspace.services.collectionobject.jaxb - 1.0 - - - org.collectionspace.services - org.collectionspace.services.collectionobject.client - ${cspace.services.client.version} - - - org.collectionspace.services - org.collectionspace.services.intake.jaxb - 1.0 - - - org.collectionspace.services - org.collectionspace.services.intake.client - ${cspace.services.client.version} - - - org.collectionspace.services - org.collectionspace.services.relation.client - ${cspace.services.client.version} - diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 879c13d48..1a8e115ca 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -4,23 +4,22 @@ org.collectionspace.services.main org.collectionspace.services - 1.0 + 0.6-SNAPSHOT - 4.0.0 org.collectionspace.services org.collectionspace.services.jaxrs.provider - war - 1.0 services.jaxrs.provider + war + 0.5 3.0.0.RELEASE 3.0.1.RELEASE + - org.slf4j slf4j-api @@ -29,73 +28,72 @@ org.slf4j slf4j-log4j12 - log4j log4j 1.2.14 provided - + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.account.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.collectionobject.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.id.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.intake.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.dimension.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.contact.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.acquisition.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.vocabulary.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.organization.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.person.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.relation.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.common + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.collectionobject.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.collectionobject.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.intake.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.intake.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.relation.client + ${project.version} + org.testng testng @@ -60,36 +92,6 @@ commons-httpclient 3.1 - - org.collectionspace.services - org.collectionspace.services.common - 1.0 - - - org.collectionspace.services - org.collectionspace.services.collectionobject.jaxb - 1.0 - - - org.collectionspace.services - org.collectionspace.services.collectionobject.client - ${cspace.services.client.version} - - - org.collectionspace.services - org.collectionspace.services.intake.jaxb - 1.0 - - - org.collectionspace.services - org.collectionspace.services.intake.client - ${cspace.services.client.version} - - - org.collectionspace.services - org.collectionspace.services.relation.client - ${cspace.services.client.version} - diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index 52c5a3f96..11e75fc37 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -2,18 +2,17 @@ - - org.collectionspace.services.account org.collectionspace.services - 1.0 + org.collectionspace.services.account + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.account.client - ${cspace.services.client.version} services.account.client + @@ -29,33 +28,38 @@ org.collectionspace.services org.collectionspace.services.account.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} - - + + + + mysql + mysql-connector-java + test + + - + --> org.testng testng 5.6 - + org.jboss.resteasy resteasy-jaxrs 1.1.GA - tjws @@ -78,12 +82,6 @@ commons-httpclient 3.1 - - - - mysql - mysql-connector-java - diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index eab43b6b0..f2c68c394 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -2,18 +2,17 @@ - - org.collectionspace.services.account org.collectionspace.services - 1.0 + org.collectionspace.services.account + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.account.jaxb - 1.0 services.account.jaxb + @@ -26,6 +25,13 @@ slf4j-log4j12 test + com.sun.xml.bind jaxb-impl @@ -60,13 +66,6 @@ testng 5.6 - diff --git a/services/account/pom.xml b/services/account/pom.xml index dfff467a8..7d82f8c45 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.account - pom services.account + pom jaxb diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index bf8f35f7f..105e2459d 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -2,22 +2,22 @@ - org.collectionspace.services.account org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.account.pstore - 1.0 services.account.pstore + account.sql ${basedir}/src/main/resources/db/mysql + @@ -30,11 +30,13 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.account.jaxb - 1.0 + ${project.version} + org.testng testng diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index 327d1bd1a..7fb025b62 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -1,44 +1,43 @@ - org.collectionspace.services.account org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.account.service - jar - 1.0 services.account.service + jar + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.authentication.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.account.jaxb - 1.0 - - - org.slf4j - slf4j-api + ${project.version} - - org.slf4j - slf4j-log4j12 - - + junit junit diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml index c97ec1a61..98a5f77a3 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index 260d49250..031a6c72d 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -1,19 +1,34 @@ + 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.acquisition.3rdparty + 0.6-SNAPSHOT - + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.acquisition.3rdparty.nuxeo - jar services.acquisition.3rdparty.nuxeo - - Acquisition Nuxeo Document Type - + jar + Acquisition Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml index 77e456623..09478e0fc 100644 --- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.acquisition org.collectionspace.services - 1.0 + org.collectionspace.services.acquisition + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.acquisition.3rdparty pom services.acquisition.3rdparty diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 7cfe4b51f..ab957e1d1 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -2,19 +2,17 @@ - - org.collectionspace.services.acquisition org.collectionspace.services - 1.0 + org.collectionspace.services.acquisition + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.acquisition.client - ${cspace.services.client.version} - jar services.acquisition.client + jar @@ -28,22 +26,23 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.acquisition.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.person.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng @@ -63,7 +62,6 @@ org.jboss.resteasy resteasy-jaxrs 1.0.2.GA - tjws diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index a89dcfdce..ffe4c8039 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services.acquisition org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.acquisition.jaxb - 1.0 services.acquisition.jaxb @@ -32,6 +30,7 @@ 0.4.1.4 + collectionspace-services-acquisition-jaxb install diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index 2d431e5c4..038f17a8c 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -2,17 +2,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.acquisition - pom services.acquisition - + pom jaxb diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index e3a9d80aa..da429159b 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -1,32 +1,29 @@ - org.collectionspace.services.acquisition org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.acquisition.service - jar - 1.0 services.acquisition.service + jar org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.acquisition.jaxb - 1.0 - - - + ${project.version} + + - + javax.security @@ -48,16 +41,13 @@ 1.0.01 provided - dom4j dom4j 1.6.1 provided - + - - org.jboss.resteasy resteasy-jaxrs @@ -78,10 +68,8 @@ org.jboss.resteasy resteasy-multipart-provider 1.0.2.GA - + - - org.nuxeo.ecm.core nuxeo-core-api @@ -93,7 +81,6 @@ - org.restlet org.restlet @@ -108,8 +95,7 @@ com.noelios.restlet com.noelios.restlet 1.0.7 - - + --> diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 0e195083b..691247356 100644 --- 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"> - org.collectionspace.services.authentication org.collectionspace.services - 1.0 + org.collectionspace.services.authentication + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.authentication.client - ${cspace.services.client.version} services.authentication.client + @@ -26,16 +26,18 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.authentication.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} + tjws @@ -71,7 +72,7 @@ mysql mysql-connector-java - + --> diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 2aa9d5597..3f91d0bf4 100644 --- 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"> - org.collectionspace.services.authentication org.collectionspace.services - 1.0 + org.collectionspace.services.authentication + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.authentication.jaxb - 1.0 services.authentication.jaxb + authentication.sql src/main/resources/db/mysql + @@ -30,6 +31,7 @@ slf4j-log4j12 test + javax.persistence @@ -60,11 +62,12 @@ org.jvnet.hyperjaxb3 hyperjaxb3-ejb-runtime + diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index da983b443..8a68881dc 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.authentication - pom services.authentication + pom diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml index 1233816f6..5a3d258f2 100644 --- 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"> - org.collectionspace.services.authentication org.collectionspace.services - 1.0 + org.collectionspace.services.authentication + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.authentication.pstore - 1.0 services.authentication.pstore + authentication.sql ${basedir}/src/main/resources/db/mysql + @@ -30,11 +31,13 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.authentication.jaxb - 1.0 + ${project.version} + diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index 846eb22a7..3b376aeb6 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -1,40 +1,47 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.authentication + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services org.collectionspace.services.authentication.service - jar - 1.0 services.authentication.service + jar - 4.2.3.GA + 3.0.1.RELEASE - + + + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-log4j12 + test + commons-logging commons-logging 1.1.1 - - junit junit 4.1 test - javax.security @@ -42,8 +49,6 @@ 1.0.01 provided - - org.jboss.logging jboss-logging-log4j @@ -54,14 +59,12 @@ jbosssx 4.2.3.GA - org.springframework.security spring-security-core ${spring.security.version} provided - diff --git a/services/client/pom.xml b/services/client/pom.xml index 47433f674..6c924319a 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -1,23 +1,18 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services org.collectionspace.services.client - jar - ${cspace.services.client.version} services.client + jar - - org.collectionspace.services - org.collectionspace.services.common - 1.0 - org.slf4j slf4j-api @@ -26,6 +21,13 @@ org.slf4j slf4j-log4j12 + + + org.collectionspace.services + org.collectionspace.services.common + ${project.version} + + org.apache.maven.plugins maven-surefire-plugin diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml index 98b76c9f2..a8d21320d 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml @@ -12,7 +12,7 @@ - + diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index bd8d6b3b1..41682aef3 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.collectionobject.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.collectionobject.3rdparty.nuxeo - jar services.collectionobject.3rdparty.nuxeo + jar CollectionObject Nuxeo document type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index 1dcd0d1c9..1e63800ce 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -2,21 +2,19 @@ - org.collectionspace.services org.collectionspace.services.collectionobject - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.collectionobject.3rdparty - pom services.collectionobject.3rdparty + pom - 3rd party build for collectionobject service + 3rd party build for collectionobject service diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index c71cab028..412c071ee 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.collectionobject org.collectionspace.services - 1.0 + org.collectionspace.services.collectionobject + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.collectionobject.client - ${cspace.services.client.version} services.collectionobject.client @@ -27,22 +25,23 @@ slf4j-log4j12 test + org.collectionspace.services - org.collectionspace.services.collectionobject.jaxb - 1.0 + org.collectionspace.services.client + ${project.version} org.collectionspace.services - org.collectionspace.services.client - ${cspace.services.client.version} + org.collectionspace.services.collectionobject.jaxb + ${project.version} org.collectionspace.services org.collectionspace.services.person.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng @@ -102,5 +101,4 @@ - - + \ No newline at end of file diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml index 6dd085c3f..017da7bc7 100644 --- a/services/collectionobject/jaxb/pom.xml +++ b/services/collectionobject/jaxb/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.collectionobject org.collectionspace.services - 1.0 + org.collectionspace.services.collectionobject + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.collectionobject.jaxb - 1.0 services.collectionobject.jaxb diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml index 5ed43d002..e263cefc8 100644 --- a/services/collectionobject/pom.xml +++ b/services/collectionobject/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.collectionobject - pom services.collectionobject + pom jaxb diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml index d581a8df3..ce28d5478 100644 --- a/services/collectionobject/sample/sample/pom.xml +++ b/services/collectionobject/sample/sample/pom.xml @@ -4,24 +4,24 @@ org.collectionspace.services org.collectionspace.services.collectionobject.client.sample jar - 1.0 collectionobject.client.sample + 0.6-SNAPSHOT org.collectionspace.services org.collectionspace.services.collectionobject.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - 0.5-SNAPSHOT + ${project.version} org.collectionspace.services org.collectionspace.services.collectionobject.client - 0.5-SNAPSHOT + ${project.version} diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index e0975c72b..9e615e7e5 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -1,55 +1,53 @@ - - org.collectionspace.services.collectionobject org.collectionspace.services - 1.0 + org.collectionspace.services.collectionobject + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.collectionobject.service - jar - 1.0 services.collectionobject.service + jar + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.collectionobject.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.intake.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.intake.service - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.relation.service - 1.0 + ${project.version} - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - + junit junit @@ -76,7 +74,6 @@ - javax.security jaas @@ -144,7 +141,6 @@ com.noelios.restlet 1.0.7 --> - diff --git a/services/common/pom.xml b/services/common/pom.xml index 44214b6ee..b5a3f6ee4 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -1,20 +1,32 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services org.collectionspace.services.common - jar - 1.0 services.common + jar - - + + + org.collectionspace.services + org.collectionspace.services.authentication.jaxb + ${project.version} + provided + + + org.collectionspace.services + org.collectionspace.services.authentication.service + ${project.version} + provided + + junit junit @@ -30,7 +42,6 @@ slf4j-log4j12 - javax.servlet servlet-api @@ -120,7 +131,6 @@ provided - org.nuxeo.common nuxeo-common @@ -196,19 +206,6 @@ jaxen 1.1.1 - - - org.collectionspace.services - org.collectionspace.services.authentication.jaxb - 1.0 - provided - - - org.collectionspace.services - org.collectionspace.services.authentication.service - 1.0 - provided - diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml index d40865744..28d9f083a 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml @@ -12,7 +12,7 @@ - + diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml index 1f1d2ddf6..350e1b429 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.contact.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.contact.3rdparty.nuxeo - jar services.contact.3rdparty.nuxeo + jar - Contact Nuxeo Document Type + Contact Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml index 22963b2fe..272058fc7 100644 --- 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"> - org.collectionspace.services.contact org.collectionspace.services - 1.0 + org.collectionspace.services.contact + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.contact.3rdparty - pom services.contact.3rdparty + pom - 3rd party build for contact service + 3rd party build for contact service diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index 78d93048c..239eec16f 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services.contact org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.contact.client - ${cspace.services.client.version} services.contact.client @@ -27,17 +25,18 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.contact.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index 8c51c0ded..a93fc9d7b 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.contact org.collectionspace.services - 1.0 + org.collectionspace.services.contact + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.contact.jaxb - 1.0 services.contact.jaxb @@ -32,6 +30,7 @@ 0.4.1.4 + collectionspace-services-contact-jaxb install diff --git a/services/contact/pom.xml b/services/contact/pom.xml index d4de6595c..d108c0ef1 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -4,15 +4,14 @@ org.collectionspace.services.main org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.contact - pom services.contact - + pom jaxb diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index f2222de2e..34096754d 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -1,45 +1,37 @@ - org.collectionspace.services.contact org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.contact.service - jar - 1.0 services.contact.service + jar - - - - org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.contact.jaxb - 1.0 + ${project.version} - + org.testng testng 5.6 - - + - javax.security jaas diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml index d6dee72f7..5ad7d273b 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml @@ -12,7 +12,7 @@ - + diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index b10172578..1e12e7795 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.dimension.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.dimension.3rdparty.nuxeo - jar services.dimension.3rdparty.nuxeo + jar - Dimension Nuxeo Document Type + Dimension Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml index 122b07597..aae31ccc8 100644 --- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.dimension org.collectionspace.services - 1.0 + org.collectionspace.services.dimension + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.dimension.3rdparty - pom services.dimension.3rdparty + pom - 3rd party build for dimension service + 3rd party build for dimension service diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index 148d7d3ea..905185939 100644 --- 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"> - org.collectionspace.services.dimension org.collectionspace.services - 1.0 + org.collectionspace.services.dimension + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.dimension.client - ${cspace.services.client.version} services.dimension.client @@ -27,17 +26,18 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.dimension.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index d4a359863..660085bfa 100644 --- 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"> - org.collectionspace.services.dimension org.collectionspace.services - 1.0 + org.collectionspace.services.dimension + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.dimension.jaxb - 1.0 services.dimension.jaxb @@ -32,6 +31,7 @@ 0.4.1.4 + collectionspace-services-dimension-jaxb install diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index 73a938a0d..8c1be2250 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -1,18 +1,18 @@ + org.collectionspace.services.main org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.dimension - pom services.dimension - + pom jaxb diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index 97ce3ddb2..91fa78260 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -2,30 +2,30 @@ - org.collectionspace.services.dimension org.collectionspace.services - 1.0 + org.collectionspace.services.dimension + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.dimension.service - jar - 1.0 services.dimension.service + jar + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.dimension.jaxb - 1.0 + ${project.version} - + junit junit @@ -38,17 +38,14 @@ 5.6 - - javax.security jaas 1.0.01 provided - dom4j dom4j @@ -81,11 +78,10 @@ - + org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.version.1.5} jboss-remoting @@ -94,6 +90,7 @@ + org.restlet org.restlet diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index 3c0ba46be..ba67c97b6 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -1,5 +1,4 @@ - @@ -27,12 +25,13 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng @@ -61,7 +60,7 @@ 1.0.2.GA - + cspace-services-id-client diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index 110a83c6b..12932d9db 100644 --- 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"> - org.collectionspace.services.id org.collectionspace.services - 1.0 + org.collectionspace.services.id + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.id.jaxb - 1.0 services.id.jaxb - - + com.sun.xml.bind jaxb-impl diff --git a/services/id/pom.xml b/services/id/pom.xml index 997f5e9c3..103f1b1ce 100644 --- 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"> - - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.id - - pom services.id - + pom @@ -45,7 +41,6 @@ - org.apache.maven.plugins diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index 8efbe4eb0..f80e6c5ce 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -24,14 +24,13 @@ org.collectionspace.services.id org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.id.service jar - 1.0 services.id.service @@ -40,7 +39,7 @@ org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml index 31cebfcab..a9b2e6bf7 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index fdef1d2fc..529a0553c 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -1,19 +1,38 @@ + org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.intake.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.intake.3rdparty.nuxeo - jar services.intake.3rdparty.nuxeo + jar - Intake Nuxeo Document Type + Intake Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml index cb30c2e39..417e1097d 100644 --- a/services/intake/3rdparty/pom.xml +++ b/services/intake/3rdparty/pom.xml @@ -5,16 +5,17 @@ org.collectionspace.services.intake org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.intake.3rdparty - pom services.intake.3rdparty + pom + - 3rd party build for intake service + 3rd party build for intake service diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index 866d4a5d9..e54ea185f 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.intake org.collectionspace.services - 1.0 + org.collectionspace.services.intake + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.intake.client - ${cspace.services.client.version} services.intake.client @@ -27,22 +25,23 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.intake.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.person.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index 8dce3b89c..4171a00a1 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services.intake org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.intake.jaxb - 1.0 services.intake.jaxb @@ -32,6 +30,7 @@ 0.4.1.4 + collectionspace-services-intake-jaxb install diff --git a/services/intake/pom.xml b/services/intake/pom.xml index 80fbea3b8..9c9cd2ed9 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -2,17 +2,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.intake - pom services.intake - + pom jaxb @@ -48,7 +47,6 @@ true - diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index 71c1a1752..042909d27 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -2,35 +2,34 @@ - org.collectionspace.services.intake org.collectionspace.services - 1.0 + org.collectionspace.services.intake + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.intake.service - jar - 1.0 services.intake.service + jar org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services - org.collectionspace.services.collectionobject.jaxb - 1.0 + org.collectionspace.services.intake.jaxb + ${project.version} org.collectionspace.services - org.collectionspace.services.intake.jaxb - 1.0 + org.collectionspace.services.collectionobject.jaxb + ${project.version} - + junit junit @@ -43,10 +42,8 @@ 5.6 - - javax.security jaas @@ -90,7 +87,6 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.version.1.5} jboss-remoting @@ -114,7 +110,6 @@ com.noelios.restlet 1.0.7 - diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml index 4911978cd..0d659f651 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index 20f4a3b3f..3fdb0afc8 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.organization.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.organization.3rdparty.nuxeo - jar services.organization.3rdparty.nuxeo + jar - Organization Nuxeo Document Type + Organization Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml index d790b56f8..3ade652d6 100644 --- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.organization org.collectionspace.services - 1.0 + org.collectionspace.services.organization + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.organization.3rdparty - pom services.organization.3rdparty + pom 3rd party build for organization service diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index 36c12f4f9..ad452dc43 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.organization org.collectionspace.services - 1.0 + org.collectionspace.services.organization + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.organization.client - ${cspace.services.client.version} services.organization.client @@ -27,21 +25,23 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.organization.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.contact.client - ${cspace.services.client.version} + ${project.version} + org.testng testng diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml index a45fd5851..1827e4a9d 100644 --- a/services/organization/import/pom.xml +++ b/services/organization/import/pom.xml @@ -2,37 +2,45 @@ - org.collectionspace.services org.collectionspace.services.organization - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.organization.importer - 1.0 services.organization.importer + + org.slf4j + slf4j-api + 1.5.2 + + + org.collectionspace.services org.collectionspace.services.organization.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.organization.client - ${cspace.services.client.version} + ${project.version} - - - org.slf4j - slf4j-api - 1.5.2 - - org.jboss.resteasy resteasy-jaxrs diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index 22259af53..4987cd59b 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services.organization org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.organization.jaxb - 1.0 services.organization.jaxb diff --git a/services/organization/pom.xml b/services/organization/pom.xml index dad8a7e72..42b1a3c57 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.organization - pom services.organization + pom jaxb diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 38517d118..35c5c6418 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -1,43 +1,43 @@ - - org.collectionspace.services.organization org.collectionspace.services - 1.0 + org.collectionspace.services.organization + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.organization.service - jar - 1.0 services.organization.service + jar + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.organization.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.contact.service - 1.0 - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 + ${project.version} + junit junit diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml index 18f854606..518f463fc 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index 21d3cd73a..a42b62e64 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.person.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.person.3rdparty.nuxeo - jar services.person.3rdparty.nuxeo + jar - Person Nuxeo Document Type + Person Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml index 328c6de55..08c37777b 100644 --- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.person org.collectionspace.services - 1.0 + org.collectionspace.services.person + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.person.3rdparty - pom services.person.3rdparty + pom - 3rd party build for person service + 3rd party build for person service diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index c7a937ab3..e12fe3816 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -2,17 +2,15 @@ - - org.collectionspace.services.person org.collectionspace.services - 1.0 + org.collectionspace.services.person + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.person.client - ${cspace.services.client.version} services.person.client @@ -27,21 +25,23 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.person.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.contact.client - ${cspace.services.client.version} + ${project.version} + org.testng testng diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml index 9634f3934..f60723624 100644 --- a/services/person/import/pom.xml +++ b/services/person/import/pom.xml @@ -2,37 +2,45 @@ - org.collectionspace.services org.collectionspace.services.person - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.person.importer - 1.0 services.person.importer + + org.slf4j + slf4j-api + 1.5.2 + + + org.collectionspace.services org.collectionspace.services.person.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.person.client - ${cspace.services.client.version} - - + ${project.version} + - - org.slf4j - slf4j-api - 1.5.2 - - org.jboss.resteasy resteasy-jaxrs diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index 2616fc9ed..6b29d7b96 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services.person org.collectionspace.services - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.person.jaxb - 1.0 services.person.jaxb diff --git a/services/person/pom.xml b/services/person/pom.xml index bc16f227d..6bb4f76db 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.person - pom services.person + pom jaxb diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index cc51f0dbd..e356df971 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -1,43 +1,43 @@ - - org.collectionspace.services.person org.collectionspace.services - 1.0 + org.collectionspace.services.person + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.person.service - jar - 1.0 services.person.service - + jar + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.person.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.contact.service - 1.0 - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 + ${project.version} + junit junit diff --git a/services/pom.xml b/services/pom.xml index 2c270c449..cba498b3c 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,16 +1,16 @@ - org.collectionspace.services org.collectionspace.services - 1.0 + org.collectionspace.services + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.main - pom services.main + pom authentication @@ -18,7 +18,7 @@ client account relation - + acquisition vocabulary organization @@ -72,6 +72,7 @@ 1.5 + org.apache.maven.plugins maven-site-plugin @@ -79,6 +80,7 @@ /usr/bin/unzip -o > err.txt + org.apache.maven.plugins maven-war-plugin @@ -88,12 +90,17 @@ true - + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + org.apache.maven.plugins maven-dependency-plugin @@ -109,8 +116,6 @@ - - @@ -256,7 +261,6 @@ mysql mysql-connector-java 5.1.5 - test diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml index e0553420a..8df95b279 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index 86768f6eb..a4f500a92 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -1,19 +1,36 @@ - - - org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 - - - 4.0.0 + org.collectionspace.services - 1.0 - org.collectionspace.services.relation.3rdparty.nuxeo - jar - services.relation.3rdparty.nuxeo - CollectionSpace relation Nuxeo document type. + org.collectionspace.services.relation.3rdparty + 0.6-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.relation.3rdparty.nuxeo + services.relation.3rdparty.nuxeo + jar + + CollectionSpace relation Nuxeo document type. + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml index 5ec58caec..bacfaae35 100644 --- a/services/relation/3rdparty/pom.xml +++ b/services/relation/3rdparty/pom.xml @@ -5,16 +5,16 @@ org.collectionspace.services.relation org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.relation.3rdparty - pom services.relation.3rdparty + pom - 3rd party build for relation service + 3rd party build for relation service diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index b984bb0a4..34bca716a 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -2,21 +2,19 @@ - - org.collectionspace.services.relation org.collectionspace.services - 1.0 + org.collectionspace.services.relation + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.relation.client - ${cspace.services.client.version} services.relation.client - + - + org.slf4j slf4j-api @@ -27,7 +25,7 @@ slf4j-log4j12 test - org.testng testng @@ -78,7 +74,7 @@ 3.1 - + cspace-services-relation-client diff --git a/services/relation/pom.xml b/services/relation/pom.xml index 29e583cbe..77dd2fc39 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -1,17 +1,16 @@ - org.collectionspace.services.main org.collectionspace.services - 1.0 + org.collectionspace.services.main + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.relation - pom services.relation + pom service diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 147f85cfd..86e47c0fe 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -1,24 +1,22 @@ - - org.collectionspace.services.relation org.collectionspace.services - 1.0 + org.collectionspace.services.relation + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.relation.service - jar - 1.0 services.relation.service + jar org.collectionspace.services org.collectionspace.services.common - 1.0 + ${project.version} @@ -26,27 +25,29 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.authentication.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.account.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.collectionobject.client - ${cspace.services.client.version} + ${project.version} + org.testng testng diff --git a/services/security/pom.xml b/services/security/pom.xml index 662083257..ea60987cc 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -3,14 +3,14 @@ org.collectionspace.services.main org.collectionspace.services - 1.0 + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.security - pom services.security + pom diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml index 00e25fec9..473adccef 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml @@ -10,7 +10,7 @@ - + diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml index 43cbbbc93..79680c10d 100644 --- 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"> org.collectionspace.services - nuxeo-platform-collectionspace - 1.0 + org.collectionspace.services.vocabulary.3rdparty + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.vocabulary.3rdparty.nuxeo - jar services.vocabulary.3rdparty.nuxeo + jar - Vocabulary Nuxeo Document Type + Vocabulary Nuxeo Document Type + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml index dd59afb53..4d81b9372 100644 --- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.collectionspace.services.vocabulary org.collectionspace.services - 1.0 + org.collectionspace.services.vocabulary + 0.6-SNAPSHOT + 4.0.0 org.collectionspace.services - 1.0 org.collectionspace.services.vocabulary.3rdparty - pom services.vocabulary.3rdparty + pom - 3rd party build for vocabulary service + 3rd party build for vocabulary service diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 38f004fce..790864d6d 100644 --- 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"> - org.collectionspace.services.vocabulary org.collectionspace.services - 1.0 + org.collectionspace.services.vocabulary + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.vocabulary.client - ${cspace.services.client.version} services.vocabulary.client @@ -27,17 +26,18 @@ slf4j-log4j12 test + org.collectionspace.services org.collectionspace.services.vocabulary.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} - + org.testng testng diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml index 3f4ac7202..c49afeb62 100644 --- a/services/vocabulary/import/pom.xml +++ b/services/vocabulary/import/pom.xml @@ -2,17 +2,15 @@ - org.collectionspace.services org.collectionspace.services.vocabulary - 1.0 + 0.6-SNAPSHOT 4.0.0 org.collectionspace.services org.collectionspace.services.vocabulary.importer - 1.0 services.vocabulary.importer @@ -25,22 +23,22 @@ org.slf4j slf4j-log4j12 + org.collectionspace.services org.collectionspace.services.vocabulary.jaxb - 1.0 + ${project.version} org.collectionspace.services org.collectionspace.services.client - ${cspace.services.client.version} + ${project.version} org.collectionspace.services org.collectionspace.services.vocabulary.client - ${cspace.services.client.version} + ${project.version} - + + org.collectionspace.services + org.collectionspace.services.common + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.vocabulary.jaxb + ${project.version} + + junit junit -- 2.47.3