From 1234a2ba2a712d2f66dd10349c99134584661b9a Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Fri, 1 Nov 2024 13:05:01 +0100
Subject: [PATCH 1/3] Upgrade Maven plugins

---
 lib/pom.xml | 14 +++++++-------
 pom.xml     | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/pom.xml b/lib/pom.xml
index 54de9010..221c0c5a 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -183,12 +183,12 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.13.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
-                    <version>0.18.1</version>
+                    <version>0.23.0</version>
                     <configuration>
                         <parameter>
                             <includes>
@@ -202,7 +202,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <minimizeJar>true</minimizeJar>
                         <artifactSet>
@@ -228,7 +228,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -236,15 +236,15 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                     <configuration>
                         <rules>
                             <bannedDependencies>
diff --git a/pom.xml b/pom.xml
index eea5558e..1842cd00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,11 +50,11 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.3</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.4.0</version>
                     <configuration>
                         <filesets>
                             <fileset>
@@ -68,16 +68,16 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.16.1</version>
+                    <version>2.17.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

From 2a3641f7c9ceb5540021ecc653da047add15fd26 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Fri, 1 Nov 2024 13:15:42 +0100
Subject: [PATCH 2/3] Upgrade dependencies

Also migrate code to not use deprecated API of Apache HttpClient.
---
 NOTICE                                        |  1 +
 lib/NOTICE                                    |  1 +
 lib/pom.xml                                   | 34 +++++++++----------
 .../ApacheHttpClientSslConfigurer.java        |  7 ++--
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/NOTICE b/NOTICE
index bf279266..e91348fe 100644
--- a/NOTICE
+++ b/NOTICE
@@ -23,5 +23,6 @@ This software includes third party software subject to the following licenses:
   Posten signering - Java API Client BOM under The Apache Software License, Version 2.0
   Posten signering - Java API Client Library under The Apache Software License, Version 2.0
   Posten signering - Java API Client Parent under The Apache Software License, Version 2.0
+  SLF4J API Module under MIT License
 
 
diff --git a/lib/NOTICE b/lib/NOTICE
index 0d09fe10..07fd3d76 100644
--- a/lib/NOTICE
+++ b/lib/NOTICE
@@ -21,5 +21,6 @@ This software includes third party software subject to the following licenses:
   Posten signering - API JAXB Classes under The Apache Software License, Version 2.0
   Posten signering - API Schema under The Apache Software License, Version 2.0
   Posten signering - Java API Client Library under The Apache Software License, Version 2.0
+  SLF4J API Module under MIT License
 
 
diff --git a/lib/pom.xml b/lib/pom.xml
index 221c0c5a..13a9f0f4 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.0</version>
+                <version>5.11.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -39,6 +39,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-bom</artifactId>
+                <version>2.0.16</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -55,7 +62,7 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>certificate-validator</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>
@@ -67,31 +74,24 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.2.1</version>
+            <version>5.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.core5</groupId>
             <artifactId>httpcore5</artifactId>
-            <version>5.2.3</version>
+            <version>5.3.1</version>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>2.17.0</version>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
 
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
+            <version>3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.15.2</version>
+            <version>3.17.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -148,14 +148,14 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>digg</artifactId>
-            <version>0.33</version>
+            <version>0.36</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
-            <version>2.35.1</version>
+            <version>2.35.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>jul-to-slf4j-junit-extension</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/lib/src/main/java/no/digipost/signature/client/core/internal/configuration/ApacheHttpClientSslConfigurer.java b/lib/src/main/java/no/digipost/signature/client/core/internal/configuration/ApacheHttpClientSslConfigurer.java
index 6dc15626..02463bb5 100644
--- a/lib/src/main/java/no/digipost/signature/client/core/internal/configuration/ApacheHttpClientSslConfigurer.java
+++ b/lib/src/main/java/no/digipost/signature/client/core/internal/configuration/ApacheHttpClientSslConfigurer.java
@@ -8,8 +8,8 @@
 import no.digipost.signature.client.security.KeyStoreConfig;
 import no.digipost.signature.client.security.OrganizationNumberValidation;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
 import org.apache.hc.core5.ssl.SSLContexts;
 
 import javax.net.ssl.SSLContext;
@@ -40,10 +40,7 @@ public ApacheHttpClientSslConfigurer certificatChainValidation(CertificateChainV
 
     @Override
     public void applyTo(PoolingHttpClientConnectionManagerBuilder connectionManager) {
-        connectionManager.setSSLSocketFactory(SSLConnectionSocketFactoryBuilder.create()
-                .setSslContext(sslContext())
-                .setHostnameVerifier(NoopHostnameVerifier.INSTANCE)
-                .build());
+        connectionManager.setTlsSocketStrategy(new DefaultClientTlsStrategy(sslContext(), NoopHostnameVerifier.INSTANCE));
     }
 
 

From 5a8774816c91e6e230d7e960b4efb427f5424604 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 5 Nov 2024 00:28:53 +0100
Subject: [PATCH 3/3] Update to latest version in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 78e12955..a5c7ff13 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The recommended way to declare dependency on the library is to utilize the [BOM]
         <dependency>
             <groupId>no.digipost.signature</groupId>
             <artifactId>signature-api-client-bom</artifactId>
-            <version>7.0.1</version> <!-- replace with any later version -->
+            <version>7.0.4</version> <!-- replace with any later version -->
             <type>pom</type>
             <scope>import</scope>
         </dependency>