Merge pull request #47 from hazendaz/maven

Add additional git ignores and update deprecated test imports
acegi · Oct 21, 2023 · f4f890f · f4f890f
2 parents 9f2c182 + 1d4311e
commit f4f890f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,6 @@ gpg-sign.json
 mvn-sync.json
 .mvn/wrapper/maven-wrapper.jar
 release.properties
+.checkstyle
+.factorypath
+.fbExcludeFilterFile
diff --git a/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java b/src/test/java/au/com/acegi/xmlformat/FormatUtilTest.java
@@ -27,7 +27,7 @@
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/src/test/java/au/com/acegi/xmlformat/IOTest.java b/src/test/java/au/com/acegi/xmlformat/IOTest.java
@@ -23,7 +23,7 @@
 import static au.com.acegi.xmlformat.IOUtil.hash;
 import static au.com.acegi.xmlformat.TestUtil.getResource;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/src/test/java/au/com/acegi/xmlformat/TestUtil.java b/src/test/java/au/com/acegi/xmlformat/TestUtil.java
@@ -23,7 +23,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java b/src/test/java/au/com/acegi/xmlformat/XmlCheckPluginTest.java
@@ -23,7 +23,7 @@
 import static au.com.acegi.xmlformat.TestUtil.fileToString;
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;

diff --git a/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java b/src/test/java/au/com/acegi/xmlformat/XmlFormatPluginTest.java
@@ -24,7 +24,7 @@
 import static au.com.acegi.xmlformat.TestUtil.stringToFile;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;