From: Tuukka Lehtonen Date: Thu, 27 Feb 2020 11:59:15 +0000 (+0200) Subject: Tons of dependency fixes and updates X-Git-Tag: v1.43.0~72^2 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=15a0f229f7340ed92e9157049483ed71f54677f9;p=simantics%2Fplatform.git Tons of dependency fixes and updates * Removed unused JARs from org.simantics.scenegraph and re-exported org.apache.batik from there instead of including three old batik JARs internally to export the batik parser. * Replaced all dependencies on org.apache.commons.collections with org.apache.commons.collections4 * Removed version specifiers from all org.slf4j.api and org.eclipse.collections.eclipse-collections* dependencies to avoid the need to modify them down the road with new major releases * Explicitly specified all Jetty dependencies to be on version 9.4.24 in an attempt to avoid OSGi (Felix) bundle wiring performance problems experienced by Marko in recent developments. gitlab #485 gitlab #486 Change-Id: Id5a3d62a007fad4a45f601b4d471f061395e556b --- diff --git a/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF b/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF index 66804effb..99de36b58 100644 --- a/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF +++ b/bundles/hdf.hdf5lib/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Export-Package: hdf.hdf5lib, hdf.hdf5lib.structs Bundle-NativeCode: hdf5_java.dll; processor=x86_64; osname=win32, libhdf5.so.101; libhdf5_java.so; processor=x86_64; osname=linux -Require-Bundle: org.slf4j.api;bundle-version="1.7.2" +Require-Bundle: org.slf4j.api Automatic-Module-Name: hdf.hdf5lib diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF index 3bf81207b..dba6d1125 100644 --- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: gnu.trove3;bundle-version="3.0.0", org.simantics.backup, org.eclipse.core.runtime;bundle-version="3.11.1", org.simantics.db.procore, - org.slf4j.api;bundle-version="1.7.2" + org.slf4j.api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Activator: org.simantics.acorn.internal.Activator diff --git a/bundles/org.simantics.annotation.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.annotation.ui/META-INF/MANIFEST.MF index 752c445b5..f6239e0fa 100644 --- a/bundles/org.simantics.annotation.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.annotation.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui, org.simantics.modeling.ui;bundle-version="1.1.1", org.simantics.graph.db;bundle-version="1.1.9", org.simantics.views.swt.client;bundle-version="1.0.0", - org.slf4j.api;bundle-version="1.7.20" + org.slf4j.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: VTT Technical Research Centre of Finland diff --git a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF index 245787d59..7c26acd26 100644 --- a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF @@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.core.runtime, com.fasterxml.jackson.core.jackson-core, org.slf4j.api, javax.servlet-api, - javax.ws.rs-api, - org.eclipse.jetty.server, - org.eclipse.jetty.servlet, - org.eclipse.jetty.util, + jakarta.ws.rs-api, + org.eclipse.jetty.server;bundle-version="9.4.24", + org.eclipse.jetty.servlet;bundle-version="9.4.24", + org.eclipse.jetty.util;bundle-version="9.4.24", org.glassfish.jersey.core.jersey-server, org.glassfish.jersey.media.jersey-media-json-jackson, org.glassfish.jersey.containers.jersey-container-servlet-core, diff --git a/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF b/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF index 29026a5ac..c5a97df31 100644 --- a/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.basicexpression/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Export-Package: org.simantics.basicexpression, org.simantics.basicexpression.lexer, org.simantics.basicexpression.node, org.simantics.basicexpression.parser -Require-Bundle: org.slf4j.api;bundle-version="1.7.25" +Require-Bundle: org.slf4j.api Automatic-Module-Name: org.simantics.basicexpression diff --git a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF index 132fd69fc..061c8106c 100644 --- a/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.browsing.ui.swt/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.simantics.utils.thread.swt;bundle-version="1.0.0", org.eclipse.ui.forms;bundle-version="3.4.1", com.lowagie.text;bundle-version="2.1.5", org.eclipse.e4.core.contexts;bundle-version="1.4.0", - org.slf4j.api;bundle-version="1.7.20", + org.slf4j.api, org.eclipse.mylyn.wikitext;bundle-version="3.0.6", org.eclipse.mylyn.wikitext.mediawiki;bundle-version="3.0.6" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.simantics.databoard/META-INF/MANIFEST.MF b/bundles/org.simantics.databoard/META-INF/MANIFEST.MF index efa481726..e6bac61b7 100644 --- a/bundles/org.simantics.databoard/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.databoard/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ Bundle-SymbolicName: org.simantics.databoard;singleton:=true Bundle-Version: 0.6.6.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;resolution:=optional, - org.objectweb.asm;bundle-version="[5.0.0,8.0.0)";resolution:=optional;visibility:=reexport, + org.objectweb.asm;bundle-version="[7.0.0,8.0.0)";resolution:=optional;visibility:=reexport, gnu.trove3;bundle-version="3.0.0", org.eclipse.help;bundle-version="3.5.100";resolution:=optional, org.eclipse.swt;bundle-version="3.7.1";resolution:=optional, org.eclipse.jface;bundle-version="3.7.0";resolution:=optional, org.eclipse.core.runtime;bundle-version="3.7.0";resolution:=optional, - org.apache.commons.collections;bundle-version="3.2.1", - org.slf4j.api + org.slf4j.api, + org.apache.commons.collections4;bundle-version="4.1.0" Export-Package: org.simantics.databoard, org.simantics.databoard.accessor, org.simantics.databoard.accessor.binary, diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java index a674943d5..066ed4c88 100644 --- a/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java +++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/adapter/AdapterFactory.java @@ -14,8 +14,8 @@ package org.simantics.databoard.adapter; import java.util.ArrayList; import java.util.Map; -import org.apache.commons.collections.map.ReferenceMap; -import org.simantics.databoard.Bindings; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.map.ReferenceMap; import org.simantics.databoard.Units; import org.simantics.databoard.binding.ArrayBinding; import org.simantics.databoard.binding.Binding; @@ -52,9 +52,8 @@ import org.simantics.databoard.util.ObjectUtils; */ public class AdapterFactory { - @SuppressWarnings( "unchecked" ) - Map cache = (Map) new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.HARD); - + Map cache = new ReferenceMap<>(ReferenceStrength.SOFT, ReferenceStrength.HARD); + public synchronized Adapter getAdapter(Binding domain, Binding range, boolean typeAdapter, boolean mustClone) throws AdapterConstructionException { diff --git a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF index 501876664..c503105ad 100644 --- a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.apache.lucene4.queryparser;bundle-version="4.9.0", org.apache.lucene4.analyzers-common;bundle-version="4.9.0", org.simantics.db.services;bundle-version="0.8.0", - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.db.indexing Bundle-Activator: org.simantics.db.indexing.Activator diff --git a/bundles/org.simantics.db.services/META-INF/MANIFEST.MF b/bundles/org.simantics.db.services/META-INF/MANIFEST.MF index bb78bf41e..1615af354 100644 --- a/bundles/org.simantics.db.services/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.db.services/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: VTT Technical Research Centre of Finland Require-Bundle: org.eclipse.core.runtime, gnu.trove3, org.simantics.layer0x.ontology;bundle-version="1.0.0", - org.slf4j.api;bundle-version="1.7.25", + org.slf4j.api, org.simantics.utils;bundle-version="1.1.0", org.simantics.db;bundle-version="1.1.0", org.simantics.scl.reflection, diff --git a/bundles/org.simantics.db.testing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.testing/META-INF/MANIFEST.MF index 960ccf009..172f1d94c 100644 --- a/bundles/org.simantics.db.testing/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.db.testing/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.simantics.db.layer0;bundle-version="1.1.0", org.junit;bundle-version="4.12.0", org.simantics.db.server, org.apache.commons.math3, - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Export-Package: org.simantics.db.testing.annotation, org.simantics.db.testing.base, org.simantics.db.testing.cases, diff --git a/bundles/org.simantics.debug.browser/META-INF/MANIFEST.MF b/bundles/org.simantics.debug.browser/META-INF/MANIFEST.MF index 398b4bce1..40c2261e0 100644 --- a/bundles/org.simantics.debug.browser/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.debug.browser/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.debug.browser.internal.Activator Require-Bundle: org.simantics;bundle-version="1.0.0", gnu.trove3;bundle-version="3.0.3", - org.eclipse.jetty.server, - org.eclipse.jetty.servlet, - org.eclipse.jetty.http;bundle-version="9.2.13", - org.eclipse.jetty.util;bundle-version="9.2.13" + org.eclipse.jetty.server;bundle-version="9.4.24", + org.eclipse.jetty.servlet;bundle-version="9.4.24", + org.eclipse.jetty.http;bundle-version="9.4.24", + org.eclipse.jetty.util;bundle-version="9.4.24" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.debug.browser.content, diff --git a/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF b/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF index b50e13d63..696289911 100644 --- a/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Require-Bundle: org.simantics.db;bundle-version="1.1.0", org.eclipse.ui;bundle-version="3.6.0", org.simantics.ui;bundle-version="1.0.0", com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8", - org.slf4j.api;bundle-version="1.7.25", + org.slf4j.api, com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8" Automatic-Module-Name: org.simantics.debug.graphical diff --git a/bundles/org.simantics.diagram.svg/META-INF/MANIFEST.MF b/bundles/org.simantics.diagram.svg/META-INF/MANIFEST.MF index 0a4be8445..6a264d10d 100644 --- a/bundles/org.simantics.diagram.svg/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.diagram.svg/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.simantics.db.management;bundle-version="1.1.0", org.simantics.structural.ontology;bundle-version="1.2.0", org.simantics.structural2;bundle-version="1.1.1", - org.apache.batik;bundle-version="1.8.0" + org.apache.batik;bundle-version="1.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.diagram.svg.export diff --git a/bundles/org.simantics.diagram/META-INF/MANIFEST.MF b/bundles/org.simantics.diagram/META-INF/MANIFEST.MF index 6ca327d19..e3b4965f0 100644 --- a/bundles/org.simantics.diagram/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.diagram/META-INF/MANIFEST.MF @@ -45,7 +45,7 @@ Require-Bundle: org.simantics.utils.thread.swt, org.eclipse.e4.ui.services, org.eclipse.e4.core.contexts, org.eclipse.e4.ui.workbench, - org.slf4j.api;bundle-version="1.7.20", + org.slf4j.api, org.simantics.browsing.ui Export-Package: org.simantics.diagram, org.simantics.diagram.adapter, diff --git a/bundles/org.simantics.document.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.document.ui/META-INF/MANIFEST.MF index b226c5aac..69407d21f 100644 --- a/bundles/org.simantics.document.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.document.ui/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.ui, org.simantics.annotation.ui;bundle-version="1.0.0", org.eclipse.ui.editors;bundle-version="3.9.0", org.eclipse.jface.text, - org.slf4j.api;bundle-version="1.7.2" + org.slf4j.api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.document.ui, diff --git a/bundles/org.simantics.g2d/META-INF/MANIFEST.MF b/bundles/org.simantics.g2d/META-INF/MANIFEST.MF index ee5b50be2..72e1218cb 100644 --- a/bundles/org.simantics.g2d/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.g2d/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.core.runtime, org.simantics.utils.thread, org.simantics.utils.thread.swt, org.simantics.utils.ui;bundle-version="1.0.0", - org.apache.commons.collections;bundle-version="3.2.1", org.apache.commons.math3, gnu.trove3;bundle-version="3.0.0", org.simantics.scenegraph;bundle-version="1.1.1";visibility:=reexport, diff --git a/bundles/org.simantics.graph.db/META-INF/MANIFEST.MF b/bundles/org.simantics.graph.db/META-INF/MANIFEST.MF index 2bd96db62..cc44b5143 100644 --- a/bundles/org.simantics.graph.db/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.graph.db/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.simantics.graph;bundle-version="1.0.0";visibility:=reexport, org.simantics.db.common;bundle-version="0.8.0", gnu.trove3;bundle-version="3.0.3", org.simantics.layer0;bundle-version="1.0.0", - org.slf4j.api;bundle-version="1.7.2" + org.slf4j.api Export-Package: org.simantics.graph.db Bundle-Vendor: VTT Technical Research Centre of Finland Automatic-Module-Name: org.simantics.graph.db diff --git a/bundles/org.simantics.graphviz/META-INF/MANIFEST.MF b/bundles/org.simantics.graphviz/META-INF/MANIFEST.MF index ea99ad54b..a14646ade 100644 --- a/bundles/org.simantics.graphviz/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.graphviz/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.simantics.graphviz Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.simantics.graphviz.Activator Require-Bundle: org.eclipse.core.runtime, - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.graphviz, diff --git a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF index 030278955..c9f04535f 100644 --- a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF @@ -9,16 +9,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.simantics.history;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.13.0", org.glassfish.jersey.core.jersey-server, - javax.ws.rs-api, + jakarta.ws.rs-api, org.simantics.scl.compiler, org.simantics.scl.osgi, org.eclipse.jetty.servlet, org.glassfish.jersey.containers.jersey-container-servlet-core, javax.servlet-api, - org.eclipse.jetty.server, - org.eclipse.jetty.util, - org.eclipse.jetty.io, - org.eclipse.jetty.servlets, + org.eclipse.jetty.server;bundle-version="9.4.24", + org.eclipse.jetty.util;bundle-version="9.4.24", + org.eclipse.jetty.io;bundle-version="9.4.24", + org.eclipse.jetty.servlets;bundle-version="9.4.24", com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8", com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0", com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8", @@ -32,7 +32,6 @@ Require-Bundle: org.simantics.history;bundle-version="1.0.0", org.simantics.db;bundle-version="1.1.0", org.simantics.db.common;bundle-version="1.1.0", org.simantics.db.layer0;bundle-version="1.1.0", - org.simantics;bundle-version="1.0.0", - org.eclipse.jetty.servlets + org.simantics;bundle-version="1.0.0" Bundle-ClassPath: . Export-Package: org.simantics.history.rest diff --git a/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF b/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF index 8199e8979..ff2ac4851 100644 --- a/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.jdbc/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.osgi, org.simantics.simulator.toolkit, org.simantics.databoard, gnu.trove3;bundle-version="3.0.3", - org.slf4j.api;bundle-version="1.7.25", + org.slf4j.api, org.simantics.db.layer0, org.simantics.simulator.toolkit.db, org.simantics, @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.osgi, io.netty.common;bundle-version="4.1.27", io.netty.handler;bundle-version="4.1.27", io.netty.transport;bundle-version="4.1.27", - pgjdbc-ng;bundle-version="0.7.1" + com.impossibl.pgjdbc-ng;bundle-version="0.8.3" Export-Package: org.simantics.jdbc, org.simantics.jdbc.variable Automatic-Module-Name: org.simantics.jdbc diff --git a/bundles/org.simantics.jdbc/src/org/simantics/jdbc/variable/JDBCSessionManager.java b/bundles/org.simantics.jdbc/src/org/simantics/jdbc/variable/JDBCSessionManager.java index 17ffcf143..9e0c03bfd 100644 --- a/bundles/org.simantics.jdbc/src/org/simantics/jdbc/variable/JDBCSessionManager.java +++ b/bundles/org.simantics.jdbc/src/org/simantics/jdbc/variable/JDBCSessionManager.java @@ -110,7 +110,7 @@ public class JDBCSessionManager extends StandardVariableSessionManager - - - diff --git a/bundles/org.simantics.scenegraph/META-INF/MANIFEST.MF b/bundles/org.simantics.scenegraph/META-INF/MANIFEST.MF index f2c70f5c6..a8a1a1543 100644 --- a/bundles/org.simantics.scenegraph/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scenegraph/META-INF/MANIFEST.MF @@ -8,24 +8,19 @@ Require-Bundle: gnu.trove3;bundle-version="3.0.0", org.simantics.utils.thread;bundle-version="1.0.0", org.simantics.utils.datastructures;bundle-version="1.1.0", org.jfree.jchart;bundle-version="1.0.12", - org.jfree.jcommon;bundle-version="1.0.15", org.junit;resolution:=optional, org.simantics.scl.runtime;bundle-version="0.1.4", org.simantics.databoard;bundle-version="0.6.3", com.lowagie.text;bundle-version="2.1.7";resolution:=optional, org.simantics.utils;bundle-version="1.1.0", - org.slf4j.api + org.slf4j.api, + org.apache.batik;bundle-version="1.12.0";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., - lib/svgSalamander-tiny.jar, - lib/batik-parser-1.8.jar, - lib/batik-awt-util-1.8.jar, - lib/batik-util-1.8.jar + lib/svgSalamander-tiny.jar Export-Package: com.kitfox.svg, com.kitfox.svg.animation, com.kitfox.svg.xml, - org.apache.batik.ext.awt.geom, - org.apache.batik.parser, org.simantics.scenegraph, org.simantics.scenegraph.adapters, org.simantics.scenegraph.g2d, diff --git a/bundles/org.simantics.scenegraph/build.properties b/bundles/org.simantics.scenegraph/build.properties index dc6fde4b2..1fe8ef8ce 100644 --- a/bundles/org.simantics.scenegraph/build.properties +++ b/bundles/org.simantics.scenegraph/build.properties @@ -17,8 +17,5 @@ bin.includes = META-INF/,\ TROVE-README-license.txt,\ TROVE-LICENSE.txt,\ README.txt,\ - JSI-LICENSE.txt,\ - lib/batik-parser-1.8.jar,\ - lib/batik-awt-util-1.8.jar,\ - lib/batik-util-1.8.jar + JSI-LICENSE.txt diff --git a/bundles/org.simantics.scenegraph/lib/batik-awt-util-1.8.jar b/bundles/org.simantics.scenegraph/lib/batik-awt-util-1.8.jar deleted file mode 100644 index ce0be3cd0..000000000 Binary files a/bundles/org.simantics.scenegraph/lib/batik-awt-util-1.8.jar and /dev/null differ diff --git a/bundles/org.simantics.scenegraph/lib/batik-parser-1.8.jar b/bundles/org.simantics.scenegraph/lib/batik-parser-1.8.jar deleted file mode 100644 index 01108ad7c..000000000 Binary files a/bundles/org.simantics.scenegraph/lib/batik-parser-1.8.jar and /dev/null differ diff --git a/bundles/org.simantics.scenegraph/lib/batik-util-1.8.jar b/bundles/org.simantics.scenegraph/lib/batik-util-1.8.jar deleted file mode 100644 index cb1c63f19..000000000 Binary files a/bundles/org.simantics.scenegraph/lib/batik-util-1.8.jar and /dev/null differ diff --git a/bundles/org.simantics.scenegraph/lib/jcommon-1.0.16.jar b/bundles/org.simantics.scenegraph/lib/jcommon-1.0.16.jar deleted file mode 100644 index 4cd680744..000000000 Binary files a/bundles/org.simantics.scenegraph/lib/jcommon-1.0.16.jar and /dev/null differ diff --git a/bundles/org.simantics.scenegraph/lib/jfreechart-1.0.13.jar b/bundles/org.simantics.scenegraph/lib/jfreechart-1.0.13.jar deleted file mode 100644 index 83c699318..000000000 Binary files a/bundles/org.simantics.scenegraph/lib/jfreechart-1.0.13.jar and /dev/null differ diff --git a/bundles/org.simantics.scl.compiler.decompiler/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.compiler.decompiler/META-INF/MANIFEST.MF index 118ada9c4..ca72d6cee 100644 --- a/bundles/org.simantics.scl.compiler.decompiler/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.compiler.decompiler/META-INF/MANIFEST.MF @@ -5,10 +5,7 @@ Bundle-SymbolicName: org.simantics.scl.compiler.decompiler Bundle-Version: 1.0.0.qualifier Fragment-Host: org.simantics.scl.compiler;bundle-version="0.6.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.jboss.windup.decompiler.procyon;bundle-version="4.0.0", - org.jboss.windup.decompiler.procyon.windup-procyon-compilertools;bundle-version="1.0.0", - org.jboss.windup.decompiler.procyon.windup-procyon-core;bundle-version="1.0.0", - org.jboss.windup.decompiler.procyon.windup-procyon-reflection;bundle-version="1.0.0", - org.jboss.windup.decompiler.api.forge-addon;bundle-version="4.0.0", - org.jboss.windup.utils.windup-utils.forge-addon;bundle-version="4.0.0" +Require-Bundle: org.jboss.windup.decompiler.api.forge-addon;bundle-version="4.0.0", + org.bitbucket.mstrobel.procyon-compilertools;bundle-version="0.5.33", + org.bitbucket.mstrobel.procyon-core;bundle-version="0.5.33" Automatic-Module-Name: org.simantics.scl.compiler.decompiler diff --git a/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF index 70bb068b3..9436bf45a 100644 --- a/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: gnu.trove3;bundle-version="3.0.0", org.objectweb.asm;bundle-version="[5.0.0,8.0.0)", org.objectweb.asm.commons;bundle-version="[5.0.0,8.0.0)", org.objectweb.asm.util;bundle-version="[5.0.0,8.0.0)", - org.slf4j.api;bundle-version="1.7.2" + org.slf4j.api Export-Package: org.cojen.classfile, org.simantics.scl.compiler.commands, org.simantics.scl.compiler.common.datatypes, diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/common/exceptions/InternalCompilerError.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/common/exceptions/InternalCompilerError.java index 1c2709665..a3b646134 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/common/exceptions/InternalCompilerError.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/common/exceptions/InternalCompilerError.java @@ -22,6 +22,11 @@ public class InternalCompilerError extends RuntimeException { this.location = Locations.NO_LOCATION; } + public InternalCompilerError(String message, Throwable cause) { + super(message, cause); + this.location = Locations.NO_LOCATION; + } + public InternalCompilerError(long location, String message) { super(message); this.location = location; diff --git a/bundles/org.simantics.scl.db/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.db/META-INF/MANIFEST.MF index 8d826cfa3..8ae00989f 100644 --- a/bundles/org.simantics.scl.db/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.db/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime, org.simantics.application, org.simantics.db.management, org.simantics.layer0.utils, - org.slf4j.api;bundle-version="1.7.0" + org.slf4j.api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: VTT Technical Research Centre of Finland Export-Package: org.simantics.scl.db diff --git a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/OsgiJavaReferenceValidatorFactory.java b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/OsgiJavaReferenceValidatorFactory.java index 2f3c869b4..69a724e9f 100644 --- a/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/OsgiJavaReferenceValidatorFactory.java +++ b/bundles/org.simantics.scl.osgi/src/org/simantics/scl/osgi/internal/OsgiJavaReferenceValidatorFactory.java @@ -33,7 +33,7 @@ public class OsgiJavaReferenceValidatorFactory implements JavaReferenceValidator try { bundle.start(); } catch (BundleException e) { - throw new InternalCompilerError("Couldn't activate bundle " + bundle.getSymbolicName() + ". Bundle state is " + BundleUtils.resolveBundleState(bundle)); + throw new InternalCompilerError("Couldn't activate bundle " + bundle.getSymbolicName() + ". Bundle state is " + BundleUtils.resolveBundleState(bundle), e); } wiring = bundle.adapt(BundleWiring.class); } diff --git a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF index e950c170f..2c2f670f8 100644 --- a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF @@ -4,17 +4,15 @@ Bundle-Name: Simantics SCL REST-Server Bundle-SymbolicName: org.simantics.scl.rest Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.scl.rest.Activator -Require-Bundle: org.eclipse.core.runtime, - org.glassfish.jersey.core.jersey-server, - javax.ws.rs-api, +Require-Bundle: org.glassfish.jersey.core.jersey-server, org.simantics.scl.compiler, org.simantics.scl.osgi, - org.eclipse.jetty.servlet, org.glassfish.jersey.containers.jersey-container-servlet-core, javax.servlet-api, - org.eclipse.jetty.server, - org.eclipse.jetty.util, - org.eclipse.jetty.io, + org.eclipse.jetty.servlet;bundle-version="9.4.24", + org.eclipse.jetty.server;bundle-version="9.4.24", + org.eclipse.jetty.util;bundle-version="9.4.24", + org.eclipse.jetty.io;bundle-version="9.4.24", com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8", com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0", com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8", @@ -24,7 +22,9 @@ Require-Bundle: org.eclipse.core.runtime, org.jvnet.mimepull;bundle-version="1.9.6", org.glassfish.jersey.core.jersey-client, org.glassfish.jersey.core.jersey-common;bundle-version="2.25.1", - org.simantics.scl.runtime + org.simantics.scl.runtime, + org.eclipse.osgi;bundle-version="3.15.100", + jakarta.ws.rs-api;bundle-version="2.1.6" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.simantics.scl.rest diff --git a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF index 0cb8969b4..a6e51513f 100644 --- a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Export-Package: org.simantics.scl.runtime, Require-Bundle: org.junit;bundle-version="4.12.0";resolution:=optional, gnu.trove3;bundle-version="3.0.0", org.simantics.databoard;bundle-version="0.6.5";visibility:=reexport, - org.slf4j.api;bundle-version="1.7.20" + org.slf4j.api Automatic-Module-Name: org.simantics.scl.runtime diff --git a/bundles/org.simantics.simulation/META-INF/MANIFEST.MF b/bundles/org.simantics.simulation/META-INF/MANIFEST.MF index 06a61d2b9..91143806f 100644 --- a/bundles/org.simantics.simulation/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.simulation/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.simantics.ui;bundle-version="1.0.0", org.simantics.fastlz;bundle-version="1.2.1", org.apache.commons.compress;bundle-version="1.7.0", org.simantics.lz4;bundle-version="1.3.0", - org.slf4j.api;bundle-version="1.7.0" + org.slf4j.api Export-Package: org.simantics.simulation, org.simantics.simulation.data, org.simantics.simulation.experiment, diff --git a/bundles/org.simantics.simulator.toolkit.db/META-INF/MANIFEST.MF b/bundles/org.simantics.simulator.toolkit.db/META-INF/MANIFEST.MF index b9b735d66..71eeafa2a 100644 --- a/bundles/org.simantics.simulator.toolkit.db/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.simulator.toolkit.db/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.simantics.simulator.toolkit;bundle-version="1.0.0";visibility:=reexport, org.simantics.db.layer0;bundle-version="1.1.0", - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Export-Package: org.simantics.simulator.toolkit.db Bundle-Vendor: Semantum Oy Automatic-Module-Name: org.simantics.simulator.toolkit.db diff --git a/bundles/org.simantics.simulator.toolkit/META-INF/MANIFEST.MF b/bundles/org.simantics.simulator.toolkit/META-INF/MANIFEST.MF index 1053c9637..cc7c0ec58 100644 --- a/bundles/org.simantics.simulator.toolkit/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.simulator.toolkit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.simantics.simulator.variable;bundle-version="1.0.0";visibility:=reexport, org.simantics.simulator;bundle-version="1.0.0";visibility:=reexport, gnu.trove3;bundle-version="3.0.3", - org.slf4j.api;bundle-version="1.7.25", + org.slf4j.api, org.simantics.simulation.sequences;bundle-version="1.0.0";visibility:=reexport, org.eclipse.core.runtime, org.simantics.databoard;bundle-version="0.6.6", diff --git a/bundles/org.simantics.simulator/META-INF/MANIFEST.MF b/bundles/org.simantics.simulator/META-INF/MANIFEST.MF index 0bbebef43..15db71778 100644 --- a/bundles/org.simantics.simulator/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.simulator/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Simulator Bundle-SymbolicName: org.simantics.simulator Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.slf4j.api;bundle-version="1.7.25", +Require-Bundle: org.slf4j.api, org.eclipse.core.runtime, org.simantics.databoard;bundle-version="0.6.6" Export-Package: org.simantics.simulator diff --git a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF index 4972e5078..8ac7bbc9e 100644 --- a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF @@ -29,7 +29,7 @@ Require-Bundle: org.simantics.layer0.utils, org.eclipse.e4.core.contexts, org.eclipse.e4.ui.di, org.simantics.browsing.ui.swt, - org.slf4j.api;bundle-version="1.7.20", + org.slf4j.api, org.simantics.simulator.toolkit;bundle-version="1.0.0", org.simantics.simulator.toolkit.db;bundle-version="1.0.0" Export-Package: org.apache.commons.math3.stat.regression, diff --git a/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF index 2bbd595f7..4d8866492 100644 --- a/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Require-Bundle: org.simantics.utils.datastructures;bundle-version="1.0.0", org.simantics.simulator.toolkit;bundle-version="1.0.0", org.simantics.structural.synchronization;bundle-version="1.0.0", org.apache.poi, - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Bundle-Vendor: VTT Technical Research Centre of Finland Automatic-Module-Name: org.simantics.spreadsheet diff --git a/bundles/org.simantics.structural2/META-INF/MANIFEST.MF b/bundles/org.simantics.structural2/META-INF/MANIFEST.MF index 1e43cc4c1..893b512ac 100644 --- a/bundles/org.simantics.structural2/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.structural2/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.simantics.structural.ontology;bundle-version="1.0.0", org.simantics.simulator.variable;bundle-version="1.0.0", org.simantics.scl.osgi;bundle-version="1.0.0", org.simantics;bundle-version="1.0.0", - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Export-Package: org.simantics.structural2, org.simantics.structural2.modelingRules, org.simantics.structural2.procedural, diff --git a/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF b/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF index 1b012d999..3a701176c 100644 --- a/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF @@ -20,8 +20,8 @@ Require-Bundle: org.simantics.utils.thread;bundle-version="1.0.0";visibility:=re org.simantics.utils;bundle-version="1.0.0", gnu.trove3;bundle-version="3.0.0", org.simantics.databoard;bundle-version="0.6.5";resolution:=optional, - org.slf4j.api;bundle-version="1.7.25", - org.eclipse.collections.eclipse-collections;bundle-version="9.2.0", - org.eclipse.collections.eclipse-collections-api;bundle-version="9.2.0" + org.slf4j.api, + org.eclipse.collections.eclipse-collections, + org.eclipse.collections.eclipse-collections-api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.simantics.utils.datastructures diff --git a/bundles/org.simantics.utils/META-INF/MANIFEST.MF b/bundles/org.simantics.utils/META-INF/MANIFEST.MF index 9abadd88e..832fa5bdb 100644 --- a/bundles/org.simantics.utils/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.utils/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Export-Package: org.simantics.utils, Bundle-ClassPath: . Require-Bundle: org.junit;bundle-version="4.12.0";resolution:=optional, org.simantics.databoard;bundle-version="0.6.2", - org.slf4j.api;bundle-version="1.7.20" + org.slf4j.api Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.simantics.utils diff --git a/bundles/org.simantics.views.swt/META-INF/MANIFEST.MF b/bundles/org.simantics.views.swt/META-INF/MANIFEST.MF index f90a7a7dd..cd17a1872 100644 --- a/bundles/org.simantics.views.swt/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.views.swt/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.simantics.browsing.ui.swt;bundle-version="1.1.0";visibility: org.simantics.scenegraph.loader;bundle-version="1.0.0";visibility:=reexport, org.simantics.scenegraph.ontology;bundle-version="1.0.0", org.simantics.utils.thread.swt;bundle-version="1.1.0", - org.slf4j.api;bundle-version="1.7.25" + org.slf4j.api Export-Package: org.simantics.views.swt Bundle-Activator: org.simantics.views.swt.Activator Bundle-Vendor: Semantum Oy diff --git a/bundles/org.simantics.workbench/META-INF/MANIFEST.MF b/bundles/org.simantics.workbench/META-INF/MANIFEST.MF index 968c1f344..65da27858 100644 --- a/bundles/org.simantics.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.workbench/META-INF/MANIFEST.MF @@ -43,7 +43,7 @@ Require-Bundle: com.ibm.icu, org.eclipse.e4.ui.di;bundle-version="1.1.0", org.eclipse.e4.core.contexts, org.eclipse.e4.ui.services, - org.slf4j.api;bundle-version="1.7.20" + org.slf4j.api Import-Package: javax.inject Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/features/org.jfree.feature/feature.xml b/features/org.jfree.feature/feature.xml index 1afb8a6f3..64d7a8066 100644 --- a/features/org.jfree.feature/feature.xml +++ b/features/org.jfree.feature/feature.xml @@ -88,11 +88,4 @@ If the Library as you received it specifies that a proxy can decide whether futu version="0.0.0" unpack="false"/> - - diff --git a/features/org.simantics.data.feature/feature.xml b/features/org.simantics.data.feature/feature.xml index 86408f00a..daf0be719 100644 --- a/features/org.simantics.data.feature/feature.xml +++ b/features/org.simantics.data.feature/feature.xml @@ -36,7 +36,7 @@ unpack="false"/> - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 64ab6dc3b..9175207dd 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,7 +1,7 @@ - + @@ -38,6 +38,16 @@ + + + + + + + + + + @@ -168,40 +178,42 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -210,49 +222,45 @@ - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + @@ -260,14 +268,12 @@ - - - - + + - - + + @@ -288,107 +294,85 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index 8bca4a7d7..dd49d5340 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -39,6 +39,16 @@ location "http://www.simantics.org/update/2019-12/" { org.eclipse.emf.sdk.feature.group org.eclipse.epp.mpc.feature.group org.eclipse.epp.mpc.source.feature.group + org.eclipse.jetty.continuation + org.eclipse.jetty.continuation.source + org.eclipse.jetty.http + org.eclipse.jetty.http.source + org.eclipse.jetty.io + org.eclipse.jetty.io.source + org.eclipse.jetty.server + org.eclipse.jetty.server.source + org.eclipse.jetty.util + org.eclipse.jetty.util.source org.eclipse.mylyn.wikitext_feature.feature.group org.eclipse.mylyn.wikitext.ant.source org.eclipse.mylyn.wikitext.mediawiki.source @@ -158,7 +168,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/incubation/" { org.eclipse.nebula.examples.incubation.feature.feature.group } -location "http://www.simantics.org/download/master/external-components/maven" { +location "http://www.simantics.org/download/master/external-components/maven/" { bouncycastle.bcmail-jdk14 bouncycastle.bcprov-jdk14 ch.qos.logback.classic @@ -203,6 +213,8 @@ location "http://www.simantics.org/download/master/external-components/maven" { com.fasterxml.woodstox.woodstox-core.source com.healthmarketscience.jackcess com.healthmarketscience.jackcess.source + com.influxdb.client-java + com.influxdb.client-java.source com.koloboke.api-jdk8 com.koloboke.api-jdk8.source com.koloboke.compile @@ -211,10 +223,6 @@ location "http://www.simantics.org/download/master/external-components/maven" { com.koloboke.impl-common-jdk8.source com.lowagie.text com.lowagie.text.source - com.sun.jna - com.sun.jna.platform - com.sun.jna.platform.source - com.sun.jna.source freemarker freemarker.source gnu.trove3 @@ -246,14 +254,14 @@ location "http://www.simantics.org/download/master/external-components/maven" { it.unimi.dsi.fastutil it.unimi.dsi.fastutil.source jakarta-regexp - javassist - javassist.source javax.servlet-api javax.servlet-api.source - javax.validation.api - javax.validation.api.source - javax.ws.rs-api - javax.ws.rs-api.source + jakarta.xml.bind-api + jakarta.xml.bind-api.source + jakarta.validation.jakarta.validation-api + jakarta.validation.jakarta.validation-api.source + jakarta.ws.rs-api + jakarta.ws.rs-api.source net.jcip.annotations net.jcip.annotations.source net.ucanaccess @@ -261,10 +269,8 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.antlr.runtime org.antlr.runtime.source org.apache.aries.spifly.dynamic.bundle - org.apache.commons.codec - org.apache.commons.codec.source - org.apache.commons.collections - org.apache.commons.collections.source + org.apache.commons.commons-codec + org.apache.commons.commons-codec.source org.apache.commons.collections4 org.apache.commons.collections4.source org.apache.commons.compress @@ -305,32 +311,24 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.eclipse.collections.eclipse-collections-api.source org.eclipse.collections.eclipse-collections org.eclipse.collections.eclipse-collections.source - org.eclipse.jetty.continuation - org.eclipse.jetty.continuation.source - org.eclipse.jetty.http - org.eclipse.jetty.http.source - org.eclipse.jetty.io - org.eclipse.jetty.io.source - org.eclipse.jetty.server - org.eclipse.jetty.server.source org.eclipse.jetty.servlets org.eclipse.jetty.servlets.source - org.eclipse.jetty.util - org.eclipse.jetty.util.source com.github.benmanes.caffeine com.github.benmanes.caffeine.source - org.glassfish.hk2.api - org.glassfish.hk2.api.source - org.glassfish.hk2.locator - org.glassfish.hk2.locator.source + //org.glassfish.hk2.api + //org.glassfish.hk2.api.source + //org.glassfish.hk2.locator + //org.glassfish.hk2.locator.source org.glassfish.hk2.osgi-resource-locator org.glassfish.hk2.osgi-resource-locator.source - org.glassfish.hk2.utils - org.glassfish.hk2.utils.source - org.glassfish.jersey.bundles.repackaged.jersey-guava - org.glassfish.jersey.bundles.repackaged.jersey-guava.source - org.glassfish.hk2.external.aopalliance-repackaged - org.glassfish.hk2.external.aopalliance-repackaged.source + //org.glassfish.hk2.utils + //org.glassfish.hk2.utils.source + //org.glassfish.jersey.bundles.repackaged.jersey-guava + //org.glassfish.jersey.bundles.repackaged.jersey-guava.source + //org.glassfish.hk2.external.aopalliance-repackaged + //org.glassfish.hk2.external.aopalliance-repackaged.source + org.glassfish.hk2.external.jakarta.inject + org.glassfish.hk2.external.jakarta.inject.source org.glassfish.jersey.core.jersey-client org.glassfish.jersey.core.jersey-client.source org.glassfish.jersey.core.jersey-common @@ -353,12 +351,10 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.jboss.windup.decompiler.api.forge-addon.source org.jboss.windup.decompiler.procyon org.jboss.windup.decompiler.procyon.source - org.jboss.windup.decompiler.procyon.windup-procyon-compilertools - org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source - org.jboss.windup.decompiler.procyon.windup-procyon-core - org.jboss.windup.decompiler.procyon.windup-procyon-core.source - org.jboss.windup.decompiler.procyon.windup-procyon-reflection - org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source + org.bitbucket.mstrobel.procyon-compilertools + org.bitbucket.mstrobel.procyon-compilertools.source + org.bitbucket.mstrobel.procyon-core + org.bitbucket.mstrobel.procyon-core.source org.jboss.windup.utils.windup-utils.forge-addon org.jboss.windup.utils.windup-utils.forge-addon.source jaxen @@ -367,8 +363,6 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.jdom2.source org.jfree.jchart org.jfree.jchart.source - org.jfree.jcommon - org.jfree.jcommon.source org.jsoup org.jsoup.source org.jvnet.mimepull @@ -385,8 +379,8 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.yaml.snakeyaml.source org.zeroturnaround.zt-exec org.zeroturnaround.zt-exec.source - pgjdbc-ng - pgjdbc-ng.source + com.impossibl.pgjdbc-ng + com.impossibl.pgjdbc-ng.source stax2-api stax2-api.source } diff --git a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin.launch b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin.launch index cb98442a6..484db5564 100644 --- a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin.launch +++ b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin.launch @@ -60,7 +60,7 @@ - + diff --git a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin2.launch b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin2.launch index 306635d31..74c1f77b3 100644 --- a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin2.launch +++ b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin2.launch @@ -60,7 +60,7 @@ - + diff --git a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin64.launch b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin64.launch index d7bdd406e..d0bd9bb6c 100644 --- a/tests/org.simantics.db.tests/launch/RegressionTestsPlugin64.launch +++ b/tests/org.simantics.db.tests/launch/RegressionTestsPlugin64.launch @@ -60,7 +60,7 @@ - + diff --git a/tests/org.simantics.db.tests/launch/TempTestsPlugin.launch b/tests/org.simantics.db.tests/launch/TempTestsPlugin.launch index 485bc8fb8..bc1440108 100644 --- a/tests/org.simantics.db.tests/launch/TempTestsPlugin.launch +++ b/tests/org.simantics.db.tests/launch/TempTestsPlugin.launch @@ -40,7 +40,7 @@ - + diff --git a/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF b/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF index d21946107..74bc6ee4c 100644 --- a/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF +++ b/tests/org.simantics.scl.compiler.tests/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.objectweb.asm.util, ch.qos.logback.classic;bundle-version="1.1.7", ch.qos.logback.core;bundle-version="1.1.7", - org.apache.commons.collections;bundle-version="3.2.2", org.eclipse.equinox.ds;bundle-version="1.4.300", org.slf4j.api Automatic-Module-Name: org.simantics.scl.compiler.tests