From f5305cd1b6b7aa47eaa00dcc05e8647b43ff3063 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 15:47:25 +0200
Subject: [PATCH 1/7] Update NOTICE to not include test deps

---
 NOTICE | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/NOTICE b/NOTICE
index a784c09..130c761 100644
--- a/NOTICE
+++ b/NOTICE
@@ -13,13 +13,6 @@ This software includes third party software subject to the following licenses:
   Apache PDFBox io under Apache-2.0
   Digipost Printability Validator under The Apache Software License, Version 2.0
   JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
-  JUnit Jupiter (Aggregator) under Eclipse Public License v2.0
-  JUnit Jupiter Engine under Eclipse Public License v2.0
-  JUnit Jupiter Params under Eclipse Public License v2.0
-  JUnit Platform Commons under Eclipse Public License v2.0
-  JUnit Platform Engine API under Eclipse Public License v2.0
-  org.apiguardian:apiguardian-api under The Apache License, Version 2.0
-  org.opentest4j:opentest4j under The Apache License, Version 2.0
   SLF4J API Module under MIT License
 
 

From 266a5d639c873a0eb39a2b97ebd85bdf4755327a Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 15:47:31 +0200
Subject: [PATCH 2/7] Upgrade PDFBox to 3.0.2

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

diff --git a/pom.xml b/pom.xml
index 3cf62ec..4c7a99c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox-io</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

From c10dfc3132468bd3d7bb2c64032831acc6314f03 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 15:51:08 +0200
Subject: [PATCH 3/7] Upgrade dependencies

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

diff --git a/pom.xml b/pom.xml
index 4c7a99c..67605be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,25 +33,21 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <slf4j-api.version>2.0.10</slf4j-api.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j-api.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -94,7 +90,14 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.1</version>
+                <version>5.10.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-bom</artifactId>
+                <version>2.0.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From af24637a98225b409f35fa3b6a514a0b82848841 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 15:55:15 +0200
Subject: [PATCH 4/7] Avoid duplicate executions for sources and javadoc

Already configured with profiles in parent pom, and activated in
.mvn/maven.config
---
 pom.xml | 44 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67605be..bbb19ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,13 +107,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <configuration>
-                        <tagNameFormat>@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.jasig.maven</groupId>
                     <artifactId>maven-notice-plugin</artifactId>
@@ -160,6 +153,14 @@
                     <artifactId>versions-maven-plugin</artifactId>
                     <version>2.7</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.3</version>
+                </plugin>
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
@@ -180,35 +181,6 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <includePom>true</includePom>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-source</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>analyze-only</goal>
-                        </goals>
-                        <configuration>
-                            <failOnWarning>true</failOnWarning>
-                            <ignoreNonCompile>true</ignoreNonCompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>3.0.0-M2</version>

From c88d53484ca5c4841e955cb1bde12c0ac0a8c837 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 16:00:19 +0200
Subject: [PATCH 5/7] Correct dependency for notice plugin

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

diff --git a/pom.xml b/pom.xml
index bbb19ef..9c32c7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,12 +109,8 @@
             <plugins>
                 <plugin>
                     <groupId>org.jasig.maven</groupId>
-                    <artifactId>maven-notice-plugin</artifactId>
-                    <version>1.1.0</version>
-                    <configuration>
-                        <excludeScopes>test</excludeScopes>
-                        <noticeTemplate>${project.basedir}/src/main/notice/NOTICE.template</noticeTemplate>
-                    </configuration>
+                    <artifactId>notice-maven-plugin</artifactId>
+                    <version>2.0.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>

From cdd9ea976b111f359a38116e4d514bd16cd99874 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 16:05:30 +0200
Subject: [PATCH 6/7] Upgrade Maven plugins

---
 pom.xml | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c32c7b..a1214fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,40 +114,44 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.13.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>3.2.5</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.6.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>2.16.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
@@ -160,14 +164,9 @@
                 <plugin>
                     <groupId>com.github.siom79.japicmp</groupId>
                     <artifactId>japicmp-maven-plugin</artifactId>
-                    <version>0.13.0</version>
+                    <version>0.21.1</version>
                     <configuration>
-                        <newVersion>
-                            <file><path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path></file>
-                        </newVersion>
                         <parameter>
-                            <onlyModified>true</onlyModified>
-                            <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
                             <includes>
                                 <include>no.digipost</include>
                             </includes>
@@ -179,7 +178,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M2</version>
                 <executions>
                     <execution>
                         <id>test</id>
@@ -190,7 +188,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.0.5</version>
+                                    <version>3.6.3</version>
                                 </requireMavenVersion>
                                 <bannedDependencies>
                                     <excludes>

From 086e0d8425745d24a5ae76961d9ca38cfec8dc99 Mon Sep 17 00:00:00 2001
From: Rune Flobakk <rune.flobakk@posten.no>
Date: Mon, 29 Apr 2024 16:20:27 +0200
Subject: [PATCH 7/7] Remove unused import

---
 src/main/java/no/digipost/print/validate/PdfValidator.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/no/digipost/print/validate/PdfValidator.java b/src/main/java/no/digipost/print/validate/PdfValidator.java
index cb5054f..e1c3068 100644
--- a/src/main/java/no/digipost/print/validate/PdfValidator.java
+++ b/src/main/java/no/digipost/print/validate/PdfValidator.java
@@ -17,7 +17,6 @@
 
 import no.digipost.print.validate.PdfValidationSettings.Bleed;
 import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.io.RandomAccessInputStream;
 import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;