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

diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index dccf2b59aa0fa8d9261a8584c87bb416424410bd..9be31b8f810c14bd8957ac590bc5e3f22aabc563 100644 (file)
--- 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"\r
          fragment="true"/>\r
 \r
-   <plugin\r
-         id="org.simantics.fileimport"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
 </feature>\r

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 8bceefeb9c863f5f0487bfdf349dc45021dc31a6..322ff17f2d0112416cf3a20d1615d227cf74bd57 100644 (file)
--- 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">\r
 <locations>\r
 <location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.simantics.sdk.feature.group" version="1.28.0"/>\r
+<unit id="org.simantics.sdk.feature.group" version="1.29.0"/>\r
 <repository location="http://www.simantics.org/download/master/sdk"/>\r
 </location>\r
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
@@ -133,10 +133,10 @@
 <unit id="com.koloboke.impl-common-jdk8.source" version="1.0.0"/>\r
 <unit id="com.lowagie.text" version="2.1.7.b1"/>\r
 <unit id="com.lowagie.text.source" version="2.1.7.b1"/>\r
-<unit id="com.sun.jna" version="4.2.2"/>\r
-<unit id="com.sun.jna.source" version="4.2.2"/>\r
-<unit id="com.sun.jna.platform" version="4.2.2"/>\r
-<unit id="com.sun.jna.platform.source" version="4.2.2"/>\r
+<unit id="com.sun.jna" version="4.3.0"/>\r
+<unit id="com.sun.jna.source" version="4.3.0"/>\r
+<unit id="com.sun.jna.platform" version="4.3.0"/>\r
+<unit id="com.sun.jna.platform.source" version="4.3.0"/>\r
 <unit id="freemarker" version="2.3.23.stable"/>\r
 <unit id="freemarker.source" version="2.3.23.stable"/>\r
 <unit id="gnu.trove2" version="2.1.0"/>\r
@@ -146,7 +146,6 @@
 <unit id="it.unimi.dsi.fastutil" version="7.0.13"/>\r
 <unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>\r
 <unit id="jakarta-regexp" version="1.4.0"/>\r
-<unit id="javax.vecmath" version="1.5.2"/>\r
 <unit id="net.jcip.annotations" version="1.0.0"/>\r
 <unit id="net.jcip.annotations.source" version="1.0.0"/>\r
 <unit id="net.ucanaccess" version="3.0.7"/>\r
@@ -192,8 +191,8 @@
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>\r
 <unit id="org.hsqldb.hsqldb" version="2.3.1"/>\r
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>\r
-<unit id="org.jdom2" version="2.0.6"/>\r
-<unit id="org.jdom2.source" version="2.0.6"/>\r
+<unit id="org.jdom2" version="2.0.6.b0001"/>\r
+<unit id="org.jdom2.source" version="2.0.6.b0001"/>\r
 <unit id="org.jfree.jchart" version="1.0.19"/>\r
 <unit id="org.jfree.jchart.source" version="1.0.19"/>\r
 <unit id="org.jfree.jcommon" version="1.0.23"/>\r

diff --git a/releng/org.simantics.sysdyn.rcp.product/sysdyn.product b/releng/org.simantics.sysdyn.rcp.product/sysdyn.product
index f510fd6bc64ddcedb3d54395989669ee58659abf..46bcc9ce91a2f846d396c7093fa17e417c47155d 100644 (file)
--- 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\r
       </programArgs>\r
-      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Djava.util.Arrays.useLegacyMergeSort=true -Declipse.workaround.bug467000=true\r
+      <vmArgs>-ea -Xmx768M -Xshare:off -Dorg.simantics.undo.enabled=true -Declipse.workaround.bug467000=true\r
       </vmArgs>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
       </vmArgsMac>\r
@@ -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" />\r
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />      \r
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />\r
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
    </configurations>\r
 \r