DRYD-547: Update Maven surefire plugin to more recent version.

diff --git a/services/client/pom.xml b/services/client/pom.xml
index fc4a0471f2ba824ed60bd6ac63db6e76b7ed7fb5..2ba53db9f59a1f385c60ec51da6444d078601414 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.4.3</version>
+            <version>3.0.0-M1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index b390d1983383acc3da09cb6ec11373a8f9bb12c2..fbec1faa2a8ba261b4b9663e01e56666ac23b3e9 100644 (file)
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.4.3</version>
+            <version>3.0.0-M1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
index 12d30078e98de972fb564bc2a010c2a48e94fb31..52410fdd10a962bebed934d1ec26e4adc1870175 100644 (file)
--- a/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
+++ b/services/place/client/src/main/java/org/collectionspace/services/client/PlaceAuthorityClientUtils.java
@@ -279,7 +279,7 @@ public class PlaceAuthorityClientUtils {
                return newStr.toString();
     }
     
-    private static List<PlaceTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
+    public static List<PlaceTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
         if (Tools.isBlank(shortIdentifier)) {
             shortIdentifier = getGeneratedIdentifier();
         }

diff --git a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
index 676d64cfab3f92b88de89148d6ee3695079e4c8d..f8b7f40448947703f5ab69fe9c9fde00fdf8816a 100644 (file)
--- a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
+++ b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java
@@ -437,11 +437,12 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest<Plac
         Map<String, String> nonexMap = new HashMap<String,String>();
         nonexMap.put(PlaceJAXBSchema.PLACE_NAME, TEST_NAME);
         nonexMap.put(PlaceJAXBSchema.SHORT_IDENTIFIER, "nonEx");
+        nonexMap.put(PlaceJAXBSchema.DISPLAY_NAME, "nonEx-displayName");
         nonexMap.put(PlaceJAXBSchema.PLACE_TYPE, TEST_PLACE_TYPE);
         final String EMPTY_REFNAME = "";
         PoxPayloadOut result = 
                 PlaceAuthorityClientUtils.createPlaceInstance(EMPTY_REFNAME, 
-                       nonexMap, PlaceAuthorityClientUtils.getTermGroupInstance(TEST_NAME), commonPartName);
+                       nonexMap, PlaceAuthorityClientUtils.getTermGroupInstance(TEST_NAME, nonexMap.get(PlaceJAXBSchema.DISPLAY_NAME)), commonPartName);
                return result;
        }
 

diff --git a/services/pom.xml b/services/pom.xml
index b83fa6fed0f5fe10f8c680fbc31f7ac22e2e8d3a..a81fe9592e59de0f4fd9d3998947c07c913452ec 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -114,7 +114,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.7.1</version>
+                    <version>3.0.0-M1</version>
                     <configuration>
                         <systemProperties>
                             <property>