From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 17 Jan 2020 11:03:05 +0000 (+0200)
Subject: Changes for Eclipse 2019-12 RCP platform compatibility.
X-Git-Tag: v1.43.0~132
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ec204ad47af27df24c9ca252f084ccc675b19e72;p=simantics%2Fplatform.git

Changes for Eclipse 2019-12 RCP platform compatibility.

* org.eclipse.equinox.util seems to have been removed, removed
  unnecessary dependencies to it
* Expand org.objectweb.asm* required version range to [5,8) from [5,6)
* Removed dependency on org.objectweb.asm.xml which no longer exists as
  a separate bundle.

gitlab #405

Change-Id: Idcb6fee939da8cda9d44f230fb6e6118bc9e5e6e
---

diff --git a/bundles/org.simantics.databoard/META-INF/MANIFEST.MF b/bundles/org.simantics.databoard/META-INF/MANIFEST.MF
index e44b55bd4..efa481726 100644
--- a/bundles/org.simantics.databoard/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.databoard/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ 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,6.0.0)";resolution:=optional;visibility:=reexport,
+ org.objectweb.asm;bundle-version="[5.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,
diff --git a/bundles/org.simantics.fastlz/META-INF/MANIFEST.MF b/bundles/org.simantics.fastlz/META-INF/MANIFEST.MF
index 9dce61586..f05b9d965 100644
--- a/bundles/org.simantics.fastlz/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fastlz/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Activator: org.simantics.fastlz.bundle.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.12.0";resolution:=optional,
  org.simantics.compressions;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.300",
  org.eclipse.equinox.ds;bundle-version="1.3.1",
  org.eclipse.osgi.services;bundle-version="3.3.0"
 Export-Package: org.simantics.fastlz
diff --git a/bundles/org.simantics.lz4/META-INF/MANIFEST.MF b/bundles/org.simantics.lz4/META-INF/MANIFEST.MF
index 205be1f23..173d0c6ca 100644
--- a/bundles/org.simantics.lz4/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.lz4/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Export-Package: net.jpountz.lz4,
  org.simantics.lz4
 Require-Bundle: org.eclipse.osgi,
  org.simantics.compressions;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.300",
  org.eclipse.equinox.ds;bundle-version="1.3.1",
  org.eclipse.osgi.services;bundle-version="3.3.0"
 Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF
index 627eac496..70bb068b3 100644
--- a/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.compiler/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: gnu.trove3;bundle-version="3.0.0",
  org.simantics.scl.runtime;bundle-version="0.1.4";visibility:=reexport,
  org.junit;bundle-version="4.12.0";resolution:=optional,
- org.objectweb.asm;bundle-version="[5.0.0,6.0.0)",
- org.objectweb.asm.commons;bundle-version="[5.0.0,6.0.0)",
- org.objectweb.asm.util;bundle-version="[5.0.0,6.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"
 Export-Package: org.cojen.classfile,
  org.simantics.scl.compiler.commands,
diff --git a/features/org.simantics.scl.feature/feature.xml b/features/org.simantics.scl.feature/feature.xml
index e87b68842..5082bdc63 100644
--- a/features/org.simantics.scl.feature/feature.xml
+++ b/features/org.simantics.scl.feature/feature.xml
@@ -213,13 +213,6 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.objectweb.asm.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.fasterxml.jackson.core.jackson-core"
          download-size="0"