From 1cf41378385e84adbfeecda477b1a70047917cf3 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Fri, 28 Feb 2020 13:53:16 +0200
Subject: [PATCH] Fetch eclipse-collections from p2 repo to get OSGI version
 automatically

gitlab #486

Change-Id: Ifc15996271c165300212368bb90b09427d24a850
---
 .../org.simantics.g2d/META-INF/MANIFEST.MF    |  3 +--
 .../META-INF/MANIFEST.MF                      |  3 +--
 .../org.simantics.g2d.feature/feature.xml     | 21 +++++--------------
 .../org.simantics.utils.feature/feature.xml   | 18 ++++------------
 ...imantics.sdk.build.targetdefinition.target | 11 +++++-----
 ...g.simantics.sdk.build.targetdefinition.tpd |  9 ++++----
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/bundles/org.simantics.g2d/META-INF/MANIFEST.MF b/bundles/org.simantics.g2d/META-INF/MANIFEST.MF
index 72e1218cb..07ccffae9 100644
--- a/bundles/org.simantics.g2d/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.g2d/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.db;bundle-version="1.1.0",
  org.simantics.ui;bundle-version="1.0.0",
  org.slf4j.api,
- org.eclipse.collections.eclipse-collections-api,
- org.eclipse.collections.eclipse-collections
+ org.eclipse.collections
 Export-Package: org.simantics.g2d.canvas,
  org.simantics.g2d.canvas.impl,
  org.simantics.g2d.chassis,
diff --git a/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF b/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF
index 3a701176c..4383ce856 100644
--- a/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.utils.datastructures/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@ Require-Bundle: org.simantics.utils.thread;bundle-version="1.0.0";visibility:=re
  gnu.trove3;bundle-version="3.0.0",
  org.simantics.databoard;bundle-version="0.6.5";resolution:=optional,
  org.slf4j.api,
- org.eclipse.collections.eclipse-collections,
- org.eclipse.collections.eclipse-collections-api
+ org.eclipse.collections
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.simantics.utils.datastructures
diff --git a/features/org.simantics.g2d.feature/feature.xml b/features/org.simantics.g2d.feature/feature.xml
index 1f262aca3..fdb6644f4 100644
--- a/features/org.simantics.g2d.feature/feature.xml
+++ b/features/org.simantics.g2d.feature/feature.xml
@@ -40,6 +40,10 @@
          id="org.jfree"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.collections.feature"
+         version="0.0.0"/>
+
    <plugin
          id="org.simantics.scenegraph"
          download-size="0"
@@ -114,8 +118,7 @@
          id="com.famfamfam.silk"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="true"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.simantics.scenegraph.swing"
@@ -208,18 +211,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.collections.eclipse-collections"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.collections.eclipse-collections-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/features/org.simantics.utils.feature/feature.xml b/features/org.simantics.utils.feature/feature.xml
index 279fdc0df..64a2dd468 100644
--- a/features/org.simantics.utils.feature/feature.xml
+++ b/features/org.simantics.utils.feature/feature.xml
@@ -28,6 +28,10 @@
       [Enter License Description here.]
    </license>
 
+   <includes
+         id="org.eclipse.collections.feature"
+         version="0.0.0"/>
+
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
@@ -62,20 +66,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.collections.eclipse-collections"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.collections.eclipse-collections-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.collections4"
          download-size="0"
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 9175207dd..1c82f03d7 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1582875181">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1582892875">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -167,6 +167,11 @@
       <unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201806070735"/>
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.0/incubation/"/>
     </location>
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.collections.feature.feature.group" version="10.1.0.v20200211-1558"/>
+      <unit id="org.eclipse.collections.feature.source.feature.group" version="10.1.0.v20200211-1558"/>
+      <repository location="https://download.eclipse.org/collections/10.2.0/repository/"/>
+    </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
       <unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>
@@ -306,10 +311,6 @@
       <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api" version="10.2.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="10.2.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections" version="10.2.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections.source" version="10.2.0"/>
       <unit id="org.eclipse.jetty.servlets" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.24.v20191120"/>
       <unit id="com.github.benmanes.caffeine" version="2.8.1"/>
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 dd49d5340..cdd287b66 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
@@ -168,6 +168,11 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/incubation/" {
 	org.eclipse.nebula.examples.incubation.feature.feature.group
 }
 
+location "https://download.eclipse.org/collections/10.2.0/repository/" {
+	org.eclipse.collections.feature.feature.group
+	org.eclipse.collections.feature.source.feature.group
+}
+
 location "http://www.simantics.org/download/master/external-components/maven/" {
 	bouncycastle.bcmail-jdk14
 	bouncycastle.bcprov-jdk14
@@ -307,10 +312,6 @@ location "http://www.simantics.org/download/master/external-components/maven/" {
 	org.bouncycastle.bcprov-jdk14.source
 	org.bouncycastle.bctsp-jdk14
 	org.bouncycastle.bctsp-jdk14.source
-	org.eclipse.collections.eclipse-collections-api
-	org.eclipse.collections.eclipse-collections-api.source
-	org.eclipse.collections.eclipse-collections
-	org.eclipse.collections.eclipse-collections.source
 	org.eclipse.jetty.servlets
 	org.eclipse.jetty.servlets.source
 	com.github.benmanes.caffeine
-- 
2.47.1