Rename xmlunit2 package

This can be harmonized now that support for XmlUnit 1 has been removed.

Closes gh-1561

Author: snicoll

spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestMatchers.java

@@ -27,8 +27,8 @@
 import org.springframework.util.Assert;
 import org.springframework.ws.test.support.matcher.SchemaValidatingMatcher;
 import org.springframework.ws.test.support.matcher.SoapHeaderMatcher;
-import org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher;
-import org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher;
+import org.springframework.ws.test.support.matcher.xmlunit.PayloadDiffMatcher;
+import org.springframework.ws.test.support.matcher.xmlunit.SoapEnvelopeDiffMatcher;
 import org.springframework.xml.transform.ResourceSource;
 
 /**

spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java

@@ -31,8 +31,8 @@
 import org.springframework.ws.test.support.AssertionErrors;
 import org.springframework.ws.test.support.matcher.SchemaValidatingMatcher;
 import org.springframework.ws.test.support.matcher.SoapHeaderMatcher;
-import org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher;
-import org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher;
+import org.springframework.ws.test.support.matcher.xmlunit.PayloadDiffMatcher;
+import org.springframework.ws.test.support.matcher.xmlunit.SoapEnvelopeDiffMatcher;
 import org.springframework.xml.transform.ResourceSource;
 
 /**

spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java renamed to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/DiffMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;
 
 import org.xmlunit.diff.Diff;
 

spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java renamed to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;

spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java renamed to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;
 
 import java.io.IOException;
 

spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java renamed to spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Matcher support for XMLUnit.
  */
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;

spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java renamed to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/PayloadDiffMatcherTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;
 
 import jakarta.xml.soap.MessageFactory;
 import org.junit.jupiter.api.Test;

spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java renamed to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit/SoapEnvelopeDiffMatcherTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.test.support.matcher.xmlunit2;
+package org.springframework.ws.test.support.matcher.xmlunit;
 
 import java.io.IOException;