From: Richard Millet Date: Fri, 13 May 2011 23:56:40 +0000 (+0000) Subject: CSPACE-3451: Prototypical tenant model is now supported. The tenant specific binding... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4b1a8428c40d609a58c1ca18e2a4aece71499e61;p=tmp%2Fjakarta-migration.git CSPACE-3451: Prototypical tenant model is now supported. The tenant specific binding files are now deltas only. Also, updating Maven repo version for artifacts to v1.8 snapshot. --- diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml index 0b8ecf35b..b443b76e4 100644 --- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml index 630fbe839..5e82ce4d8 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote-api/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml index e952e42ce..5d3b734cf 100644 --- a/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-quote/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.3rdparty.nuxeo - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml index cfbc4b5d7..47ccbeb5b 100644 --- a/3rdparty/nuxeo/pom.xml +++ b/3rdparty/nuxeo/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml index eac607bc2..a4e46b3d9 100644 --- a/3rdparty/pom.xml +++ b/3rdparty/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/HelloWorld/HelloWorldNuxeoService/pom.xml b/HelloWorld/HelloWorldNuxeoService/pom.xml index 0eea24796..b22324ed7 100644 --- a/HelloWorld/HelloWorldNuxeoService/pom.xml +++ b/HelloWorld/HelloWorldNuxeoService/pom.xml @@ -102,7 +102,7 @@ 1.5.1 0.9.7 5.2-SNAPSHOT - 1.7-SNAPSHOT + 1.8-SNAPSHOT diff --git a/build.properties b/build.properties index 897429c9f..771622016 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ host=127.0.0.1 #cspace -cspace.release=1.7-SNAPSHOT +cspace.release=1.8-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 66b18c144..fc4c1bf10 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.collectionspace.services org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT pom services @@ -16,8 +16,8 @@ UTF-8 5.3.2 1.6.2 - 1.7-SNAPSHOT - 1.7-SNAPSHOT + 1.8-SNAPSHOT + 1.8-SNAPSHOT @@ -164,7 +164,21 @@ never ---> +--> + + + + false + + + true + + el4jReleaseRepositoryExternal + External release repository of the EL4J project + http://public-el4.elca-services.ch/el4j/maven2repository + + + diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index b3206af9e..8f9044875 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 107906e63..ac7d4e244 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 @@ -75,6 +75,12 @@ org.collectionspace.services org.collectionspace.services.authorization-mgt.service ${project.version} + + + org.collectionspace.services + org.collectionspace.services.authorization-mgt.import + + org.collectionspace.services @@ -199,7 +205,6 @@ commons-io commons-io - 1.4 org.jboss.resteasy diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 84c7dee0a..afc242eb8 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index 324f6c933..458162e5f 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.account - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index dbb71496a..f55da8e69 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.account - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/account/pom.xml b/services/account/pom.xml index 420eab486..269f5fbc3 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index d6ed11093..d3707f35d 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.account org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index fbde85700..2e4f77509 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.account org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml index f95eff6f7..e5f0223fc 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.acquisition.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml index 9abcdd263..0f1e02a54 100644 --- a/services/acquisition/3rdparty/pom.xml +++ b/services/acquisition/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.acquisition - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index de4151bac..dff291905 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.acquisition - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index 12146a86d..a9d541c8a 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.acquisition org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index ad567a09c..c9f3db54a 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index 9c6cd81d9..022fdb046 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.acquisition org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 3be2f3868..7a9d6c53b 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index ce800422b..2cedc95f2 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index 128447f86..4078dd9a8 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml index 34e2b273e..9a1ff8a58 100644 --- a/services/authentication/pstore/pom.xml +++ b/services/authentication/pstore/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index dc34400e6..706663598 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.authentication - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 6c46438fc..e50ee41ef 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index ff5746086..a7ea28dae 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.authorization-mgt - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml index 8ede7dc93..4c63ff957 100644 --- a/services/authorization-mgt/import/pom.xml +++ b/services/authorization-mgt/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.authorization-mgt - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 @@ -122,6 +122,11 @@ mysql mysql-connector-java + + ch.elca.el4j.modules + module-xml_merge-common + 3.1 + diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml index a3f1b18c0..9998c2bd7 100644 --- a/services/authorization-mgt/pom.xml +++ b/services/authorization-mgt/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 0e510f931..5b1ce87ba 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization-mgt org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization-mgt.service diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index 4c9a05e93..40f62ea2d 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml index 999be803a..6dbb20a65 100644 --- a/services/authorization/pom.xml +++ b/services/authorization/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml index 1f20d2c13..d63b73452 100644 --- a/services/authorization/pstore/pom.xml +++ b/services/authorization/pstore/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index fd0cdfc08..0d51c7db4 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services.authorization org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.authorization.service diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml index 5d07d8974..7a87b6d66 100644 --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.blob.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/services/blob/3rdparty/pom.xml b/services/blob/3rdparty/pom.xml index df1979244..a15914ccf 100644 --- a/services/blob/3rdparty/pom.xml +++ b/services/blob/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.blob org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/blob/client/pom.xml b/services/blob/client/pom.xml index 09770c57d..fe3242fa9 100644 --- a/services/blob/client/pom.xml +++ b/services/blob/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.blob - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml index f819a3595..f66eeec9a 100644 --- a/services/blob/jaxb/pom.xml +++ b/services/blob/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.blob org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/blob/pom.xml b/services/blob/pom.xml index 34f22c78a..2b1403b37 100644 --- a/services/blob/pom.xml +++ b/services/blob/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/services/blob/service/pom.xml b/services/blob/service/pom.xml index 696701871..b6b20755a 100644 --- a/services/blob/service/pom.xml +++ b/services/blob/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.blob - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/client/pom.xml b/services/client/pom.xml index 05da61124..b6e545a6d 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml index 5c141be75..55321ff67 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml index 0e147f9f6..4c2f2e227 100644 --- a/services/collectionobject/3rdparty/pom.xml +++ b/services/collectionobject/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml index 49c8afe65..03715dc5f 100644 --- a/services/collectionobject/client/pom.xml +++ b/services/collectionobject/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml index ed49d5704..1f9bbb052 100644 --- a/services/collectionobject/jaxb/pom.xml +++ b/services/collectionobject/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml index 462b0a5d9..a00e4870c 100644 --- a/services/collectionobject/pom.xml +++ b/services/collectionobject/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/collectionobject/sample/pom.xml b/services/collectionobject/sample/pom.xml index 8fb1ae1e3..b3c5e4168 100644 --- a/services/collectionobject/sample/pom.xml +++ b/services/collectionobject/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject.client.samples pom - 1.7-SNAPSHOT + 1.8-SNAPSHOT collectionobject.client.samples diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml index 11aae6b9c..841c2ef2f 100644 --- a/services/collectionobject/sample/sample/pom.xml +++ b/services/collectionobject/sample/sample/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.collectionobject.client.sample jar collectionobject.client.sample - 1.7-SNAPSHOT + 1.8-SNAPSHOT diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml index ca21339f8..ec561ea88 100644 --- a/services/collectionobject/service/pom.xml +++ b/services/collectionobject/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.collectionobject - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml index 2b6bc73ce..5b010d918 100755 --- a/services/common-api/pom.xml +++ b/services/common-api/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 @@ -30,7 +30,6 @@ 5.6 provided - diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java index dc74370ce..d1622ef16 100755 --- a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java +++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java @@ -33,7 +33,6 @@ import java.util.UUID; import java.util.regex.Pattern; import java.util.regex.Matcher; - /** * @author Laramie Crocker * $LastChangedRevision: $ @@ -119,6 +118,4 @@ public class FileTools { File result = new File(tmpDir, filePrefix + UUID.randomUUID().toString()); return result; } - - } diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml index 60568704d..c3a27c3c2 100644 --- a/services/common-test/pom.xml +++ b/services/common-test/pom.xml @@ -4,11 +4,11 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.common-test - 1.7-SNAPSHOT + 1.8-SNAPSHOT services.common-test http://maven.apache.org jar diff --git a/services/common/build.xml b/services/common/build.xml index 98652e708..110f040af 100644 --- a/services/common/build.xml +++ b/services/common/build.xml @@ -145,6 +145,14 @@ + + + + + + + @@ -161,6 +169,7 @@ + diff --git a/services/common/lib/xmlmerge/jdom-1.0.jar b/services/common/lib/xmlmerge/jdom-1.0.jar new file mode 100644 index 000000000..288e64cb5 Binary files /dev/null and b/services/common/lib/xmlmerge/jdom-1.0.jar differ diff --git a/services/common/lib/xmlmerge/module-xml_merge-common-3.1.jar b/services/common/lib/xmlmerge/module-xml_merge-common-3.1.jar new file mode 100644 index 000000000..9b1dd5f0e Binary files /dev/null and b/services/common/lib/xmlmerge/module-xml_merge-common-3.1.jar differ diff --git a/services/common/pom.xml b/services/common/pom.xml index dadca0856..34a1d5bcf 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 @@ -288,9 +288,32 @@ commons-fileupload 1.2 - + + ch.elca.el4j.modules + module-xml_merge-common + 3.1 + provided + + + commons-io + commons-io + + + + + false + + + true + + el4jReleaseRepositoryExternal + External release repository of the EL4J project + http://public-el4.elca-services.ch/el4j/maven2repository + + + collectionspace-services-common install diff --git a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml new file mode 100644 index 000000000..85912496a --- /dev/null +++ b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml new file mode 100644 index 000000000..6e49aff2c --- /dev/null +++ b/services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml new file mode 100644 index 000000000..7d565eff4 --- /dev/null +++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml @@ -0,0 +1,1626 @@ + + + + + + + + + datePattern + MM/dd/yyyy + + + datePattern + MMM dd, yyyy + + + datePattern + dd.MM.yyyy + + + + localeLanguage + en + + + + + + + + + + + + + + + + + /collectionobjects/*/workflow/ + + + default-domain + org.collectionspace.services.collectionobject.nuxeo.CollectionObjectDocumentModelHandler + org.collectionspace.services.collectionobject.nuxeo.CollectionObjectValidatorHandler + + org.collectionspace.services.common.init.ModifyFieldDatatypes + + + nuxeo.collectionobjects_common_briefdescriptions + item + LARGETEXT + + + + nuxeo.collectionobjects_common_comments + item + LARGETEXT + + + + nuxeo.collectionobjects_common_objectproductionreasons + item + LARGETEXT + + + + nuxeo.collectionobjects_common_ownersreferences + item + LARGETEXT + + + + nuxeo.collectionobjects_common_viewersreferences + item + LARGETEXT + + + + + + + objectNameProperty + objectName + + + objectNumberProperty + objectNumber + + + + + + + + + + + + + + + authRef + contentOrganizations|contentOrganization + + + authRef + contentPersons|contentPerson + + + authRef + assocEventOrganizations|assocEventOrganization + + + authRef + assocEventPersons|assocEventPerson + + + authRef + owners|owner + + + authRef + fieldCollectionSources|fieldCollectionSource + + + authRef + fieldCollectors|fieldCollector + + + + + + + + + + + + + + + + + + + + + + /blobs/*/workflow/ + default-domain + org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler + + blobs + blobs + name|mimeType|encoding|length|uri|csid + + + getBlobListItem + + + name + name + + + mimeType + mimeType + + + encoding + encoding + + + length + length + + + + + org.collectionspace.services.blob.nuxeo.BlobValidatorHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /intakes/*/workflow/ + + + default-domain + org.collectionspace.services.intake.nuxeo.IntakeDocumentModelHandler + org.collectionspace.services.intake.nuxeo.IntakeValidatorHandler + + + + objectNumberProperty + entryNumber + + + + + + + + + + + + authRef + currentOwner + + + authRef + depositor + + + authRef + fieldCollectionSources|fieldCollectionSource + + + authRef + fieldCollectors|fieldCollector + + + authRef + valuer + + + authRef + insurers|insurer + + + authRef + conditionCheckersOrAssessors|conditionCheckerOrAssessor + + + + + + + + + + + + + + + + + + + /loansin/*/workflow/ + + + default-domain + org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler + + org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler + + loansin + loansin + loanInNumber|lenderList|loanReturnDate|uri|csid + + + getLoaninListItem + + + loanInNumber + loanInNumber + + + lender + lenderGroupList/[0]/lender + + + loanReturnDate + loanReturnDate + + + + + org.collectionspace.services.loanin.nuxeo.LoaninValidatorHandler + + org.collectionspace.services.common.init.InitHandler + + + mytable + mycol + mytpe + myparam, myparamB + + + mytable2 + mycol2 + mytpe2 + myparam, myparam2B + + + my key + my value + + + my key 2 + my value 2 + + + + + + datePattern + MMM dd, yyyy + + + datePattern + dd.MM.yyyy + + + + localeLanguage + en + + + + + + + objectNumberProperty + loanInNumber + + + + + + + + + + + + + + + + authRef + loanInContact + + + authRef + borrowersAuthorizer + + + + + + + + + + + + + + + + + /loansout/*/workflow/ + + + default-domain + org.collectionspace.services.loanout.nuxeo.LoanoutDocumentModelHandler + org.collectionspace.services.loanout.nuxeo.LoanoutValidatorHandler + + + + + + + + + + authRef + borrower + + + authRef + borrowersContact + + + authRef + lendersAuthorizer + + + authRef + lendersContact + + + + + + + + + + + + + + + + + /objectexit/*/workflow/ + default-domain + org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler + + objectexit + objectexit + exitNumber|currentOwner|uri|csid + org.collectionspace.services.objectexit.ObjectexitCommonList + org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem + getObjectexitListItem + + + exitNumber + exitNumber + setExitNumber + + + currentOwner + currentOwner + setCurrentOwner + + + + + org.collectionspace.services.objectexit.nuxeo.ObjectExitValidatorHandler + + + objectNameProperty + currentOwner + + + objectNumberProperty + exitNumber + + + + + + + + + + + + authRef + currentOwner + + + authRef + depositor + + + + + + + + + + + + + + + + + /groups/*/workflow/ + default-domain + org.collectionspace.services.group.nuxeo.GroupDocumentModelHandler + + org.collectionspace.services.group.nuxeo.GroupDocumentModelHandler + + groups + groups + title|uri|csid + + + getGroupListItem + + + title + title + + + + + org.collectionspace.services.group.nuxeo.GroupValidatorHandler + + + objectNameProperty + title + + + + + + + + + + + + authRef + owner + + + + + + + + + + + + + + + + + /imports/*/workflow/ + default-domain + org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler + + org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler + + imports + imports + importsField|uri|csid + org.collectionspace.services.imports.ImportsCommonList + org.collectionspace.services.imports.ImportsCommonList$ImportsListItem + getImportsListItem + + + importsField + importsField + setImportsField + + + + + + + + + + + + + + + + + + + + + + + + + + /media/*/workflow/ + default-domain + org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler + + media + media + title|source|filename|identificationNumber|blobCsid|uri|csid + + + getMediaListItem + + + title + title + + + source + source + + + filename + filename + + + identificationNumber + identificationNumber + + + blobCsid + blobCsid + + + + + org.collectionspace.services.media.nuxeo.MediaValidatorHandler + + + + + + + + + + authRef + contributor + + + authRef + coverage + + + authRef + creator + + + authRef + publisher + + + authRef + rightsHolder + + + authRef + subjectList|subject + + + + + + + + + + + + + + + + + /movements/*/workflow/ + + + default-domain + org.collectionspace.services.movement.nuxeo.MovementDocumentModelHandler + org.collectionspace.services.movement.nuxeo.MovementValidatorHandler + + + + + + + + + + authRef + movementContact + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.common.workflow.service.nuxeo.WorkflowDocumentModelHandler + org.collectionspace.services.workflow.nuxeo.WorkflowValidatorHandler + + + + + + + + + + + + + + + + + /reports/*/workflow/ + + + default-domain + org.collectionspace.services.report.nuxeo.ReportDocumentModelHandler + org.collectionspace.services.report.nuxeo.ReportValidatorHandler + + + + + + + + + + + + + + + + + + + + + + /vocabularies/*/workflow/ + /vocabularies/*/items/*/workflow/ + + default-domain + org.collectionspace.services.vocabulary.nuxeo.VocabularyDocumentModelHandler + org.collectionspace.services.vocabulary.nuxeo.VocabularyValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.vocabularies_common + displayname + + + nuxeo.vocabularies_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + /vocabularyitems/*/workflow/ + + + default-domain + org.collectionspace.services.vocabulary.nuxeo.VocabularyItemDocumentModelHandler + org.collectionspace.services.vocabulary.nuxeo.VocabularyItemValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.vocabularyitems_common + inauthority + + + nuxeo.vocabularyitems_common + displayname + + + nuxeo.vocabularyitems_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + /orgauthorities/*/workflow/ + /orgauthorities/*/items/*/workflow/ + + + default-domain + org.collectionspace.services.organization.nuxeo.OrgAuthorityDocumentModelHandler + org.collectionspace.services.organization.nuxeo.OrgAuthorityValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.orgauthorities_common + displayname + + + nuxeo.orgauthorities_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.organization.nuxeo.OrganizationDocumentModelHandler + org.collectionspace.services.organization.nuxeo.OrganizationValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.organizations_common + inauthority + + + nuxeo.organizations_common + displayname + + + nuxeo.organizations_common + shortidentifier + + + + + + + + + + + + + authRef + contactNames|contactName + + + authRef + subBodies|subBody + + + + + + + + + + + + + + + + + /personauthorities/*/workflow/ + /personauthorities/*/items/*/workflow/ + + + default-domain + org.collectionspace.services.person.nuxeo.PersonAuthorityDocumentModelHandler + org.collectionspace.services.person.nuxeo.PersonAuthorityValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.personauthorities_common + displayname + + + nuxeo.personauthorities_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.person.nuxeo.PersonDocumentModelHandler + org.collectionspace.services.person.nuxeo.PersonValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.persons_common + inauthority + + + nuxeo.persons_common + displayname + + + nuxeo.persons_common + shortidentifier + + + + + + objectNameProperty + displayName + + + + objectNumberProperty + shortIdentifier + + + + + + + + + + + + + + + + + + + + + + + + /locationauthorities/*/workflow/ + /locationauthorities/*/items/*/workflow/ + + + default-domain + org.collectionspace.services.location.nuxeo.LocationAuthorityDocumentModelHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.locationauthorities_common + displayname + + + nuxeo.locationauthorities_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.location.nuxeo.LocationDocumentModelHandler + org.collectionspace.services.location.nuxeo.LocationValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.locations_common + inauthority + + + nuxeo.locations_common + displayname + + + nuxeo.locations_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + /taxonomyauthorities/*/workflow/ + /taxonomyauthorities/*/taxon/*/workflow/ + + + default-domain + org.collectionspace.services.taxonomy.nuxeo.TaxonomyAuthorityDocumentModelHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.taxonomyauthority_common + displayname + + + nuxeo.taxonomyauthority_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.taxonomy.nuxeo.TaxonDocumentModelHandler + org.collectionspace.services.taxonomy.nuxeo.TaxonValidatorHandler + + org.collectionspace.services.common.init.AddIndices + + + nuxeo.taxon_common + inauthority + + + nuxeo.taxon_common + displayname + + + nuxeo.taxon_common + shortidentifier + + + + + + + + + + + + + + + + + + + + + + + + + /acquisitions/*/workflow/ + + + default-domain + org.collectionspace.services.acquisition.nuxeo.AcquisitionDocumentModelHandler + + org.collectionspace.services.loanin.nuxeo.AcquisitionDocumentModelHandler + + acquisition + acquisition + acquisitionReferenceNumber|acquisitionSources|owners|uri|csid + + + getAcquisitionListItem + + + acquisitionReferenceNumber + acquisitionReferenceNumber + + + acquisitionSource + acquisitionSources/[0] + + + owner + owners/[0] + + + + + org.collectionspace.services.acquisition.nuxeo.AcquisitionValidatorHandler + + + + objectNumberProperty + acquisitionReferenceNumber + + + + + + + + + + + + authRef + acquisitionAuthorizer + + + authRef + owners|owner + + + authRef + acquisitionSources|acquisitionSource + + + + + + + + + + + + + + + + + + + /relations/*/workflow/ + + ' + default-domain + org.collectionspace.services.relation.nuxeo.RelationDocumentModelHandler + org.collectionspace.services.relation.nuxeo.RelationValidatorHandler + + + objectNameProperty + documentId1 + + + objectNumberProperty + predicateDisplayName + + + + + + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.account.storage.AccountDocumentHandler + org.collectionspace.services.account.storage.AccountValidatorHandler + + + + + + + + + + + + + + + + + + + + + + + /dimensions/*/workflow/ + default-domain + org.collectionspace.services.dimension.nuxeo.DimensionDocumentModelHandler + + + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.contact.nuxeo.ContactDocumentModelHandler + + + + + + + + + + + + + + + + + + + + + + default-domain + org.collectionspace.services.note.nuxeo.NoteDocumentModelHandler + + + + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.authorization.storage.RoleDocumentHandler + org.collectionspace.services.authorization.storage.RoleValidatorHandler + + + + + + + + + + + + + + + + + + org.collectionspace.services.authorization.storage.PermissionDocumentHandler + org.collectionspace.services.authorization.storage.PermissionValidatorHandler + + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.account.storage.AccountRoleDocumentHandler + + + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler + + + + + + + + + + + + + + + + + + + + + + org.collectionspace.services.account.storage.AccountRoleDocumentHandler + + + + + + + + + + + + + + + + + + diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java b/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java index c76f04875..54269fdd7 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java @@ -24,7 +24,10 @@ package org.collectionspace.services.common.config; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -107,29 +110,34 @@ public abstract class AbstractConfigReaderImpl return getFileChildren(rootDir, true); } + protected Object parse(File configFile, Class clazz) throws FileNotFoundException, JAXBException { + Object result = null; + + InputStream inputStream = new FileInputStream(configFile); + result = parse(inputStream, clazz); + if (logger.isDebugEnabled()) { + logger.debug("read() read file " + configFile.getAbsolutePath()); + } + + return result; + } + /** * parse parses given configuration file from the disk based on given class * definition * @param configFile * @param clazz * @return A JAXB object + * @throws JAXBException * @throws Exception */ - protected Object parse(File configFile, Class clazz) { + protected Object parse(InputStream configFileStream, Class clazz) throws JAXBException { Object result = null; - try { + JAXBContext jc = JAXBContext.newInstance(clazz); Unmarshaller um = jc.createUnmarshaller(); - result = um.unmarshal(configFile); - if (logger.isDebugEnabled()) { - logger.debug("read() read file " + configFile.getAbsolutePath()); - } - } catch (JAXBException e) { - if (logger.isErrorEnabled() == true) { - logger.error("Could not unmarshal CollectionSpace config file: " + - configFile.getAbsolutePath(), e); - } - } + result = um.unmarshal(configFileStream); + return result; } diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java index 7b4b1567b..71c93d2c4 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java @@ -24,20 +24,40 @@ package org.collectionspace.services.common.config; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import org.apache.commons.io.FileUtils; import org.collectionspace.services.common.service.ServiceBindingType; import org.collectionspace.services.common.service.ServiceObjectType; import org.collectionspace.services.common.tenant.RepositoryDomainType; import org.collectionspace.services.common.tenant.TenantBindingType; import org.collectionspace.services.common.tenant.TenantBindingConfig; import org.collectionspace.services.common.types.PropertyItemType; + +import ch.elca.el4j.util.codingsupport.Reject; +import ch.elca.el4j.services.xmlmerge.AbstractXmlMergeException; +import ch.elca.el4j.services.xmlmerge.ConfigurationException; +import ch.elca.el4j.services.xmlmerge.Configurer; +import ch.elca.el4j.services.xmlmerge.XmlMerge; +import ch.elca.el4j.services.xmlmerge.config.AttributeMergeConfigurer; +import ch.elca.el4j.services.xmlmerge.config.ConfigurableXmlMerge; +import ch.elca.el4j.services.xmlmerge.config.PropertyXPathConfigurer; +import ch.elca.el4j.services.xmlmerge.merge.DefaultXmlMerge; + +import org.apache.commons.io.FileUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ch.elca.el4j.services.xmlmerge.Configurer; +import ch.elca.el4j.services.xmlmerge.config.AttributeMergeConfigurer; +import ch.elca.el4j.services.xmlmerge.config.ConfigurableXmlMerge; + /** * ServicesConfigReader reads service layer specific configuration * @@ -47,8 +67,11 @@ import org.slf4j.LoggerFactory; public class TenantBindingConfigReaderImpl extends AbstractConfigReaderImpl> { final private static String TENANT_BINDINGS_ERROR = "Tenant bindings error: "; - final private static String TENANT_BINDINGS_FILENAME = "tenant-bindings.xml"; final private static String TENANT_BINDINGS_ROOTDIRNAME = "tenants"; + final private static String TENANT_BINDINGS_FILENAME_PREFIX = "tenant-bindings"; + final private static String TENANT_BINDINGS_PROTOTYPE_FILENAME = TENANT_BINDINGS_FILENAME_PREFIX + "-proto.xml"; + final private static String TENANT_BINDINGS_DELTA_FILENAME = TENANT_BINDINGS_FILENAME_PREFIX + ".delta.xml"; + final private static String MERGED_SUFFIX = ".merged.xml"; final Logger logger = LoggerFactory.getLogger(TenantBindingConfigReaderImpl.class); private List tenantBindingTypeList; @@ -73,7 +96,7 @@ public class TenantBindingConfigReaderImpl @Override public String getFileName() { - return TENANT_BINDINGS_FILENAME; + return TENANT_BINDINGS_DELTA_FILENAME; } protected File getTenantsRootDir() { @@ -88,7 +111,45 @@ public class TenantBindingConfigReaderImpl } return result; } - + /* + * Take the directory of the prototype bindings and the directory of the delta bindings. Merge the two and create (replace) a file + * named "tenant-bindings.xml" + */ + + private InputStream merge(File srcFile, File deltaFile) throws IOException { + InputStream result = null; + try { + FileInputStream srcStream = new FileInputStream(srcFile); + FileInputStream deltaStream = new FileInputStream(deltaFile); + InputStream[] inputStreamArray = {srcStream, deltaStream}; + + Configurer configurer = new AttributeMergeConfigurer(); + result = new ConfigurableXmlMerge(configurer).merge(inputStreamArray); + } catch (Exception e) { + logger.error("Could not merge tenant configuration delta file: " + + deltaFile.getAbsolutePath(), e); + } + // + // Try to save the merge output to a file that is suffixed with ".merged.xml" in the same directory + // as the delta file. + // + if (result != null) { + File outputDir = deltaFile.getParentFile(); + String mergedFileName = outputDir.getAbsolutePath() + File.separator + + this.TENANT_BINDINGS_FILENAME_PREFIX + MERGED_SUFFIX; + File mergedOutFile = new File(mergedFileName); + try { + FileUtils.copyInputStreamToFile(result, mergedOutFile); + } catch (IOException e) { + logger.warn("Could not create a copy of the merged tenant configuration at: " + + mergedFileName, e); + } + result.reset(); //reset the stream even if the file create failed. + } + + return result; + } + @Override public void read() throws Exception { String tenantsRootPath = getTenantsRootDir().getAbsolutePath(); @@ -102,8 +163,11 @@ public class TenantBindingConfigReaderImpl throw new Exception("Cound not find tenant bindings root directory: " + tenantRootDirPath); } + File protoBindingsFile = new File(tenantRootDirPath + File.separator + + TENANT_BINDINGS_PROTOTYPE_FILENAME); + List tenantDirs = getDirectories(tenantsRootDir); - tenantBindingTypeList = readTenantConfigs(tenantDirs); + tenantBindingTypeList = readTenantConfigs(protoBindingsFile, tenantDirs); for (TenantBindingType tenantBinding : tenantBindingTypeList) { tenantBindings.put(tenantBinding.getId(), tenantBinding); @@ -115,8 +179,49 @@ public class TenantBindingConfigReaderImpl } } } + + /* + * Take the directory of the prototype bindings and the directory of the delta bindings. Merge the two and create (replace) a file + * named "tenant-bindings.xml" + * + private static String merge(String original, String patch) { + InputStream result = null; + try { + Configurer configurer = new AttributeMergeConfigurer(); + + + FileInputStream ins1 = new FileInputStream(".\\src\\main\\resources\\File1.xml"); + FileInputStream ins2 = new FileInputStream(".\\src\\main\\resources\\File2.xml"); + InputStream[] inputStreamArray = {ins1, ins2}; + + result = new ConfigurableXmlMerge(configurer).merge(inputStreamArray); +// result = new ConfigurableXmlMerge(configurer).merge(new String[] {original, patch}); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + File mergedOutFile = new File(".\\target\\merged.xml"); + try { + FileUtils.copyInputStreamToFile(result, mergedOutFile); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } - List readTenantConfigs(List tenantDirList) throws IOException { + return null; + } + */ + + /** + * Merge and read the prototype bindsings with each tenant specific bindings delta to create the final + * tenant bindings. + * + * @param protoBindingsFile - The prototypical bindings file. + * @param tenantDirList - The list of tenant directories containing tenant specific bindings + * @return A list of tenant bindings. + * @throws IOException Signals that an I/O exception has occurred. + */ + List readTenantConfigs(File protoBindingsFile, List tenantDirList) throws IOException { List result = new ArrayList(); // // Iterate through a list of directories. @@ -124,10 +229,16 @@ public class TenantBindingConfigReaderImpl for (File tenantDir : tenantDirList) { boolean found = false; String errMessage = null; - File configFile = new File(tenantDir.getAbsoluteFile() + File.separator + TENANT_BINDINGS_FILENAME); + File configFile = new File(tenantDir.getAbsoluteFile() + File.separator + getFileName()); if (configFile.exists() == true) { - TenantBindingConfig tenantBindingConfig = (TenantBindingConfig) parse( - configFile, TenantBindingConfig.class); + InputStream tenantBindingsStream = this.merge(protoBindingsFile, configFile); + TenantBindingConfig tenantBindingConfig = null; + try { + tenantBindingConfig = (TenantBindingConfig) parse(tenantBindingsStream, + TenantBindingConfig.class); + } catch (Exception e) { + logger.error("Could not parse the merged tenant bindings.", e); + } if (tenantBindingConfig != null) { TenantBindingType binding = tenantBindingConfig.getTenantBinding(); if (binding != null) { diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml index 3a3edbf25..dcca450c3 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.contact.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml index b2dc4426b..53f4a2d57 100644 --- a/services/contact/3rdparty/pom.xml +++ b/services/contact/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.contact - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index e06a8e0c1..24060f26b 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.contact org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index 8bc08715f..2f55cf7ab 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.contact - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/contact/pom.xml b/services/contact/pom.xml index cd8ae37ff..1af896c2c 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index 199a82945..02a611d56 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.contact org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml index 6a88b3a6d..e00dadd72 100644 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.dimension.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml index 4abd8ce18..dd2ff73d5 100644 --- a/services/dimension/3rdparty/pom.xml +++ b/services/dimension/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index f92ef8ff4..d2374913b 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index b876fa86f..58504f379 100644 --- a/services/dimension/jaxb/pom.xml +++ b/services/dimension/jaxb/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index 3d6f365f6..080485555 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index e9db57d64..30970fe41 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.dimension - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml index 5e8e1e18c..8194530ee 100644 --- a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.group.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml index 459c0ae52..123f78726 100644 --- a/services/group/3rdparty/pom.xml +++ b/services/group/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.group org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml index e3f8d0c05..129f3e50b 100644 --- a/services/group/client/pom.xml +++ b/services/group/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.group - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml index 6bf713b24..4d3227bf9 100644 --- a/services/group/jaxb/pom.xml +++ b/services/group/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.group org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/pom.xml b/services/group/pom.xml index 1791592f7..005b9f326 100644 --- a/services/group/pom.xml +++ b/services/group/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml index acbcc69dc..aa8ef1718 100644 --- a/services/group/service/pom.xml +++ b/services/group/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.group - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 2b3b204ed..74d5e855e 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -26,7 +26,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index b855e330a..7b992e787 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -24,7 +24,7 @@ org.collectionspace.services org.collectionspace.services.id - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml index e2fb3fd7c..496bfb2f5 100644 --- a/services/id/client/pom.xml +++ b/services/id/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.id - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index be370b22c..13a3d5d9f 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -25,7 +25,7 @@ org.collectionspace.services org.collectionspace.services.id - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/id/pom.xml b/services/id/pom.xml index d1b8320bb..c055b15e3 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -23,7 +23,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index d9eb3dc2d..2541ef85b 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -23,7 +23,7 @@ org.collectionspace.services.id org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml index 0d4d4f658..0ac78bb35 100755 --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.imports.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/imports/3rdparty/pom.xml b/services/imports/3rdparty/pom.xml index 6596e45f0..52441135b 100755 --- a/services/imports/3rdparty/pom.xml +++ b/services/imports/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.imports org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index f99c1cb7b..99cd17ddf 100755 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.imports org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/imports/pom.xml b/services/imports/pom.xml index 12c1960c4..55d987e7c 100755 --- a/services/imports/pom.xml +++ b/services/imports/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml index aeeb38c12..89a400a50 100755 --- a/services/imports/service/pom.xml +++ b/services/imports/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.imports - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml index d518977ae..210ab5aa5 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.intake.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml index 139a7efad..1947336c6 100644 --- a/services/intake/3rdparty/pom.xml +++ b/services/intake/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.intake org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index e3f26b53c..dc8e99453 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.intake - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index 0267204d8..d256fde9e 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.intake org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/pom.xml b/services/intake/pom.xml index 84d79fe71..834782b8b 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index fea674c07..969c9a524 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.intake - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml index 889b1a329..97c749452 100644 --- a/services/jaxb/pom.xml +++ b/services/jaxb/pom.xml @@ -26,7 +26,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml index 5330d32fe..820af9d2c 100644 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanin.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml index 407ce1e78..cacca1b21 100644 --- a/services/loanin/3rdparty/pom.xml +++ b/services/loanin/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanin org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index 8979ff109..3fd164406 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanin - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index 5769be1a1..7b1db5550 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanin org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml index 0af2564f7..7e9f7c41b 100644 --- a/services/loanin/pom.xml +++ b/services/loanin/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index 69181ddc5..214ddbef3 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.loanin - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml index b9a13c220..f4695037f 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanout.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml index a45b9e572..ca416a873 100644 --- a/services/loanout/3rdparty/pom.xml +++ b/services/loanout/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanout org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index 8524cbeb4..7294d13c1 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.loanout - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml index 561343f58..ea15770aa 100644 --- a/services/loanout/jaxb/pom.xml +++ b/services/loanout/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.loanout org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml index d842f20e5..10e40c4e7 100644 --- a/services/loanout/pom.xml +++ b/services/loanout/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index dc2ef24c1..aef2dfb40 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.loanout - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml index 51c8fa2d5..eea2b103c 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.location.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml index fc42d371c..10c548b4a 100644 --- a/services/location/3rdparty/pom.xml +++ b/services/location/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index 62917ed19..6c10bc90a 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/import/pom.xml b/services/location/import/pom.xml index 01b5ec85c..caf5c6631 100644 --- a/services/location/import/pom.xml +++ b/services/location/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml index 92d1777ce..64350d834 100644 --- a/services/location/jaxb/pom.xml +++ b/services/location/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.location - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/pom.xml b/services/location/pom.xml index 65bae9b04..d772c1608 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml index 57c4dbccd..8ba3364f7 100644 --- a/services/location/service/pom.xml +++ b/services/location/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.location - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml index f64c9fe08..6c4e7733b 100644 --- a/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml +++ b/services/media/3rdparty/nuxeo-platform-cs-media/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.media.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/3rdparty/pom.xml b/services/media/3rdparty/pom.xml index ff71bf556..7cf1c69b1 100644 --- a/services/media/3rdparty/pom.xml +++ b/services/media/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.media org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/client/pom.xml b/services/media/client/pom.xml index fafa0a8a7..899fe05a0 100644 --- a/services/media/client/pom.xml +++ b/services/media/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.media - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml index 522df3cb1..a468809b2 100644 --- a/services/media/jaxb/pom.xml +++ b/services/media/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.media org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/pom.xml b/services/media/pom.xml index 6bf4d60cb..f59b516f1 100644 --- a/services/media/pom.xml +++ b/services/media/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/media/service/pom.xml b/services/media/service/pom.xml index 723ea17b1..cdcebf38a 100644 --- a/services/media/service/pom.xml +++ b/services/media/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.media - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml index 2052400bf..b9739d6ff 100644 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.movement.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml index ad25e6960..2c52b96cc 100644 --- a/services/movement/3rdparty/pom.xml +++ b/services/movement/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.movement org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml index c3424ec4f..a96a678a0 100644 --- a/services/movement/client/pom.xml +++ b/services/movement/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.movement - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml index ca44e4173..7be1e1a21 100644 --- a/services/movement/jaxb/pom.xml +++ b/services/movement/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.movement org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/pom.xml b/services/movement/pom.xml index 78d357f03..45ede94a5 100644 --- a/services/movement/pom.xml +++ b/services/movement/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml index 7deacaf22..9eabc256c 100644 --- a/services/movement/service/pom.xml +++ b/services/movement/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.movement - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml index 35fe2d674..1f7caccff 100644 --- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.note.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml index 36bd17011..a1e5129bb 100644 --- a/services/note/3rdparty/pom.xml +++ b/services/note/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.note - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml index d0cdfc786..fd1336300 100644 --- a/services/note/client/pom.xml +++ b/services/note/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.note org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml index 9a9ba3d70..42c7b36ff 100644 --- a/services/note/jaxb/pom.xml +++ b/services/note/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.note - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/pom.xml b/services/note/pom.xml index 74f3e8690..f8da2c0c0 100644 --- a/services/note/pom.xml +++ b/services/note/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml index d592ddd51..28cd8292c 100644 --- a/services/note/service/pom.xml +++ b/services/note/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.note org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml index 4b9461923..f84ef877f 100644 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.objectexit.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml index fda8d0ded..a3246a7e2 100644 --- a/services/objectexit/3rdparty/pom.xml +++ b/services/objectexit/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.objectexit org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml index 3d96ed485..6e0026b83 100644 --- a/services/objectexit/client/pom.xml +++ b/services/objectexit/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.objectexit - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml index 96667cb9e..6a3186ac2 100644 --- a/services/objectexit/jaxb/pom.xml +++ b/services/objectexit/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.objectexit org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml index 0b95ad4a8..d4aa2e558 100644 --- a/services/objectexit/pom.xml +++ b/services/objectexit/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml index c5443687a..7c0884732 100644 --- a/services/objectexit/service/pom.xml +++ b/services/objectexit/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.objectexit - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml index c77968e60..4e7c8734d 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml index b20445ad7..6cd3b1767 100644 --- a/services/organization/3rdparty/pom.xml +++ b/services/organization/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.organization - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index 769882957..b14527a01 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.organization - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml index bfaf9d388..e617c0fe1 100644 --- a/services/organization/import/pom.xml +++ b/services/organization/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.organization - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index a2754f96e..23c7f0e4a 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.organization org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/pom.xml b/services/organization/pom.xml index b62796090..8a2ed1db7 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/organization/sample/pom.xml b/services/organization/sample/pom.xml index 25a4210d9..8ccd09349 100644 --- a/services/organization/sample/pom.xml +++ b/services/organization/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.client.samples pom - 1.7-SNAPSHOT + 1.8-SNAPSHOT organization.client.samples diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml index 7abf7c5c1..10c154233 100644 --- a/services/organization/sample/sample/pom.xml +++ b/services/organization/sample/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.organization.client.sample jar - 1.7-SNAPSHOT + 1.8-SNAPSHOT organization.client.sample diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 32cef2c8c..6af03bef0 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.organization - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml index e55f58749..47273c4c5 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.person.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml index b813ce52c..bdd3b3818 100644 --- a/services/person/3rdparty/pom.xml +++ b/services/person/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 19cb73c68..11a05fa4a 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml index 28fbbe104..94084a59e 100644 --- a/services/person/import/pom.xml +++ b/services/person/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index e8b22d6a7..904eba33f 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.person - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/pom.xml b/services/person/pom.xml index af79647ae..08b343077 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml index dea5f6ee8..8a466df15 100644 --- a/services/person/sample/sample/pom.xml +++ b/services/person/sample/sample/pom.xml @@ -11,17 +11,17 @@ org.collectionspace.services org.collectionspace.services.person.jaxb - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.client - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.person.client - 1.7-SNAPSHOT + 1.8-SNAPSHOT diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index fbf51c6c3..f2d6d3506 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.person - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/pom.xml b/services/pom.xml index d07a2fb96..37f39a5a3 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 @@ -303,7 +303,7 @@ commons-io commons-io - 1.4 + 2.0.1 commons-cli diff --git a/services/query/pom.xml b/services/query/pom.xml index f45becf37..4d4c1d2ca 100644 --- a/services/query/pom.xml +++ b/services/query/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index 42bd7bdd9..49c9762ad 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.query - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml index b22c90ef3..09a6f4cf6 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.relation.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml index 5ba5b4378..e840ab6dc 100644 --- a/services/relation/3rdparty/pom.xml +++ b/services/relation/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.relation org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index ee8283861..c726db011 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.relation - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/relation/pom.xml b/services/relation/pom.xml index d50391a1d..ef2f49675 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 8128cbd3f..7db42e240 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.relation - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml index 6c6128e50..92031debc 100644 --- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml +++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.report.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml index b3c2d2a69..7d08f6ed1 100644 --- a/services/report/3rdparty/pom.xml +++ b/services/report/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.report org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml index 845a41ff6..97e336a4f 100644 --- a/services/report/client/pom.xml +++ b/services/report/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.report - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml index d3d4c1ebc..3a9a32eaa 100644 --- a/services/report/jaxb/pom.xml +++ b/services/report/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.report org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/pom.xml b/services/report/pom.xml index c1d110ea9..264f05877 100644 --- a/services/report/pom.xml +++ b/services/report/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml index b66abcbb2..d2f025df5 100644 --- a/services/report/service/pom.xml +++ b/services/report/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.report - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml index 2248b0138..30bde7ab5 100644 --- a/services/sdk/pom.xml +++ b/services/sdk/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.sdk pom services.sdk - 1.7-SNAPSHOT + 1.8-SNAPSHOT diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml index a5bebee24..8c21fa8f4 100644 --- a/services/sdk/sample/pom.xml +++ b/services/sdk/sample/pom.xml @@ -5,13 +5,13 @@ org.collectionspace.services.client.sample jar client.sample - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services org.collectionspace.services.collectionobject.client - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.slf4j diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index c90ff2214..c5451b192 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.security org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/security/pom.xml b/services/security/pom.xml index e967a4b74..61bc64168 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml index 96ce75032..d6ccdf293 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/3rdparty/pom.xml b/services/taxonomy/3rdparty/pom.xml index 8d1bfcbf2..de5afe08d 100644 --- a/services/taxonomy/3rdparty/pom.xml +++ b/services/taxonomy/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/client/pom.xml b/services/taxonomy/client/pom.xml index f7980be08..b8b07642e 100644 --- a/services/taxonomy/client/pom.xml +++ b/services/taxonomy/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml index 4fdc1c124..1ea896361 100644 --- a/services/taxonomy/jaxb/pom.xml +++ b/services/taxonomy/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/pom.xml b/services/taxonomy/pom.xml index 22eed2ca8..b1efec86f 100644 --- a/services/taxonomy/pom.xml +++ b/services/taxonomy/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/taxonomy/service/pom.xml b/services/taxonomy/service/pom.xml index f1fde402d..f0c26689e 100644 --- a/services/taxonomy/service/pom.xml +++ b/services/taxonomy/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.taxonomy - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml index a6c4d69a6..da487a20f 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml index 8105edb28..fdcc7703f 100644 --- a/services/vocabulary/3rdparty/pom.xml +++ b/services/vocabulary/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 041126d73..b815c93a1 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -6,7 +6,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml index fb42b9efe..73567f8bc 100644 --- a/services/vocabulary/import/pom.xml +++ b/services/vocabulary/import/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml index dbdc5ef7b..32cea93bd 100644 --- a/services/vocabulary/jaxb/pom.xml +++ b/services/vocabulary/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml index 0be107e66..7fb1f00d4 100644 --- a/services/vocabulary/pom.xml +++ b/services/vocabulary/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.main org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml index 6290d4552..b179d04bb 100644 --- a/services/vocabulary/sample/sample/pom.xml +++ b/services/vocabulary/sample/sample/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary.client.sample jar - 1.7-SNAPSHOT + 1.8-SNAPSHOT vocabulary.client.sample diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index eb220a210..71c56d9a2 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -3,7 +3,7 @@ org.collectionspace.services org.collectionspace.services.vocabulary - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml index 3a4d53480..25c4bb6d3 100644 --- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml +++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.workflow.3rdparty - 1.7-SNAPSHOT + 1.8-SNAPSHOT org.collectionspace.services diff --git a/services/workflow/3rdparty/pom.xml b/services/workflow/3rdparty/pom.xml index 2818f4825..dd759fcef 100644 --- a/services/workflow/3rdparty/pom.xml +++ b/services/workflow/3rdparty/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.workflow org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/workflow/client/pom.xml b/services/workflow/client/pom.xml index 91eb3848b..b8921deb2 100644 --- a/services/workflow/client/pom.xml +++ b/services/workflow/client/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services org.collectionspace.services.workflow - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml index 31af3c53f..1f8a25a0c 100644 --- a/services/workflow/jaxb/pom.xml +++ b/services/workflow/jaxb/pom.xml @@ -5,7 +5,7 @@ org.collectionspace.services.workflow org.collectionspace.services - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/workflow/pom.xml b/services/workflow/pom.xml index ed86e5f59..36f50b77c 100644 --- a/services/workflow/pom.xml +++ b/services/workflow/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.main - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0 diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index bda38b1fb..18431e090 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -4,7 +4,7 @@ org.collectionspace.services org.collectionspace.services.workflow - 1.7-SNAPSHOT + 1.8-SNAPSHOT 4.0.0