summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2019-11-20 09:55:21 +0100
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2019-11-20 09:55:21 +0100
commit2c2237c8d75cdadd4a2000d44140aa4ab3eba6ce (patch)
tree8c5f6b81fc68ce6e6f5bd0bb45a6aaeedb0744bb
parentb000ed0f00e4f5c04884b0585d9b366e08167e13 (diff)
downloadpdf-over-2c2237c8d75cdadd4a2000d44140aa4ab3eba6ce.tar.gz
pdf-over-2c2237c8d75cdadd4a2000d44140aa4ab3eba6ce.tar.bz2
pdf-over-2c2237c8d75cdadd4a2000d44140aa4ab3eba6ce.zip
PDF-As version updated and update pdfbox to v2
-rw-r--r--pdf-over-gui/pom.xml1
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java4
-rw-r--r--pdf-over-gui/src/main/resources/cfg/PDFASConfig.zipbin971922 -> 971912 bytes
-rw-r--r--pdf-over-signer/pdf-over-sigpdfas4/pom.xml15
4 files changed, 13 insertions, 7 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index aa8c2408..94de3e50 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -61,7 +61,6 @@
<artifactId>jsoup</artifactId>
<version>1.11.3</version>
</dependency>
-
</dependencies>
<dependencyManagement>
<dependencies>
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index b2a7cb50..9caee52d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -18,6 +18,7 @@ package at.asit.pdfover.gui.workflow.states;
import java.io.IOException;
import org.apache.pdfbox.pdmodel.PDDocument;
+
//Imports
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.MessageBox;
@@ -33,8 +34,9 @@ import at.asit.pdfover.gui.workflow.Status;
import at.asit.pdfover.gui.workflow.config.ConfigProvider;
import at.asit.pdfover.signator.SignaturePosition;
import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
-import at.gv.egiz.pdfas.lib.impl.pdfbox.placeholder.SignaturePlaceholderExtractor;
import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData;
+import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.SignaturePlaceholderExtractor;
+
/**
* Selects the data source for the signature process.
diff --git a/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip b/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip
index 0fa636b3..dad6f8a9 100644
--- a/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip
+++ b/pdf-over-gui/src/main/resources/cfg/PDFASConfig.zip
Binary files differ
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml
index d1477ff4..fe1ded66 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml
+++ b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml
@@ -10,7 +10,7 @@
<name>PDF-Over PDF-AS 4 Signer</name>
<properties>
<project.maindir>${project.basedir}/../..</project.maindir>
- <pdf-as.version>4.1.5</pdf-as.version>
+ <pdf-as.version>4.1.6-RC</pdf-as.version>
</properties>
<dependencies>
<dependency>
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>at.gv.egiz.pdfas</groupId>
- <artifactId>pdf-as-pdfbox</artifactId>
+ <artifactId>pdf-as-pdfbox-2</artifactId>
<version>${pdf-as.version}</version>
</dependency>
<dependency>
@@ -55,10 +55,15 @@
</dependency>
</dependencies>
<repositories>
+<!-- <repository> -->
+<!-- <id>pdf-as-4</id> -->
+<!-- <name>PDF-AS 4 Repository</name> -->
+<!-- <url>https://apps.egiz.gv.at/maven/</url> -->
+<!-- </repository> -->
<repository>
- <id>pdf-as-4</id>
- <name>PDF-AS 4 Repository</name>
- <url>https://apps.egiz.gv.at/maven/</url>
+ <id>pdf-as-4-rc</id>
+ <name>PDF-AS 4 Repository RC</name>
+ <url>https://apps.egiz.gv.at/releases/pdf-as/release/4.1.6RC/mvn-repo/releases/</url>
<!--url>http://demo.egiz.gv.at/pdf-as-mvn-snpshot/</url-->
</repository>
<repository>