From: Tuukka Lehtonen Date: Tue, 26 May 2020 08:56:52 +0000 (+0300) Subject: Upgrade to zt-process-killer 1.10 to fix illegal reflective access X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F4257%2F2;p=simantics%2Fdistrict.git Upgrade to zt-process-killer 1.10 to fix illegal reflective access This works properly with JavaSE-11. gitlab #89 Change-Id: I7674dab1bbd2fc0258091d5ffd6faa092413e584 --- diff --git a/org.simantics.maps.server/.classpath b/org.simantics.maps.server/.classpath index 787d0beb..559578e2 100644 --- a/org.simantics.maps.server/.classpath +++ b/org.simantics.maps.server/.classpath @@ -1,13 +1,8 @@ - - - - - - - - + + + diff --git a/org.simantics.maps.server/META-INF/MANIFEST.MF b/org.simantics.maps.server/META-INF/MANIFEST.MF index 33594f65..75b8e768 100644 --- a/org.simantics.maps.server/META-INF/MANIFEST.MF +++ b/org.simantics.maps.server/META-INF/MANIFEST.MF @@ -5,22 +5,19 @@ Bundle-SymbolicName: org.simantics.maps.server;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.district.maps.server.Activator Require-Bundle: org.eclipse.core.runtime, - org.apache.commons.lang;bundle-version="2.6.0", org.slf4j.api, com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.5", com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.5", - com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0" + com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0", + org.apache.commons.io;bundle-version="2.6.0", + com.sun.jna;bundle-version="4.2.0", + org.yaml.snakeyaml Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., - lib/zt-exec-1.9.jar, - lib/commons-io-2.5.jar, - lib/slf4j-api-1.7.24.jar, - lib/logback-classic-1.2.1.jar, - lib/logback-core-1.2.1.jar, - lib/snakeyaml-1.18.jar, - lib/jna-4.3.0.jar, - lib/zt-process-killer-1.6.jar + lib/commons-lang3-3.8.1.jar, + lib/zt-exec-1.11.jar, + lib/zt-process-killer-1.10.jar Export-Package: org.simantics.district.maps.server, org.simantics.district.maps.server.prefs Eclipse-BundleShape: dir diff --git a/org.simantics.maps.server/lib/commons-io-2.5.jar b/org.simantics.maps.server/lib/commons-io-2.5.jar deleted file mode 100644 index 107b061f..00000000 Binary files a/org.simantics.maps.server/lib/commons-io-2.5.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/commons-lang3-3.8.1.jar b/org.simantics.maps.server/lib/commons-lang3-3.8.1.jar new file mode 100644 index 00000000..2c65ce67 Binary files /dev/null and b/org.simantics.maps.server/lib/commons-lang3-3.8.1.jar differ diff --git a/org.simantics.maps.server/lib/jna-4.3.0.jar b/org.simantics.maps.server/lib/jna-4.3.0.jar deleted file mode 100644 index 713354e5..00000000 Binary files a/org.simantics.maps.server/lib/jna-4.3.0.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/logback-classic-1.2.1.jar b/org.simantics.maps.server/lib/logback-classic-1.2.1.jar deleted file mode 100644 index 4b6e8844..00000000 Binary files a/org.simantics.maps.server/lib/logback-classic-1.2.1.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/logback-core-1.2.1.jar b/org.simantics.maps.server/lib/logback-core-1.2.1.jar deleted file mode 100644 index 840b0f52..00000000 Binary files a/org.simantics.maps.server/lib/logback-core-1.2.1.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/slf4j-api-1.7.24.jar b/org.simantics.maps.server/lib/slf4j-api-1.7.24.jar deleted file mode 100644 index 05941a12..00000000 Binary files a/org.simantics.maps.server/lib/slf4j-api-1.7.24.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/snakeyaml-1.18.jar b/org.simantics.maps.server/lib/snakeyaml-1.18.jar deleted file mode 100644 index e3fac8e7..00000000 Binary files a/org.simantics.maps.server/lib/snakeyaml-1.18.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/zt-exec-1.11.jar b/org.simantics.maps.server/lib/zt-exec-1.11.jar new file mode 100644 index 00000000..ba258997 Binary files /dev/null and b/org.simantics.maps.server/lib/zt-exec-1.11.jar differ diff --git a/org.simantics.maps.server/lib/zt-exec-1.9.jar b/org.simantics.maps.server/lib/zt-exec-1.9.jar deleted file mode 100644 index 9b4b7a37..00000000 Binary files a/org.simantics.maps.server/lib/zt-exec-1.9.jar and /dev/null differ diff --git a/org.simantics.maps.server/lib/zt-process-killer-1.10.jar b/org.simantics.maps.server/lib/zt-process-killer-1.10.jar new file mode 100644 index 00000000..734d31c7 Binary files /dev/null and b/org.simantics.maps.server/lib/zt-process-killer-1.10.jar differ diff --git a/org.simantics.maps.server/lib/zt-process-killer-1.6.jar b/org.simantics.maps.server/lib/zt-process-killer-1.6.jar deleted file mode 100644 index ad4eb0e7..00000000 Binary files a/org.simantics.maps.server/lib/zt-process-killer-1.6.jar and /dev/null differ