[java-parent-project] branch master updated: JPAR-114 - migrate from xmlunit 1.6 to xmlunit 2.x

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=1e4863f9b204a03ea940e1e9fec975a85cab8473

The following commit(s) were added to refs/heads/master by this push:
       new  1e4863f   JPAR-114 - migrate from xmlunit 1.6 to xmlunit 2.x
1e4863f is described below

commit 1e4863f9b204a03ea940e1e9fec975a85cab8473
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Mar 9 15:26:56 2018 +0000

    JPAR-114 - migrate from xmlunit 1.6 to xmlunit 2.x
    
    Phase 1: replace v1.6 with v2.5.1 in parent project.
---
 pom.xml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 260596c..b69372c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
         <spring-webflow.groupId>org.springframework.webflow</spring-webflow.groupId>
         <spring-webflow.version>2.4.7.RELEASE</spring-webflow.version>
         <xmlsec.version>2.0.8</xmlsec.version>
+        <xmlunit.version>2.5.1</xmlunit.version>
 
         <checkstyle.version>8.7</checkstyle.version>
         <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
@@ -170,9 +171,8 @@
         <dependency>
             <!-- This isn't really needed by every single project but it is used by the vast majority and having it on the
                 test classpath, even if it's not used, doesn't hurt anything. -->
-            <groupId>xmlunit</groupId>
-            <artifactId>xmlunit</artifactId>
-            <version>1.6</version>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-legacy</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -416,6 +416,29 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
+                <groupId>org.xmlunit</groupId>
+                <artifactId>xmlunit-core</artifactId>
+                <version>${xmlunit.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.xmlunit</groupId>
+                <artifactId>xmlunit-matchers</artifactId>
+                <version>${xmlunit.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <!--
+                xmlunit-legacy implements part of the XMLUnit 1.6 API but is
+                deprecated. It should be removed at some point, once we have
+                migrated to the 2.x API.
+            -->
+            <dependency>
+                <groupId>org.xmlunit</groupId>
+                <artifactId>xmlunit-legacy</artifactId>
+                <version>${xmlunit.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>com.unboundid</groupId>
                 <artifactId>unboundid-ldapsdk</artifactId>
                 <version>3.2.0</version>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.