Updated pdfbox versions

6 files changed, 15 insertions, 14 deletions

diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip
index 666b61a6..495b3028 100644
--- a/pdf-as-lib/src/main/resources/config/config.zip
+++ b/pdf-as-lib/src/main/resources/config/config.zip
diff --git a/pdf-as-pdfbox-2/build.gradle b/pdf-as-pdfbox-2/build.gradle
index 6f885190..e33d030c 100644
--- a/pdf-as-pdfbox-2/build.gradle
+++ b/pdf-as-pdfbox-2/build.gradle
@@ -33,9 +33,9 @@ dependencies {
 	compile project (':pdf-as-lib')
 	compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 	compile 'org.slf4j:jcl-over-slf4j:1.7.18'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.13'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.13'
-	compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.13'
+	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
+	compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
+	compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
 	compile group: 'commons-io', name: 'commons-io', version: '2.4'
 	compile group: 'ognl', name: 'ognl', version: '3.0.6'
 	testCompile group: 'junit', name: 'junit', version: '4.+'
diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
index b797fec8..d30604d3 100644
--- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
+++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java
@@ -324,8 +324,9 @@ public class PDFAsVisualSignatureBuilder extends PDVisibleSigBuilder implements
 		// String innerFormComment = "q 1 0 0 1 0 0 cm /" + imageObjectName +
 		// " Do Q\n";
 
-		String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "ISO-8859-1");
-	
+		//String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "ISO-8859-1");
+		String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "UTF-8");
+
 		//		.getInputStreamAsString();//TODO: pdfbox2 - get the string from the stream
 
 		// logger.debug("Inner Form Stream: " + innerFormComment);
diff --git a/pdf-as-pdfbox/build.gradle b/pdf-as-pdfbox/build.gradle
index e6c075ee..2283057f 100644
--- a/pdf-as-pdfbox/build.gradle
+++ b/pdf-as-pdfbox/build.gradle
@@ -23,7 +23,7 @@ dependencies {
 	compile project (':pdf-as-lib')
 	compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
 	compile 'org.slf4j:jcl-over-slf4j:1.7.18'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.11'
+	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.16'
 	compile group: 'commons-io', name: 'commons-io', version: '2.4'
 	compile group: 'ognl', name: 'ognl', version: '3.0.6'
 	compile group: 'javax.activation', name: 'activation', version: '1.1.1'
diff --git a/pdf-as-tests/build.gradle b/pdf-as-tests/build.gradle
index 8d5129ff..57dd84ab 100644
--- a/pdf-as-tests/build.gradle
+++ b/pdf-as-tests/build.gradle
@@ -42,13 +42,13 @@ dependencies {
 	testCompile group: 'org.icepdf', name: 'icepdf-core', version: '5.0.7'
 
 	pdfBox1Compile project (':pdf-as-pdfbox')
-	pdfBox1Compile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.7'
-	pdfBox1Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.7'
+	pdfBox1Compile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.16'
+	pdfBox1Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.16'
 
 	pdfBox2Compile project (':pdf-as-pdfbox-2')
-	pdfBox2Compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.2'
-	pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.2'
-	pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.2'
+	pdfBox2Compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
+	pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
+	pdfBox2Compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
 
 }
 
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle
index 27ed77eb..f714d621 100644
--- a/pdf-as-web/build.gradle
+++ b/pdf-as-web/build.gradle
@@ -50,9 +50,9 @@ dependencies {
 	compile project (':pdf-as-web-statistic-api')
 
 	compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.3'
-	compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.3'
-	compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.3'
+	compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21'
+	compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21'
+	compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21'
 	compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
 	compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
     compile group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1'