From 18b7a61bc747668d394aa813b1f0994635a30747 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 3 Apr 2017 13:34:26 +0300
Subject: [PATCH] Don't bundle org.simantics.fileimport into sysdyn features
 unnecessarily

Also removed the no longer needed -Djava.util.Arrays.useLegacyMergeSort
option from the product launch configuration.

refs #7126

Change-Id: I2818e5dcb382f12abf297cfcd329e5bc627cf2f7
---
 .../feature.xml                                   |  7 -------
 ...simantics.sysdyn.build.targetdefinition.target | 15 +++++++--------
 .../sysdyn.product                                |  4 ++--
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index dccf2b59..9be31b8f 100644
--- a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -132,11 +132,4 @@ v1.0 which accompanies this distribution, and is available at
          version="0.0.0"
          fragment="true"/>
 
-   <plugin
-         id="org.simantics.fileimport"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
index 8bceefeb..322ff17f 100644
--- a/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
+++ b/releng/org.simantics.sysdyn.build.targetdefinition/org.simantics.sysdyn.build.targetdefinition.target
@@ -4,7 +4,7 @@
 <target name="Simantics SDK" sequenceNumber="100">
 <locations>
 <location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.simantics.sdk.feature.group" version="1.28.0"/>
+<unit id="org.simantics.sdk.feature.group" version="1.29.0"/>
 <repository location="http://www.simantics.org/download/master/sdk"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -133,10 +133,10 @@
 <unit id="com.koloboke.impl-common-jdk8.source" version="1.0.0"/>
 <unit id="com.lowagie.text" version="2.1.7.b1"/>
 <unit id="com.lowagie.text.source" version="2.1.7.b1"/>
-<unit id="com.sun.jna" version="4.2.2"/>
-<unit id="com.sun.jna.source" version="4.2.2"/>
-<unit id="com.sun.jna.platform" version="4.2.2"/>
-<unit id="com.sun.jna.platform.source" version="4.2.2"/>
+<unit id="com.sun.jna" version="4.3.0"/>
+<unit id="com.sun.jna.source" version="4.3.0"/>
+<unit id="com.sun.jna.platform" version="4.3.0"/>
+<unit id="com.sun.jna.platform.source" version="4.3.0"/>
 <unit id="freemarker" version="2.3.23.stable"/>
 <unit id="freemarker.source" version="2.3.23.stable"/>
 <unit id="gnu.trove2" version="2.1.0"/>
@@ -146,7 +146,6 @@
 <unit id="it.unimi.dsi.fastutil" version="7.0.13"/>
 <unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>
 <unit id="jakarta-regexp" version="1.4.0"/>
-<unit id="javax.vecmath" version="1.5.2"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
 <unit id="net.ucanaccess" version="3.0.7"/>
@@ -192,8 +191,8 @@
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
 <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
-<unit id="org.jdom2" version="2.0.6"/>
-<unit id="org.jdom2.source" version="2.0.6"/>
+<unit id="org.jdom2" version="2.0.6.b0001"/>
+<unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
 <unit id="org.jfree.jchart.source" version="1.0.19"/>
 <unit id="org.jfree.jcommon" version="1.0.23"/>
diff --git a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
index f510fd6b..46bcc9ce 100644
--- a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
+++ b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
@@ -18,7 +18,7 @@
 --launcher.XXMaxPermSize 192m
 -data @noDefault
       </programArgs>
-      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Djava.util.Arrays.useLegacyMergeSort=true -Declipse.workaround.bug467000=true
+      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Declipse.workaround.bug467000=true
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -131,7 +131,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />      
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
    </configurations>
 
-- 
2.47.1