Merge branch '5.0-final' into multiple-documents

* 5.0-final:
  Upgrade to java-8-matchers 1.9
  Upgrade dependencies
  Configure japicmp to support LOCAL-SNAPSHOT in pom

Author: runeflobakk

pom.xml

@@ -29,6 +29,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
         <signature.api.version>2.8-RC1</signature.api.version>
         <slf4j.version>1.7.30</slf4j.version>
     </properties>
@@ -186,9 +187,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>co.unruly</groupId>
+            <groupId>uk.co.probablyfine</groupId>
             <artifactId>java-8-matchers</artifactId>
-            <version>1.6</version>
+            <version>1.9</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -255,8 +256,15 @@
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
-                    <version>0.14.2</version>
+                    <version>0.15.2</version>
                     <configuration>
+                        <oldVersion>
+                            <dependency>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.previousVersion}</version>
+                            </dependency>
+                        </oldVersion>
                         <newVersion>
                             <file>
                                 <path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path>

src/test/java/no/digipost/signature/client/asice/manifest/CreateDirectManifestTest.java

@@ -11,7 +11,7 @@
 
 import java.net.URI;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 

src/test/java/no/digipost/signature/client/asice/manifest/CreatePortalManifestTest.java

@@ -12,7 +12,7 @@
 import java.time.Clock;
 import java.util.Collections;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;

src/test/java/no/digipost/signature/client/asice/signature/CreateSignatureTest.java

@@ -26,7 +26,7 @@
 import java.util.Base64;
 import java.util.List;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static java.util.Arrays.asList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;

src/test/java/no/digipost/signature/client/direct/DirectJobResponseTest.java

@@ -4,7 +4,7 @@
 
 import java.net.URI;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static java.util.Arrays.asList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;

src/test/java/no/digipost/signature/client/direct/SignerStatusTest.java

@@ -7,7 +7,7 @@
 import java.lang.reflect.Field;
 import java.util.stream.Stream;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
 import static no.digipost.DiggExceptions.mayThrow;

src/test/java/no/digipost/signature/client/portal/PortalSignerTest.java

@@ -2,10 +2,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import static co.unruly.matchers.Java8Matchers.where;
-import static co.unruly.matchers.Java8Matchers.whereNot;
-import static co.unruly.matchers.OptionalMatchers.contains;
-import static co.unruly.matchers.OptionalMatchers.empty;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.whereNot;
+import static uk.co.probablyfine.matchers.OptionalMatchers.contains;
+import static uk.co.probablyfine.matchers.OptionalMatchers.empty;
 import static no.digipost.signature.client.portal.PortalSigner.identifiedByEmail;
 import static no.digipost.signature.client.portal.PortalSigner.identifiedByEmailAndMobileNumber;
 import static no.digipost.signature.client.portal.PortalSigner.identifiedByMobileNumber;

src/test/java/no/digipost/signature/client/portal/SignatureStatusTest.java

@@ -8,7 +8,7 @@
 import java.lang.reflect.Field;
 import java.util.stream.Stream;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
 import static no.digipost.DiggExceptions.mayThrow;

src/test/java/no/digipost/signature/client/portal/SignerTest.java

@@ -6,8 +6,8 @@
 import no.digipost.signature.client.portal.Signature.Signer;
 import org.junit.jupiter.api.Test;
 
-import static co.unruly.matchers.Java8Matchers.where;
-import static co.unruly.matchers.Java8Matchers.whereNot;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.whereNot;
 import static no.digipost.signature.client.portal.SignerIdentifier.identifiedByEmailAddress;
 import static no.digipost.signature.client.portal.SignerIdentifier.identifiedByEmailAddressAndMobileNumber;
 import static no.digipost.signature.client.portal.SignerIdentifier.identifiedByMobileNumber;

src/test/java/no/digipost/signature/client/security/KeyStoreConfigTest.java

@@ -4,7 +4,7 @@
 import no.digipost.signature.client.core.exceptions.KeyException;
 import org.junit.jupiter.api.Test;
 
-import static co.unruly.matchers.Java8Matchers.where;
+import static uk.co.probablyfine.matchers.Java8Matchers.where;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;