From 955a0c02e94e811ec386454da6d59a17e40b9466 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 26 Jan 2010 22:28:00 +0000
Subject: [PATCH] CSPACE-532: Added 'cspace.services.client.version' property
 or (to 'sample' packages) hard-coded 0.5-SNAPSHOT client version to
 additional POMs, for the org.collectionspace.services.client dependencies,
 and for several service-specific client package dependencies missed in
 earlier work on this task.  Removed the dependency on '...services.account'
 introduced - likely in error - to the POM for security.client in r1279.

---
 services/IntegrationTests/pom.xml               |  4 ++--
 services/account/client/pom.xml                 |  2 +-
 services/account/jaxb/pom.xml                   |  2 +-
 services/acquisition/client/pom.xml             |  7 +------
 services/authentication/client/pom.xml          |  2 +-
 services/collectionobject/client/pom.xml        | 11 +----------
 services/collectionobject/sample/sample/pom.xml |  4 ++--
 services/contact/client/pom.xml                 |  2 +-
 services/dimension/client/pom.xml               |  2 +-
 services/id/client/pom.xml                      |  2 +-
 services/intake/client/pom.xml                  |  2 +-
 services/organization/client/pom.xml            |  2 +-
 services/organization/import/pom.xml            |  4 ++--
 services/organization/sample/sample/pom.xml     |  4 ++--
 services/person/client/pom.xml                  |  2 +-
 services/person/import/pom.xml                  |  4 ++--
 services/person/sample/sample/pom.xml           |  4 ++--
 services/relation/client/pom.xml                |  2 +-
 services/security/client/pom.xml                | 11 +++--------
 services/vocabulary/client/pom.xml              |  2 +-
 services/vocabulary/import/pom.xml              |  4 ++--
 services/vocabulary/sample/sample/pom.xml       |  4 ++--
 22 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index f81cca0c2..4b9bc103a 100644
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.relation.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
     </dependencies>
     
diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index 2c840b3da..52c5a3f96 100644
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <!-- Needed if/when client test framework files are moved into
 /services/client/src/test from /services/client/src/main -->     
diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 20492eba3..d3f7eaf20 100644
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
 -->        
     </dependencies>
diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index 669b0afe5..5ad554610 100644
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.acquisition</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.acquisition.jaxb</artifactId>
@@ -41,7 +36,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index 88e695393..0e195083b 100644
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 0c0320970..95f3cc5ce 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -35,17 +35,8 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
-<!-- Needed if/when client test framework files are moved into
-/services/client/src/test from /services/client/src/main -->     
-<!--    <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>-->
         
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index 07fe21f0a..3dcdf951e 100644
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index dfdb77007..78d93048c 100644
--- a/services/contact/client/pom.xml
+++ b/services/contact/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index 974271aac..148d7d3ea 100644
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index 66fbd1a00..3b35a5b85 100644
--- a/services/id/client/pom.xml
+++ b/services/id/client/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index bb1cc41d8..011f1eb3f 100644
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 7e52650de..85fba43a5 100644
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml
index 2cc38214e..a45fd5851 100644
--- a/services/organization/import/pom.xml
+++ b/services/organization/import/pom.xml
@@ -25,12 +25,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.organization.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
 <!--         
diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index 03ef7c52e..8ee997796 100644
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.organization.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index 9d458b0d9..89e0645bb 100644
--- a/services/person/client/pom.xml
+++ b/services/person/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml
index 8ab42fad1..9634f3934 100644
--- a/services/person/import/pom.xml
+++ b/services/person/import/pom.xml
@@ -25,12 +25,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
 <!--         
diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index f1bf0d821..a82495461 100644
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.person.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 3c9e900f0..b984bb0a4 100644
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
 
 
diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index a67cbbf0e..f051ea8bb 100644
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -29,18 +29,13 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <!-- authentication tests use CollectionObject service and Account service -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authentication.client</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.account</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
@@ -50,7 +45,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index 0554b4b69..38f004fce 100644
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
         <dependency>
diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml
index 829672371..e3c9f704d 100644
--- a/services/vocabulary/import/pom.xml
+++ b/services/vocabulary/import/pom.xml
@@ -25,12 +25,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.vocabulary.client</artifactId>
-            <version>1.0</version>
+            <version>${cspace.services.client.version}</version>
         </dependency>
         
 <!--         
diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index 38eb42abe..b921c9c20 100644
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -16,12 +16,12 @@
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.vocabulary.client</artifactId>
-            <version>1.0</version>
+            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
-- 
2.47.3