From 1ba6850ba40b70f2aac460b8355e97be9feb44b7 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 14 Oct 2025 13:21:22 +0200
Subject: [PATCH 1/5] Add back httpcore5-h2

Used by httpclient5, and can not be excluded
---
 NOTICE  |  1 +
 pom.xml | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/NOTICE b/NOTICE
index 75b0f2cf..206e8790 100644
--- a/NOTICE
+++ b/NOTICE
@@ -14,6 +14,7 @@ This software includes third party software subject to the following licenses:
   Apache FontBox under Apache-2.0
   Apache HttpClient under Apache License, Version 2.0
   Apache HttpComponents Core HTTP/1.1 under Apache License, Version 2.0
+  Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0
   Apache PDFBox under Apache-2.0
   Apache PDFBox io under Apache-2.0
   Bouncy Castle ASN.1 Extension and Utility APIs under Bouncy Castle Licence
diff --git a/pom.xml b/pom.xml
index 70e0c03f..7db780a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,10 +76,6 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents.core5</groupId>
-                    <artifactId>httpcore5-h2</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -389,13 +385,9 @@
                                         <include>com.google.guava:failureaccess</include>
                                         <include>commons-codec:commons-codec</include>
                                         <include>org.apache.commons:commons-lang3</include>
-                                        <include>org.apache.httpcomponents.client5:httpclient5</include>
-                                        <include>org.apache.httpcomponents.core5:httpcore5</include>
+                                        <include>org.apache.httpcomponents.*</include>
                                         <include>no.digipost:digipost-data-types</include>
-                                        <include>com.fasterxml.jackson.core:jackson-core</include>
-                                        <include>com.fasterxml.jackson.core:jackson-databind</include>
-                                        <include>com.fasterxml.jackson.core:jackson-annotations</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include>
+                                        <include>com.fasterxml.jackson.*</include>
                                         <include>net.bytebuddy:byte-buddy</include>
                                         <include>jakarta.validation:jakarta.validation-api</include>
                                         <include>com.googlecode.owasp-java-html-sanitizer</include>

From 23feb8a6d9a4ae47e98c5ad478277e0810653497 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 14 Oct 2025 13:23:46 +0200
Subject: [PATCH 2/5] Upgrade Apache HTTP Components

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7db780a6..509fc394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4.4</version>
+            <version>5.5.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -79,9 +79,9 @@
             </exclusions>
         </dependency>
         <dependency>
-        <groupId>org.apache.httpcomponents.core5</groupId>
-        <artifactId>httpcore5</artifactId>
-        <version>5.3.4</version>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>5.3.6</version>
         </dependency>
         <dependency>
             <groupId>no.digipost</groupId>

From d30c8e5637a2a80dc5635fbff24125a467b927c7 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 14 Oct 2025 13:33:55 +0200
Subject: [PATCH 3/5] Upgrade dependencies

---
 pom.xml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 509fc394..64cb3859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,6 @@
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-
-        <bouncycastle.version>1.81</bouncycastle.version>
     </properties>
 
     <dependencies>
@@ -46,7 +44,7 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>digipost-html-validator</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.3</version>
         </dependency>
         <dependency>
             <groupId>no.digipost</groupId>
@@ -96,17 +94,15 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
+            <version>3.19.0</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
-            <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -121,7 +117,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
+            <version>3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -149,7 +145,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.16.1</version>
+            <version>3.19.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -167,7 +163,7 @@
         <dependency>
             <groupId>no.digipost</groupId>
             <artifactId>digipost-data-types</artifactId>
-            <version>1.2.2</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -188,6 +184,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bc-jdk18on-bom</artifactId>
+                <version>1.82</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-bom</artifactId>
@@ -198,7 +201,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.13.4</version>
+                <version>5.14.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -210,19 +213,19 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>
-                <version>5.18.0</version>
+                <version>5.20.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>4.0.2</version>
+                <version>4.0.4</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
-                <version>4.0.5</version>
+                <version>4.0.6</version>
                 <scope>runtime</scope>
             </dependency>
         </dependencies>

From 7bb29264bec2fe4fac0077e472334610ffc79fa2 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 14 Oct 2025 13:37:17 +0200
Subject: [PATCH 4/5] Upgrade Maven plugins

---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64cb3859..48e1cbeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,11 +252,11 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.14.0</version>
+                    <version>3.14.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.3</version>
+                    <version>3.5.4</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
@@ -264,7 +264,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.11.2</version>
+                    <version>3.12.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -276,7 +276,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.9.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -300,17 +300,17 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.6.1</version>
+                    <version>3.6.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.18.0</version>
+                    <version>2.19.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
-                    <version>0.23.1</version>
+                    <version>0.24.2</version>
                     <configuration>
                         <parameter>
                             <includes>

From b9175812a157e492e856bb9df504fb30d0dfdbdd Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Tue, 14 Oct 2025 13:40:00 +0200
Subject: [PATCH 5/5] Change version to LOCAL-SNAPSHOT

To be consistent with other libs
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 48e1cbeb..4d74aad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>digipost-api-client-java</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>LOCAL-SNAPSHOT</version>
     <name>Digipost API Client</name>
     <description>Java library for interacting with the Digipost REST API</description>