Skip to content

Commit

Permalink
Merge pull request #21 from digipost/upgrade-pdfbox
Browse files Browse the repository at this point in the history 
Upgrade PDFBox to 3.0.2
  • Loading branch information
@runeflobakk
runeflobakk authored Apr 29, 2024
2 parents 303a4da + 086e0d8 commit 26daec4
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 74 deletions.
7 changes: 0 additions & 7 deletions NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


101 changes: 35 additions & 66 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,27 @@
<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>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Expand All @@ -68,7 +64,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>
Expand All @@ -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>
Expand All @@ -104,70 +107,66 @@
<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>
<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>
<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>
<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>
<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>
Expand All @@ -177,38 +176,8 @@
</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>
<executions>
<execution>
<id>test</id>
Expand All @@ -219,7 +188,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.0.5</version>
<version>3.6.3</version>
</requireMavenVersion>
<bannedDependencies>
<excludes>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/no/digipost/print/validate/PdfValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 26daec4

Please sign in to comment.