summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2021-06-18 10:08:10 +0200
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2021-06-18 10:08:10 +0200
commit0e2e35cc4e59e325b5406015573fc2eb46c94756 (patch)
tree9df91c3c186e048a9376e21a985a3c911682a415
parentd67536e610933dce65d05fb4fb5dc5eeb032f803 (diff)
parent536933e32796b0595b7cc5820d5d8a5d5d755b0a (diff)
downloadpdf-over-0e2e35cc4e59e325b5406015573fc2eb46c94756.tar.gz
pdf-over-0e2e35cc4e59e325b5406015573fc2eb46c94756.tar.bz2
pdf-over-0e2e35cc4e59e325b5406015573fc2eb46c94756.zip
Merge branch 'master' into issue/33
-rw-r--r--pdf-over-commons/pdf-over-commons.iml2
-rw-r--r--pdf-over-signator/pom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/pdf-over-commons/pdf-over-commons.iml b/pdf-over-commons/pdf-over-commons.iml
index 597cd8e6..b4c85949 100644
--- a/pdf-over-commons/pdf-over-commons.iml
+++ b/pdf-over-commons/pdf-over-commons.iml
@@ -8,7 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="inheritedJdk" />
+ <orderEntry type="jdk" jdkName="openjdk-16" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module> \ No newline at end of file
diff --git a/pdf-over-signator/pom.xml b/pdf-over-signator/pom.xml
index 3bad3d50..9a5051fb 100644
--- a/pdf-over-signator/pom.xml
+++ b/pdf-over-signator/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-b180830.0438</version>
</dependency>
</dependencies>
</project>