diff options
author | Andreas Abraham <aabraham@iaik.tugraz.at> | 2018-03-21 14:57:50 +0100 |
---|---|---|
committer | Andreas Abraham <aabraham@iaik.tugraz.at> | 2018-03-21 14:57:50 +0100 |
commit | 6c0b2c9ed89f39f2d0606c113173645476de69b6 (patch) | |
tree | 63ab747796cc2c46dbdc630851b40bf7edc4e33a | |
parent | 13c593b5ec413b94d6a990a41938a2e071501270 (diff) | |
download | pdf-over-6c0b2c9ed89f39f2d0606c113173645476de69b6.tar.gz pdf-over-6c0b2c9ed89f39f2d0606c113173645476de69b6.tar.bz2 pdf-over-6c0b2c9ed89f39f2d0606c113173645476de69b6.zip |
new helper files added, pom has changed,
-rw-r--r-- | .classpath | 6 | ||||
-rw-r--r-- | pdf-over-gui/.classpath | 2 | ||||
-rw-r--r-- | pdf-over-gui/.settings/org.eclipse.jdt.core.prefs | 6 | ||||
-rw-r--r-- | pdf-over-gui/pom.xml | 75 | ||||
-rw-r--r-- | pdf-over-install-helper/pom.xml | 126 | ||||
-rw-r--r-- | pdf-over-install-helper/src/main/java/at/asit/helper/Main.java | 266 | ||||
-rw-r--r-- | pdf-over-signator/.classpath | 2 | ||||
-rw-r--r-- | pdf-over-signator/.settings/org.eclipse.jdt.core.prefs | 6 | ||||
-rw-r--r-- | pdf-over-signer/pdf-over-sigpdfas4/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 6 |
10 files changed, 254 insertions, 243 deletions
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <attributes> - <attribute name="maven.pomderived" value="true"/> + <attribute name="module" value="true"/> </attributes> </classpathentry> + <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/pdf-over-gui/.classpath b/pdf-over-gui/.classpath index ffffea55..b1f1249d 100644 --- a/pdf-over-gui/.classpath +++ b/pdf-over-gui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs b/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs index 26e5d21d..0e650d49 100644 --- a/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs +++ b/pdf-over-gui/.settings/org.eclipse.jdt.core.prefs @@ -4,8 +4,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -99,7 +99,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,NOTE diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml index c6c33038..5493566f 100644 --- a/pdf-over-gui/pom.xml +++ b/pdf-over-gui/pom.xml @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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> <parent> <artifactId>pdf-over</artifactId> @@ -167,6 +168,15 @@ <outputDirectory>${staging.dir}/lib-swt</outputDirectory> <destFileName>swt-${target.name}-64.jar</destFileName> </artifactItem> +<!-- <artifactItem> --> +<!-- <groupId>at.a-sit</groupId> --> +<!-- <artifactId>pdf-over-install-helper</artifactId> --> +<!-- <version>1.0.0</version> --> +<!-- <type>jar</type> --> +<!-- <overWrite>true</overWrite> --> +<!-- <outputDirectory>${staging.dir}/lib</outputDirectory> --> +<!-- <destFileName>pdf-over-install-helper-1.0.0.jar</destFileName> --> +<!-- </artifactItem> --> </artifactItems> </configuration> </execution> @@ -288,7 +298,7 @@ <chdir>.</chdir> <icon>src/main/resources/icons/icon.ico</icon> <jre> - <minVersion>1.6.0</minVersion> + <minVersion>1.7.0</minVersion> </jre> <versionInfo> <fileVersion>${version.exe}</fileVersion> @@ -322,7 +332,7 @@ <chdir>.</chdir> <icon>src/main/resources/icons/icon.ico</icon> <jre> - <minVersion>1.6.0</minVersion> + <minVersion>1.7.0</minVersion> </jre> <versionInfo> <fileVersion>${version.exe}</fileVersion> @@ -418,78 +428,79 @@ <properties> <izpack-standalone.version>4.3.5</izpack-standalone.version> <project.maindir>${project.basedir}/..</project.maindir> - <target.name>linux</target.name> + <target.name>windows</target.name> <staging.dir>${project.build.directory}/staging/${target.name}</staging.dir> <swt.version>4.3.2</swt.version> </properties> <profiles> - <!-- - Note: Build system profile has to come first! - Else it overwrites the chosen profile - --> + <!-- Note: Build system profile has to come first! Else it overwrites the + chosen profile --> <profile> - <id>linux-64</id> + <id>windows-64</id> <activation> <os> - <name>linux</name> + <family>windows</family> <arch>amd64</arch> </os> </activation> <properties> - <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32> - <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64> + <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32> + <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64> <swt.artifactId>${swt.artifactId.64}</swt.artifactId> - <target.name>linux</target.name> + <target.name>windows</target.name> </properties> </profile> <profile> - <id>linux</id> + <id>windows</id> <activation> <os> - <name>linux</name> + <family>windows</family> <arch>x86</arch> </os> </activation> <properties> - <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32> - <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64> + <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32> + <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64> <swt.artifactId>${swt.artifactId.32}</swt.artifactId> - <target.name>linux</target.name> + <target.name>windows</target.name> </properties> </profile> + <profile> - <id>windows</id> + <id>linux-64</id> <activation> <os> - <family>windows</family> - <arch>x86</arch> + <name>linux</name> + <arch>amd64</arch> </os> </activation> <properties> - <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32> - <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64> - <swt.artifactId>${swt.artifactId.32}</swt.artifactId> - <target.name>windows</target.name> + <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32> + <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64> + <swt.artifactId>${swt.artifactId.64}</swt.artifactId> + <target.name>linux</target.name> </properties> </profile> <profile> - <id>windows-64</id> + <id>linux</id> <activation> <os> - <family>windows</family> - <arch>amd64</arch> + <name>linux</name> + <arch>x86</arch> </os> </activation> <properties> - <swt.artifactId.32>org.eclipse.swt.win32.win32.x86</swt.artifactId.32> - <swt.artifactId.64>org.eclipse.swt.win32.win32.x86_64</swt.artifactId.64> - <swt.artifactId>${swt.artifactId.64}</swt.artifactId> - <target.name>windows</target.name> + <swt.artifactId.32>org.eclipse.swt.gtk.linux.x86</swt.artifactId.32> + <swt.artifactId.64>org.eclipse.swt.gtk.linux.x86_64</swt.artifactId.64> + <swt.artifactId>${swt.artifactId.32}</swt.artifactId> + <target.name>linux</target.name> </properties> </profile> + + <profile> <id>mac</id> <activation> diff --git a/pdf-over-install-helper/pom.xml b/pdf-over-install-helper/pom.xml index 17314706..9ca9eedb 100644 --- a/pdf-over-install-helper/pom.xml +++ b/pdf-over-install-helper/pom.xml @@ -1,64 +1,64 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - 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> - <parent> - <groupId>at.a-sit</groupId> - <artifactId>pdf-over</artifactId> - <version>4.1.17-SNAPSHOT</version> - </parent> - - <artifactId>pdf-over-install-helper</artifactId> - <version>1.0.0</version> - - <dependencies> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <version>3.7.0</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <verbose>true</verbose> - <showWarnings>true</showWarnings> - <showDeprecation>true</showDeprecation> - <encoding>UTF-8</encoding> - <debug>true</debug> - <debuglevel>lines,vars,source</debuglevel> - </configuration> - </plugin> -<!-- <plugin> --> -<!-- <artifactId>maven-release-plugin</artifactId> --> -<!-- <version>2.4.2</version> --> -<!-- <dependencies> --> -<!-- <dependency> --> -<!-- <groupId>org.apache.maven.scm</groupId> --> -<!-- <artifactId>maven-scm-provider-gitexe</artifactId> --> -<!-- <version>1.8.1</version> --> -<!-- </dependency> --> -<!-- </dependencies> --> -<!-- </plugin> --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>at.asit.helper.Main</mainClass> - </manifest> - <addMavenDescriptor>false</addMavenDescriptor> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>
+ <parent>
+ <groupId>at.a-sit</groupId>
+ <artifactId>pdf-over</artifactId>
+ <version>4.1.17-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>pdf-over-install-helper</artifactId>
+ <version>1.0.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ <verbose>true</verbose>
+ <showWarnings>true</showWarnings>
+ <showDeprecation>true</showDeprecation>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>lines,vars,source</debuglevel>
+ </configuration>
+ </plugin>
+<!-- <plugin> -->
+<!-- <artifactId>maven-release-plugin</artifactId> -->
+<!-- <version>2.4.2</version> -->
+<!-- <dependencies> -->
+<!-- <dependency> -->
+<!-- <groupId>org.apache.maven.scm</groupId> -->
+<!-- <artifactId>maven-scm-provider-gitexe</artifactId> -->
+<!-- <version>1.8.1</version> -->
+<!-- </dependency> -->
+<!-- </dependencies> -->
+<!-- </plugin> -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>at.asit.helper.Main</mainClass>
+ </manifest>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file diff --git a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java index 6fd5bdbb..9f39db2c 100644 --- a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java +++ b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java @@ -1,133 +1,133 @@ -package at.asit.helper; - -import java.io.File; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; - -import org.apache.commons.io.FileUtils; - - - - -/*** - * - * @author aabraham - * - * @version 1.0.0 - * - * The created jar is used as helper library when installing pdf-over. - * Basically, the helper determines the java version used including architecture and - * appends afterwards the right swt library since this swt is platform dependend. - * - */ -public class Main { - - public static void main(String[] args) { - - System.out.println("start post install task"); - - copyLib(); - - } - - - public static int getArchBits() { - String arch = System.getProperty("os.arch"); - return arch.contains("64") ? 64 : 32; - } - - public static String getSwtJarName() throws SWTLoadFailedException { - String os = System.getProperty("os.name").toLowerCase(); - if (os.contains("win")) - os = "windows"; - else if (os.contains("mac")) - os = "mac"; - else if (os.contains("linux") || os.contains("nix")) - os = "linux"; - else { - throw new SWTLoadFailedException("Unknown OS: " + os); - } - return "swt-" + os + "-" + getArchBits() + ".jar"; - } - - public static String getSwtJarPath() { - String path = ""; - try { - path = URLDecoder.decode(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8"); - int idx = path.lastIndexOf('/'); - idx = path.lastIndexOf('/', idx - 1); - path = path.substring(0, idx + 1); - } catch (UnsupportedEncodingException e) { - // Ignore - System.err.println("Unsuported Encoding Exception " + e.getMessage()); - } - return path + "lib-swt/"; - } - - private static class SWTLoadFailedException extends Exception { - private static final long serialVersionUID = 1L; - - SWTLoadFailedException(String msg) { - super(msg); - } - } - - - private static String getSwtTargetLibName() throws SWTLoadFailedException { - - String os = System.getProperty("os.name").toLowerCase(); - System.out.println("OS " + os + " detected!"); - String swtTargetLibName; - - if (os.contains("win")) { - swtTargetLibName = "org.eclipse.swt.win32.win32.x86-4.3.2.jar"; - } - else if (os.contains("mac")) { - swtTargetLibName = "org.eclipse.swt.cocoa.macosx-4.3.2.jar"; - } - else if (os.contains("linux") || os.contains("nix")) { - swtTargetLibName = "org.eclipse.swt.gtk.linux.x86-4.3.2.jar"; - } - else { - throw new SWTLoadFailedException("Unknown OS: " + os); - } - return swtTargetLibName; - - - } - - - private static void copyLib() { - try { - String swtLibPath = Main.getSwtJarPath() + Main.getSwtJarName(); - File swtLib = new File(swtLibPath); - if (!swtLib.isFile()) { - - System.err.println("not found "); - throw new SWTLoadFailedException("Library " + swtLibPath + " not found"); - } - - String newPath = swtLibPath.replace("lib-swt", "lib"); - newPath = newPath.replace(Main.getSwtJarName(), getSwtTargetLibName()); - File newFile = new File(newPath); - System.out.println("Source Lib " + swtLibPath.toString()); - System.out.println("Target Lib " + newFile.toString()); - FileUtils.copyFile(swtLib, newFile); - - if (!newFile.isFile()) { - System.err.println("not found "); - throw new SWTLoadFailedException("Library " + swtLibPath + " not found"); - } - - System.out.println("success "); - return; - - - } catch(Exception e){ - e.printStackTrace(); - } - - } - - -} +package at.asit.helper;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import org.apache.commons.io.FileUtils;
+
+
+
+
+/***
+ *
+ * @author aabraham
+ *
+ * @version 1.0.0
+ *
+ * The created jar is used as helper library when installing pdf-over.
+ * Basically, the helper determines the java version used including architecture and
+ * appends afterwards the right swt library since this swt is platform dependend.
+ *
+ */
+public class Main {
+
+ public static void main(String[] args) {
+
+ System.out.println("start post install task");
+
+ copyLib();
+
+ }
+
+
+ public static int getArchBits() {
+ String arch = System.getProperty("os.arch");
+ return arch.contains("64") ? 64 : 32;
+ }
+
+ public static String getSwtJarName() throws SWTLoadFailedException {
+ String os = System.getProperty("os.name").toLowerCase();
+ if (os.contains("win"))
+ os = "windows";
+ else if (os.contains("mac"))
+ os = "mac";
+ else if (os.contains("linux") || os.contains("nix"))
+ os = "linux";
+ else {
+ throw new SWTLoadFailedException("Unknown OS: " + os);
+ }
+ return "swt-" + os + "-" + getArchBits() + ".jar";
+ }
+
+ public static String getSwtJarPath() {
+ String path = "";
+ try {
+ path = URLDecoder.decode(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8");
+ int idx = path.lastIndexOf('/');
+ idx = path.lastIndexOf('/', idx - 1);
+ path = path.substring(0, idx + 1);
+ } catch (UnsupportedEncodingException e) {
+ // Ignore
+ System.err.println("Unsuported Encoding Exception " + e.getMessage());
+ }
+ return path + "lib-swt/";
+ }
+
+ private static class SWTLoadFailedException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ SWTLoadFailedException(String msg) {
+ super(msg);
+ }
+ }
+
+
+ private static String getSwtTargetLibName() throws SWTLoadFailedException {
+
+ String os = System.getProperty("os.name").toLowerCase();
+ System.out.println("OS " + os + " detected!");
+ String swtTargetLibName;
+
+ if (os.contains("win")) {
+ swtTargetLibName = "org.eclipse.swt.win32.win32.x86-4.3.2.jar";
+ }
+ else if (os.contains("mac")) {
+ swtTargetLibName = "org.eclipse.swt.cocoa.macosx-4.3.2.jar";
+ }
+ else if (os.contains("linux") || os.contains("nix")) {
+ swtTargetLibName = "org.eclipse.swt.gtk.linux.x86-4.3.2.jar";
+ }
+ else {
+ throw new SWTLoadFailedException("Unknown OS: " + os);
+ }
+ return swtTargetLibName;
+
+
+ }
+
+
+ private static void copyLib() {
+ try {
+ String swtLibPath = Main.getSwtJarPath() + Main.getSwtJarName();
+ File swtLib = new File(swtLibPath);
+ if (!swtLib.isFile()) {
+
+ System.err.println("not found ");
+ throw new SWTLoadFailedException("Library " + swtLibPath + " not found");
+ }
+
+ String newPath = swtLibPath.replace("lib-swt", "lib");
+ newPath = newPath.replace(Main.getSwtJarName(), getSwtTargetLibName());
+ File newFile = new File(newPath);
+ System.out.println("Source Lib " + swtLibPath.toString());
+ System.out.println("Target Lib " + newFile.toString());
+ FileUtils.copyFile(swtLib, newFile);
+
+ if (!newFile.isFile()) {
+ System.err.println("not found ");
+ throw new SWTLoadFailedException("Library " + swtLibPath + " not found");
+ }
+
+ System.out.println("success ");
+ return;
+
+
+ } catch(Exception e){
+ e.printStackTrace();
+ }
+
+ }
+
+
+}
diff --git a/pdf-over-signator/.classpath b/pdf-over-signator/.classpath index 1cf5d813..77af1552 100644 --- a/pdf-over-signator/.classpath +++ b/pdf-over-signator/.classpath @@ -17,7 +17,7 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> diff --git a/pdf-over-signator/.settings/org.eclipse.jdt.core.prefs b/pdf-over-signator/.settings/org.eclipse.jdt.core.prefs index d598cb6b..cc750108 100644 --- a/pdf-over-signator/.settings/org.eclipse.jdt.core.prefs +++ b/pdf-over-signator/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,NOTE diff --git a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml index 470e5cf5..0bc43c76 100644 --- a/pdf-over-signer/pdf-over-sigpdfas4/pom.xml +++ b/pdf-over-signer/pdf-over-sigpdfas4/pom.xml @@ -58,7 +58,7 @@ <repository> <id>pdf-as-4</id> <name>PDF-AS 4 Repository</name> - <url>https://joinup.ec.europa.eu/site/pdf-as/maven/</url> + <url>https://apps.egiz.gv.at/maven/</url> <!--url>http://demo.egiz.gv.at/pdf-as-mvn-snpshot/</url--> </repository> <repository> @@ -130,10 +130,10 @@ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.5.1</version>
+ <version>3.7.0</version>
<configuration>
- <source>1.6</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<verbose>true</verbose>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
|