Skip to content
Snippets Groups Projects
Commit a86611b8 authored by Jari-Matti Mäkelä's avatar Jari-Matti Mäkelä
Browse files

-

parent ae22060f
Branches
Tags 1.2.2
No related merge requests found
Pipeline #75344 passed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
pdfbox-benchmark/pom.xml
+ 12
− 3
View file @ a86611b8
......@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pdfbox-benchmark</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>jar</packaging>
<properties>
......@@ -13,7 +13,7 @@
<parent>
<groupId>fi.utu.tech</groupId>
<artifactId>pdfbox-suite</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<dependencies>
......@@ -41,13 +41,22 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>3.0.2</version>
<version>${pdfbox.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>none</mainClass>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
......
pdfbox-gui/pom.xml
+ 147
− 2
View file @ a86611b8
......@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pdfbox-gui</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>jar</packaging>
<properties>
......@@ -14,7 +14,7 @@
<parent>
<groupId>fi.utu.tech</groupId>
<artifactId>pdfbox-suite</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<dependencies>
......@@ -33,6 +33,26 @@
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.78.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.3</version>
</dependency>
</dependencies>
<build>
......@@ -48,8 +68,133 @@
<noHeaderFiles>true</noHeaderFiles>
<noManPages>true</noManPages>
<launcher>${project.launcher}</launcher>
<!--<jmodsPath>${project.build.directory}/modules</jmodsPath>-->
<jlinkVerbose>true</jlinkVerbose>
<ignoreSigningInformation>true</ignoreSigningInformation>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>copy</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/dependency</outputDirectory>
<includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<id>add-module-infos</id>
<phase>generate-resources</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<modules>
<module>
<artifact>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>3.0.2</version>
</artifact>
<additionalDependencies>
<artifact>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-io</artifactId>
<version>3.0.2</version>
</artifact>
</additionalDependencies>
<moduleInfoSource>
module org.apache.pdfbox {
requires transitive org.apache.fontbox;
//requires org.apache.commons.logging;
requires java.desktop;
//requires org.bouncycastle.pkix;
//requires org.bouncycastle.provider;
exports org.apache.pdfbox;
exports org.apache.pdfbox.contentstream;
exports org.apache.pdfbox.cos;
exports org.apache.pdfbox.filter;
exports org.apache.pdfbox.multipdf;
exports org.apache.pdfbox.pdfparser;
exports org.apache.pdfbox.pdfwriter;
exports org.apache.pdfbox.pdmodel;
exports org.apache.pdfbox.printing;
exports org.apache.pdfbox.rendering;
exports org.apache.pdfbox.text;
exports org.apache.pdfbox.util;
opens org.apache.pdfbox;
}
</moduleInfoSource>
</module>
<module>
<artifact>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>3.0.2</version>
</artifact>
<additionalDependencies>
<artifact>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-io</artifactId>
<version>3.0.2</version>
</artifact>
</additionalDependencies>
<moduleInfoSource>
module org.apache.fontbox {
//requires org.apache.commons.logging;
requires java.desktop;
exports org.apache.fontbox;
exports org.apache.fontbox.afm;
exports org.apache.fontbox.cff;
exports org.apache.fontbox.cmap;
exports org.apache.fontbox.encoding;
exports org.apache.fontbox.pfb;
exports org.apache.fontbox.ttf;
exports org.apache.fontbox.type1;
exports org.apache.fontbox.util;
exports org.apache.fontbox.ttf.gsub;
exports org.apache.fontbox.ttf.model;
exports org.apache.fontbox.util.autodetect;
}
</moduleInfoSource>
</module>
<module>
<artifact>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-io</artifactId>
<version>3.0.2</version>
</artifact>
<moduleInfoSource>
module org.apache.pdfbox.io {
//requires org.apache.commons.logging;
exports org.apache.pdfbox.io;
opens org.apache.pdfbox.io;
}
</moduleInfoSource>
</module>
</modules>
<overwriteExistingFiles>true</overwriteExistingFiles>
</configuration>
</execution>
</executions>
</plugin>-->
</plugins>
</build>
</project>
pdfbox-wrapper/pom.xml
+ 11
− 2
View file @ a86611b8
......@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pdfbox-wrapper</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>jar</packaging>
<parent>
<groupId>fi.utu.tech</groupId>
<artifactId>pdfbox-suite</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</parent>
<dependencies>
......@@ -42,6 +42,15 @@
<build>
<plugins>
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>none</mainClass>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
......
pdfbox-wrapper/src/main/java/module-info.java
+ 1
− 1
View file @ a86611b8
module fi.utu.tech.pdfbox {
requires kotlin.stdlib;
requires org.apache.pdfbox;
requires transitive org.apache.pdfbox;
requires javafx.swing;
requires transitive javafx.base;
exports fi.utu.tech.pdfbox.document;
......
pom.xml
+ 7
− 3
View file @ a86611b8
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fi.utu.tech</groupId>
<artifactId>pdfbox-suite</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>pom</packaging>
<properties>
......@@ -10,8 +10,8 @@
<kotlin.version>2.0.0</kotlin.version>
<javafx.version>22</javafx.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<pdfbox.version>3.0.2</pdfbox.version>
<pdfboxwrapper.version>1.2.1</pdfboxwrapper.version>
<pdfbox.version>3.0.3</pdfbox.version>
<pdfboxwrapper.version>1.2.2</pdfboxwrapper.version>
</properties>
<modules>
......@@ -34,6 +34,10 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>none</mainClass>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment