Fixes for Simantics R before branching 1.31.0.

* Removed bin directory unnecessarily put in the repository
* Switched from Tycho 0.26 to 1.0.0
* Added TPD file to generate the target platform for the build
* Removed 32-bit linux build from the build configurations
* Removed unnecessary configuration from features/pom.xml

refs #7398

Change-Id: Id7a16f4edfc9743c3a55937b3e8cafc0070aa225

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index d0555d03644fed01c9a102d1d9f22302299d5210..8359a6da098fc18bb8d340c371362380d7156595 100644 (file)
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>\r
     <groupId>org.eclipse.tycho.extras</groupId>\r
     <artifactId>tycho-pomless</artifactId>\r
-    <version>0.26.0</version>\r
+    <version>1.0.0</version>\r
   </extension>\r
 </extensions> \r

diff --git a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class
deleted file mode 100644 (file)
index 51895a1..0000000
Binary files a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/Activator.class and /dev/null differ

diff --git a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class b/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class
deleted file mode 100644 (file)
index a9919ae..0000000
Binary files a/bundles/org.simantics.r.fileimport/bin/org/simantics/r/fileimport/RFileImport.class and /dev/null differ

diff --git a/bundles/org.simantics.r.ontology/graph.tg b/bundles/org.simantics.r.ontology/graph.tg
index 3ad1a743ad9f52e8da2ccf35a1f2f5aa7bdc40f1..303a33aad629a9a26cf5b52e765305bdf164d855 100644 (file)
Binary files a/bundles/org.simantics.r.ontology/graph.tg and b/bundles/org.simantics.r.ontology/graph.tg differ

diff --git a/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java b/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java
index 64015408895afc1df0fd2a96dd06e9e3c4ca840b..41664a87e7efcf709600563bb29c0ec344358a11 100644 (file)
--- a/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java
+++ b/bundles/org.simantics.r.ontology/src/org/simantics/r/RResource.java
@@ -1,112 +1,112 @@
-package org.simantics.r;\r
-\r
-import org.simantics.db.RequestProcessor;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.request.Read;\r
-import org.simantics.db.Session;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.service.QueryControl;\r
-\r
-public class RResource {\r
-    \r
-    public final Resource Model;\r
-    public final Resource RProperty;\r
-    public final Resource Script;\r
-    public final Resource Script_text;\r
-    public final Resource Script_text_Inverse;\r
-    public final Resource Session;\r
-    public final Resource SessionConfiguration;\r
-    public final Resource SessionConfiguration_hasScript;\r
-    public final Resource SessionConfiguration_host;\r
-    public final Resource SessionConfiguration_host_Inverse;\r
-    public final Resource SessionConfiguration_password;\r
-    public final Resource SessionConfiguration_password_Inverse;\r
-    public final Resource SessionConfiguration_port;\r
-    public final Resource SessionConfiguration_port_Inverse;\r
-    public final Resource SessionConfiguration_username;\r
-    public final Resource SessionConfiguration_username_Inverse;\r
-    public final Resource Session_hasValue;\r
-    public final Resource Session_hasValue_Inverse;\r
-    public final Resource TabContribution;\r
-        \r
-    public static class URIs {\r
-        public static final String Model = "http://www.simantics.org/R-1.0/Model";\r
-        public static final String RProperty = "http://www.simantics.org/R-1.0/RProperty";\r
-        public static final String Script = "http://www.simantics.org/R-1.0/Script";\r
-        public static final String Script_text = "http://www.simantics.org/R-1.0/Script/text";\r
-        public static final String Script_text_Inverse = "http://www.simantics.org/R-1.0/Script/text/Inverse";\r
-        public static final String Session = "http://www.simantics.org/R-1.0/Session";\r
-        public static final String SessionConfiguration = "http://www.simantics.org/R-1.0/SessionConfiguration";\r
-        public static final String SessionConfiguration_hasScript = "http://www.simantics.org/R-1.0/SessionConfiguration/hasScript";\r
-        public static final String SessionConfiguration_host = "http://www.simantics.org/R-1.0/SessionConfiguration/host";\r
-        public static final String SessionConfiguration_host_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/host/Inverse";\r
-        public static final String SessionConfiguration_password = "http://www.simantics.org/R-1.0/SessionConfiguration/password";\r
-        public static final String SessionConfiguration_password_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/password/Inverse";\r
-        public static final String SessionConfiguration_port = "http://www.simantics.org/R-1.0/SessionConfiguration/port";\r
-        public static final String SessionConfiguration_port_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/port/Inverse";\r
-        public static final String SessionConfiguration_username = "http://www.simantics.org/R-1.0/SessionConfiguration/username";\r
-        public static final String SessionConfiguration_username_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/username/Inverse";\r
-        public static final String Session_hasValue = "http://www.simantics.org/R-1.0/Session/hasValue";\r
-        public static final String Session_hasValue_Inverse = "http://www.simantics.org/R-1.0/Session/hasValue/Inverse";\r
-        public static final String TabContribution = "http://www.simantics.org/R-1.0/TabContribution";\r
-    }\r
-    \r
-    public static Resource getResourceOrNull(ReadGraph graph, String uri) {\r
-        try {\r
-            return graph.getResource(uri);\r
-        } catch(DatabaseException e) {\r
-            System.err.println(e.getMessage());\r
-            return null;\r
-        }\r
-    }\r
-    \r
-    public RResource(ReadGraph graph) {\r
-        Model = getResourceOrNull(graph, URIs.Model);\r
-        RProperty = getResourceOrNull(graph, URIs.RProperty);\r
-        Script = getResourceOrNull(graph, URIs.Script);\r
-        Script_text = getResourceOrNull(graph, URIs.Script_text);\r
-        Script_text_Inverse = getResourceOrNull(graph, URIs.Script_text_Inverse);\r
-        Session = getResourceOrNull(graph, URIs.Session);\r
-        SessionConfiguration = getResourceOrNull(graph, URIs.SessionConfiguration);\r
-        SessionConfiguration_hasScript = getResourceOrNull(graph, URIs.SessionConfiguration_hasScript);\r
-        SessionConfiguration_host = getResourceOrNull(graph, URIs.SessionConfiguration_host);\r
-        SessionConfiguration_host_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_host_Inverse);\r
-        SessionConfiguration_password = getResourceOrNull(graph, URIs.SessionConfiguration_password);\r
-        SessionConfiguration_password_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_password_Inverse);\r
-        SessionConfiguration_port = getResourceOrNull(graph, URIs.SessionConfiguration_port);\r
-        SessionConfiguration_port_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_port_Inverse);\r
-        SessionConfiguration_username = getResourceOrNull(graph, URIs.SessionConfiguration_username);\r
-        SessionConfiguration_username_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_username_Inverse);\r
-        Session_hasValue = getResourceOrNull(graph, URIs.Session_hasValue);\r
-        Session_hasValue_Inverse = getResourceOrNull(graph, URIs.Session_hasValue_Inverse);\r
-        TabContribution = getResourceOrNull(graph, URIs.TabContribution);\r
-    }\r
-    \r
-    public static RResource getInstance(ReadGraph graph) {\r
-        Session session = graph.getSession();\r
-        RResource ret = session.peekService(RResource.class);\r
-        if(ret == null) {\r
-            QueryControl qc = graph.getService(QueryControl.class);\r
-            ret = new RResource(qc.getIndependentGraph(graph));\r
-            session.registerService(RResource.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-    public static RResource getInstance(RequestProcessor session) throws DatabaseException {\r
-        RResource ret = session.peekService(RResource.class);\r
-        if(ret == null) {\r
-            ret = session.syncRequest(new Read<RResource>() {\r
-                public RResource perform(ReadGraph graph) throws DatabaseException {\r
-                    QueryControl qc = graph.getService(QueryControl.class);\r
-                    return new RResource(qc.getIndependentGraph(graph));\r
-                }\r
-            });\r
-            session.registerService(RResource.class, ret);\r
-        }\r
-        return ret;\r
-    }\r
-    \r
-}\r
-\r
+package org.simantics.r;
+
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.request.Read;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.service.QueryControl;
+
+public class RResource {
+    
+    public final Resource Model;
+    public final Resource RProperty;
+    public final Resource Script;
+    public final Resource Script_text;
+    public final Resource Script_text_Inverse;
+    public final Resource Session;
+    public final Resource SessionConfiguration;
+    public final Resource SessionConfiguration_hasScript;
+    public final Resource SessionConfiguration_host;
+    public final Resource SessionConfiguration_host_Inverse;
+    public final Resource SessionConfiguration_password;
+    public final Resource SessionConfiguration_password_Inverse;
+    public final Resource SessionConfiguration_port;
+    public final Resource SessionConfiguration_port_Inverse;
+    public final Resource SessionConfiguration_username;
+    public final Resource SessionConfiguration_username_Inverse;
+    public final Resource Session_hasValue;
+    public final Resource Session_hasValue_Inverse;
+    public final Resource TabContribution;
+        
+    public static class URIs {
+        public static final String Model = "http://www.simantics.org/R-1.0/Model";
+        public static final String RProperty = "http://www.simantics.org/R-1.0/RProperty";
+        public static final String Script = "http://www.simantics.org/R-1.0/Script";
+        public static final String Script_text = "http://www.simantics.org/R-1.0/Script/text";
+        public static final String Script_text_Inverse = "http://www.simantics.org/R-1.0/Script/text/Inverse";
+        public static final String Session = "http://www.simantics.org/R-1.0/Session";
+        public static final String SessionConfiguration = "http://www.simantics.org/R-1.0/SessionConfiguration";
+        public static final String SessionConfiguration_hasScript = "http://www.simantics.org/R-1.0/SessionConfiguration/hasScript";
+        public static final String SessionConfiguration_host = "http://www.simantics.org/R-1.0/SessionConfiguration/host";
+        public static final String SessionConfiguration_host_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/host/Inverse";
+        public static final String SessionConfiguration_password = "http://www.simantics.org/R-1.0/SessionConfiguration/password";
+        public static final String SessionConfiguration_password_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/password/Inverse";
+        public static final String SessionConfiguration_port = "http://www.simantics.org/R-1.0/SessionConfiguration/port";
+        public static final String SessionConfiguration_port_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/port/Inverse";
+        public static final String SessionConfiguration_username = "http://www.simantics.org/R-1.0/SessionConfiguration/username";
+        public static final String SessionConfiguration_username_Inverse = "http://www.simantics.org/R-1.0/SessionConfiguration/username/Inverse";
+        public static final String Session_hasValue = "http://www.simantics.org/R-1.0/Session/hasValue";
+        public static final String Session_hasValue_Inverse = "http://www.simantics.org/R-1.0/Session/hasValue/Inverse";
+        public static final String TabContribution = "http://www.simantics.org/R-1.0/TabContribution";
+    }
+    
+    public static Resource getResourceOrNull(ReadGraph graph, String uri) {
+        try {
+            return graph.getResource(uri);
+        } catch(DatabaseException e) {
+            System.err.println(e.getMessage());
+            return null;
+        }
+    }
+    
+    public RResource(ReadGraph graph) {
+        Model = getResourceOrNull(graph, URIs.Model);
+        RProperty = getResourceOrNull(graph, URIs.RProperty);
+        Script = getResourceOrNull(graph, URIs.Script);
+        Script_text = getResourceOrNull(graph, URIs.Script_text);
+        Script_text_Inverse = getResourceOrNull(graph, URIs.Script_text_Inverse);
+        Session = getResourceOrNull(graph, URIs.Session);
+        SessionConfiguration = getResourceOrNull(graph, URIs.SessionConfiguration);
+        SessionConfiguration_hasScript = getResourceOrNull(graph, URIs.SessionConfiguration_hasScript);
+        SessionConfiguration_host = getResourceOrNull(graph, URIs.SessionConfiguration_host);
+        SessionConfiguration_host_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_host_Inverse);
+        SessionConfiguration_password = getResourceOrNull(graph, URIs.SessionConfiguration_password);
+        SessionConfiguration_password_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_password_Inverse);
+        SessionConfiguration_port = getResourceOrNull(graph, URIs.SessionConfiguration_port);
+        SessionConfiguration_port_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_port_Inverse);
+        SessionConfiguration_username = getResourceOrNull(graph, URIs.SessionConfiguration_username);
+        SessionConfiguration_username_Inverse = getResourceOrNull(graph, URIs.SessionConfiguration_username_Inverse);
+        Session_hasValue = getResourceOrNull(graph, URIs.Session_hasValue);
+        Session_hasValue_Inverse = getResourceOrNull(graph, URIs.Session_hasValue_Inverse);
+        TabContribution = getResourceOrNull(graph, URIs.TabContribution);
+    }
+    
+    public static RResource getInstance(ReadGraph graph) {
+        Session session = graph.getSession();
+        RResource ret = session.peekService(RResource.class);
+        if(ret == null) {
+            QueryControl qc = graph.getService(QueryControl.class);
+            ret = new RResource(qc.getIndependentGraph(graph));
+            session.registerService(RResource.class, ret);
+        }
+        return ret;
+    }
+    
+    public static RResource getInstance(RequestProcessor session) throws DatabaseException {
+        RResource ret = session.peekService(RResource.class);
+        if(ret == null) {
+            ret = session.syncRequest(new Read<RResource>() {
+                public RResource perform(ReadGraph graph) throws DatabaseException {
+                    QueryControl qc = graph.getService(QueryControl.class);
+                    return new RResource(qc.getIndependentGraph(graph));
+                }
+            });
+            session.registerService(RResource.class, ret);
+        }
+        return ret;
+    }
+    
+}
+

diff --git a/features/pom.xml b/features/pom.xml
index 7eebcefcb7630988ab052fc2f3cbabf2931868b3..da6caad38fbb11f00f37e7c7c5cf9c715463bad0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -15,36 +15,6 @@
 \r
     <build>\r
       <plugins>\r
-        <plugin>\r
-          <groupId>org.eclipse.tycho.extras</groupId>\r
-          <artifactId>tycho-source-feature-plugin</artifactId>\r
-          <version>${tycho.extras.version}</version>\r
-          <executions>\r
-            <execution>\r
-              <id>source-feature</id>\r
-              <phase>package</phase>\r
-              <goals>\r
-                <goal>source-feature</goal>\r
-              </goals>\r
-              <configuration>\r
-                <excludes>\r
-                  <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
-                  <plugin id="org.simantics.fileimport"/>\r
-                  <plugin id="org.simantics.fmu.me.win32"/>\r
-                  <plugin id="org.simantics.fmu.me.win64"/>\r
-                  <plugin id="org.simantics.sysdyn.product"/>\r
-                  <feature id="org.eclipse.equinox.executable"/>\r
-                  <feature id="org.simantics.eclipsec.launcher"/>\r
-                  <feature id="org.simantics.help"/>\r
-                  <feature id="org.simantics.issues.feature"/>\r
-                  <feature id="org.simantics.issues.ui.feature"/>\r
-                  <feature id="org.simantics.modeling"/>\r
-                  <feature id="org.simantics.workbench"/>\r
-               </excludes>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>\r
         <plugin>\r
           <groupId>org.eclipse.tycho</groupId>\r
           <artifactId>tycho-p2-plugin</artifactId>\r

diff --git a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target
index a184f32557cb92999619bac1cbc4a1a0ee789c86..ee8583ed13f97124b7e8c6bd95452c042f7a7500 100644 (file)
--- a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target
+++ b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.target
@@ -1,224 +1,332 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.6"?>\r
-\r
-<target name="Simantics SDK" sequenceNumber="102">\r
-<locations>\r
-<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.simantics.sdk.feature.group" version="1.31.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
-<unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.util.source" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>\r
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>\r
-<unit id="org.objectweb.asm.util" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.xml" version="5.0.1.v201404251740"/>\r
-<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>\r
-<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.commons" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.analysis.source" version="5.0.1.v201505121915"/>\r
-<unit id="org.objectweb.asm.commons.source" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.tree.source" version="5.0.1.v201404251740"/>\r
-<unit id="org.objectweb.asm.analysis" version="5.0.1.v201505121915"/>\r
-<unit id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>\r
-<repository location="http://www.simantics.org/update/tools/orbit/downloads/drops/R20160221192158/repository/"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="2.7.0.v20151015-1452"/>\r
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>\r
-<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.2.v20160210-2005"/>\r
-<repository location="http://www.simantics.org/update/mars"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<unit id="org.eclipse.rcp.source.feature.group" version="4.5.2.v20160212-1500"/>\r
-<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.5.1.v20160129-0959"/>\r
-<unit id="org.eclipse.ecf.filetransfer.source.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
-<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<unit id="org.eclipse.help.feature.group" version="2.1.2.v20160212-1500"/>\r
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.source.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
-<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.5.1.v20160129-0959"/>\r
-<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.104.2.v20160128-0900"/>\r
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
-<unit id="org.eclipse.ecf.filetransfer.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>\r
-<unit id="org.eclipse.ecf.core.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<unit id="org.eclipse.rcp.feature.group" version="4.5.2.v20160212-1500"/>\r
-<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.300.v20150430-1836"/>\r
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.2.0.v20151130-0157"/>\r
-<unit id="org.eclipse.ecf.core.source.feature.feature.group" version="1.2.0.v20151130-0157"/>\r
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>\r
-<unit id="org.eclipse.platform.source.feature.group" version="4.5.2.v20160212-1500"/>\r
-<unit id="org.eclipse.releng.tools.feature.group" version="3.6.0.v20150527-0145"/>\r
-<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.12.0.v20151130-0157"/>\r
-<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>\r
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<unit id="org.eclipse.help.source.feature.group" version="2.1.2.v20160212-1500"/>\r
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature.feature.group" version="1.1.0.v20151130-0157"/>\r
-<repository location="http://www.simantics.org/update/eclipse/updates/4.5"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.calendarcombo.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.2.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.0.4.201605182147"/>\r
-<unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201605182147"/>\r
-<repository location="http://www.simantics.org/update/nebula/Q22016/release/"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20160919-2121"/>\r
-<repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201605182147"/>\r
-<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201605182147"/>\r
-<repository location="http://www.simantics.org/update/nebula/Q22016/incubation"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.4.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.0.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.4.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.4.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.4.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.4.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.0.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.0.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.0.0.201606011907"/>\r
-<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.4.0.201606011907"/>\r
-<repository location="http://www.simantics.org/update/nebula/nattable/releases/1.4.0/repository/"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="ch.qos.logback.classic" version="1.1.7"/>\r
-<unit id="ch.qos.logback.classic.source" version="1.1.7"/>\r
-<unit id="ch.qos.logback.core" version="1.1.7"/>\r
-<unit id="ch.qos.logback.core.source" version="1.1.7"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>\r
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>\r
-<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>\r
-<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>\r
-<unit id="com.github.virtuald.curvesapi" version="1.4.0"/>\r
-<unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>\r
-<unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
-<unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>\r
-<unit id="com.koloboke.api-jdk8" version="1.0.0"/>\r
-<unit id="com.koloboke.api-jdk8.source" version="1.0.0"/>\r
-<unit id="com.koloboke.compile" version="0.5.1"/>\r
-<unit id="com.koloboke.compile.source" version="0.5.1"/>\r
-<unit id="com.koloboke.impl-common-jdk8" version="1.0.0"/>\r
-<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.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.trove3" version="3.0.3"/>\r
-<unit id="gnu.trove3.source" version="3.0.3"/>\r
-<unit id="it.unimi.dsi.fastutil" version="7.2.1"/>\r
-<unit id="it.unimi.dsi.fastutil.source" version="7.2.1"/>\r
-<unit id="jakarta-regexp" version="1.4.0"/>\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
-<unit id="net.ucanaccess.source" version="3.0.7"/>\r
-<unit id="org.antlr.runtime" version="3.5.2"/>\r
-<unit id="org.antlr.runtime.source" version="3.5.2"/>\r
-<unit id="org.apache.log4j" version="1.2.17"/>\r
-<unit id="org.apache.log4j.source" version="1.2.17"/>\r
-<unit id="org.apache.commons.codec" version="1.10.0"/>\r
-<unit id="org.apache.commons.codec.source" version="1.10.0"/>\r
-<unit id="org.apache.commons.collections" version="3.2.2"/>\r
-<unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
-<unit id="org.apache.commons.collections4" version="4.1.0"/>\r
-<unit id="org.apache.commons.collections4.source" version="4.1.0"/>\r
-<unit id="org.apache.commons.compress" version="1.12.0"/>\r
-<unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
-<unit id="org.apache.commons.logging" version="1.2.0"/>\r
-<unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
-<unit id="org.apache.commons.io" version="1.4.0"/>\r
-<unit id="org.apache.commons.io.source" version="1.4.0"/>\r
-<unit id="org.apache.commons.lang" version="2.6.0"/>\r
-<unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
-<unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>\r
-<unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>\r
-<unit id="org.apache.pdfbox" version="2.0.3"/>\r
-<unit id="org.apache.pdfbox.source" version="2.0.3"/>\r
-<unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>\r
-<unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>\r
-<unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>\r
-<unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>\r
-<unit id="org.apache.xmlbeans" version="2.6.0"/>\r
-<unit id="org.eclipse.collections.eclipse-collections-api" version="8.1.0"/>\r
-<unit id="org.eclipse.collections.eclipse-collections-api.source" version="8.1.0"/>\r
-<unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>\r
-<unit id="org.eclipse.collections.eclipse-collections.source" version="8.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.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
-<unit id="org.jfree.jcommon.source" version="1.0.23"/>\r
-<unit id="org.mozilla.rhino" version="1.7.7.1"/>\r
-<unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
-<unit id="org.supercsv" version="2.4.0"/>\r
-<unit id="org.supercsv.source" version="2.4.0"/>\r
-<unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
-<unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>\r
-<unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
-<unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
-<unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>\r
-<unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>\r
-<unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
-<unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
-<unit id="org.ini4j" version="0.5.4"/>\r
-<unit id="org.ini4j.source" version="0.5.4"/>\r
-<unit id="org.slf4j.api" version="1.7.20"/>\r
-<unit id="org.slf4j.api.source" version="1.7.20"/>\r
-<unit id="stax2-api" version="3.1.4"/>\r
-<unit id="stax2-api.source" version="3.1.4"/>\r
-<repository location="http://www.simantics.org/download/master/external-components/maven"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-<unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>\r
-<unit id="org.apache.batik" version="1.8.0.201611220734"/>\r
-<repository location="http://www.simantics.org/download/master/external-components/manual"/>\r
-</location>\r
-</locations>\r
+<?pde?>\r
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->\r
+<target name="Simupedia 1.31.0" sequenceNumber="1506422183">\r
+  <locations>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>\r
+      <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>\r
+      <unit id="org.objectweb.asm" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.analysis" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.analysis.source" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.commons" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.commons.source" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.source" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.tree" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.tree.source" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.util" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.util.source" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.xml" version="5.2.0.v20170126-0011"/>\r
+      <unit id="org.objectweb.asm.xml.source" version="5.2.0.v20170126-0011"/>\r
+      <repository location="http://www.simantics.org/update/tools/orbit/downloads/drops/R20170516192513"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="javax.xml" version="1.3.4.v201005080400"/>\r
+      <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>\r
+      <unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>\r
+      <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>\r
+      <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>\r
+      <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>\r
+      <unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>\r
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>\r
+      <unit id="org.eclipse.epp.mpc.feature.group" version="1.6.0.v20170616-0843"/>\r
+      <unit id="org.eclipse.epp.mpc.source.feature.group" version="1.6.0.v20170616-0843"/>\r
+      <unit id="org.eclipse.mylyn.commons.feature.group" version="3.23.0.v20170503-0014"/>\r
+      <unit id="org.eclipse.mylyn.commons.identity.feature.group" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.net" version="3.23.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.net.source" version="3.23.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.notifications.feature.group" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.repositories.core" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.repositories.core.source" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.repositories.ui" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.commons.repositories.ui.source" version="1.15.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.23.0.v20170414-0629"/>\r
+      <unit id="org.eclipse.mylyn.monitor.feature.group" version="3.23.0.v20170411-1844"/>\r
+      <unit id="org.eclipse.mylyn.tasks.core" version="3.23.0.v20170602-2017"/>\r
+      <unit id="org.eclipse.mylyn.tasks.core.source" version="3.23.0.v20170602-2017"/>\r
+      <unit id="org.eclipse.mylyn.tasks.ui" version="3.23.0.v20170608-2055"/>\r
+      <unit id="org.eclipse.mylyn.tasks.ui.source" version="3.23.0.v20170608-2055"/>\r
+      <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="3.0.6.201703111926"/>\r
+      <unit id="org.eclipse.mylyn.wikitext.ant.source" version="3.0.6.20170311142502"/>\r
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki.source" version="3.0.6.20170311142502"/>\r
+      <unit id="org.eclipse.mylyn.wikitext.osgi.source" version="3.0.6.201703111926"/>\r
+      <unit id="org.eclipse.mylyn.wikitext.source" version="3.0.6.20170311142502"/>\r
+      <unit id="org.eclipse.userstorage.feature.group" version="1.1.0.v20170526-1605"/>\r
+      <unit id="org.eclipse.userstorage.oauth" version="1.0.0.v20170526-1605"/>\r
+      <unit id="org.eclipse.userstorage.oauth.source" version="1.0.0.v20170526-1605"/>\r
+      <unit id="org.eclipse.userstorage.source" version="1.1.0.v20170328-0205"/>\r
+      <unit id="org.eclipse.userstorage.ui.source" version="1.0.2.v20170526-1605"/>\r
+      <repository location="http://www.simantics.org/update/oxygen/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>\r
+      <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/>\r
+      <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>\r
+      <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>\r
+      <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.0.v20170518-1049"/>\r
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.7.0.v20170515-1617"/>\r
+      <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.7.0.v20170515-1617"/>\r
+      <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.4.0.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.4.0.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.ecf.core.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.7.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.13.7.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.7.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group" version="3.13.7.v20170516-2248"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>\r
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.0.v20170418-0708"/>\r
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>\r
+      <unit id="org.eclipse.help.feature.group" version="2.2.100.v20170612-0950"/>\r
+      <unit id="org.eclipse.help.source.feature.group" version="2.2.100.v20170612-0950"/>\r
+      <unit id="org.eclipse.platform.feature.group" version="4.7.0.v20170612-1255"/>\r
+      <unit id="org.eclipse.platform.source.feature.group" version="4.7.0.v20170612-1255"/>\r
+      <unit id="org.eclipse.rcp.feature.group" version="4.7.0.v20170612-1255"/>\r
+      <unit id="org.eclipse.rcp.source.feature.group" version="4.7.0.v20170612-1255"/>\r
+      <unit id="org.eclipse.releng.tools.feature.group" version="3.9.100.v20170516-0717"/>\r
+      <unit id="org.eclipse.sdk.ide" version="4.7.0.I20170612-0950"/>\r
+      <unit id="org.eclipse.swt.tools.feature.feature.group" version="3.106.0.v20170503-0851"/>\r
+      <repository location="http://www.simantics.org/update/eclipse/updates/4.7/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.examples.feature.feature.group" version="1.0.4.201706221838"/>\r
+      <unit id="org.eclipse.nebula.examples.release.feature.feature.group" version="1.1.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.feature.feature.group" version="1.3.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.cdatetime.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.gallery.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.ganttchart.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.oscilloscope.feature.feature.group" version="1.3.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.paperclips.feature.feature.group" version="2.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.pgroup.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.pshelf.css.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.pshelf.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201706221838"/>\r
+      <repository location="http://www.simantics.org/update/nebula/releases/1.3.0/release/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>\r
+      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>\r
+      <repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-oxygen/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201708070950"/>\r
+      <unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201708070950"/>\r
+      <repository location="http://www.simantics.org/update/nebula/releases/1.3.0/incubation/"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>\r
+      <unit id="bouncycastle.bcprov-jdk14" version="138.0.0"/>\r
+      <unit id="ch.qos.logback.classic" version="1.2.3"/>\r
+      <unit id="ch.qos.logback.classic.source" version="1.2.3"/>\r
+      <unit id="ch.qos.logback.core" version="1.2.3"/>\r
+      <unit id="ch.qos.logback.core.source" version="1.2.3"/>\r
+      <unit id="com.esotericsoftware.kryo" version="4.0.0"/>\r
+      <unit id="com.esotericsoftware.kryo.source" version="4.0.0"/>\r
+      <unit id="com.esotericsoftware.minlog" version="1.3.0"/>\r
+      <unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>\r
+      <unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>\r
+      <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>\r
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>\r
+      <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>\r
+      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>\r
+      <unit id="com.github.virtuald.curvesapi" version="1.4.0"/>\r
+      <unit id="com.github.virtuald.curvesapi.source" version="1.4.0"/>\r
+      <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>\r
+      <unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>\r
+      <unit id="com.koloboke.api-jdk8" version="1.0.0"/>\r
+      <unit id="com.koloboke.api-jdk8.source" version="1.0.0"/>\r
+      <unit id="com.koloboke.compile" version="0.5.1"/>\r
+      <unit id="com.koloboke.compile.source" version="0.5.1"/>\r
+      <unit id="com.koloboke.impl-common-jdk8" version="1.0.0"/>\r
+      <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.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="com.sun.jna.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.trove3" version="3.0.3"/>\r
+      <unit id="gnu.trove3.source" version="3.0.3"/>\r
+      <unit id="it.unimi.dsi.fastutil" version="7.2.1"/>\r
+      <unit id="it.unimi.dsi.fastutil.source" version="7.2.1"/>\r
+      <unit id="jakarta-regexp" version="1.4.0"/>\r
+      <unit id="javassist" version="3.20.0.GA"/>\r
+      <unit id="javassist.source" version="3.20.0.GA"/>\r
+      <unit id="javax.servlet-api" version="3.1.0"/>\r
+      <unit id="javax.servlet-api.source" version="3.1.0"/>\r
+      <unit id="javax.validation.api" version="1.1.0.Final"/>\r
+      <unit id="javax.validation.api.source" version="1.1.0.Final"/>\r
+      <unit id="javax.ws.rs-api" version="2.0.1"/>\r
+      <unit id="javax.ws.rs-api.source" version="2.0.1"/>\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
+      <unit id="net.ucanaccess.source" version="3.0.7"/>\r
+      <unit id="org.antlr.runtime" version="3.5.2"/>\r
+      <unit id="org.antlr.runtime.source" version="3.5.2"/>\r
+      <unit id="org.apache.aries.spifly.core-internal" version="1.0.8"/>\r
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.8"/>\r
+      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.8"/>\r
+      <unit id="org.apache.aries.util" version="1.0.0"/>\r
+      <unit id="org.apache.commons.codec" version="1.10.0"/>\r
+      <unit id="org.apache.commons.codec.source" version="1.10.0"/>\r
+      <unit id="org.apache.commons.collections" version="3.2.2"/>\r
+      <unit id="org.apache.commons.collections.source" version="3.2.2"/>\r
+      <unit id="org.apache.commons.collections4" version="4.1.0"/>\r
+      <unit id="org.apache.commons.collections4.source" version="4.1.0"/>\r
+      <unit id="org.apache.commons.compress" version="1.12.0"/>\r
+      <unit id="org.apache.commons.compress.source" version="1.12.0"/>\r
+      <unit id="org.apache.commons.io" version="2.4.0"/>\r
+      <unit id="org.apache.commons.io.source" version="2.4.0"/>\r
+      <unit id="org.apache.commons.lang" version="2.6.0"/>\r
+      <unit id="org.apache.commons.lang.source" version="2.6.0"/>\r
+      <unit id="org.apache.commons.logging" version="1.2.0"/>\r
+      <unit id="org.apache.commons.logging.source" version="1.2.0"/>\r
+      <unit id="org.apache.commons.math3" version="3.6.1"/>\r
+      <unit id="org.apache.commons.math3.source" version="3.6.1"/>\r
+      <unit id="org.apache.log4j" version="1.2.17"/>\r
+      <unit id="org.apache.log4j.source" version="1.2.17"/>\r
+      <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.core.source" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.queries" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.queries.source" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.queryparser" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.queryparser.source" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.sandbox" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.lucene4.sandbox.source" version="4.9.0.b0003"/>\r
+      <unit id="org.apache.pdfbox" version="2.0.3"/>\r
+      <unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>\r
+      <unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>\r
+      <unit id="org.apache.pdfbox.source" version="2.0.3"/>\r
+      <unit id="org.apache.pdfbox.xmpbox" version="2.0.3"/>\r
+      <unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>\r
+      <unit id="org.apache.xmlbeans" version="2.6.0"/>\r
+      <unit id="org.bouncycastle.bcmail-jdk14" version="1.38.0"/>\r
+      <unit id="org.bouncycastle.bcmail-jdk14.source" version="1.38.0"/>\r
+      <unit id="org.bouncycastle.bcprov-jdk14" version="1.38.0"/>\r
+      <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>\r
+      <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>\r
+      <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>\r
+      <unit id="org.eclipse.collections.eclipse-collections-api" version="8.1.0"/>\r
+      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="8.1.0"/>\r
+      <unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>\r
+      <unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>\r
+      <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>\r
+      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.1"/>\r
+      <unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.25.1"/>\r
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1"/>\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.ini4j" version="0.5.4"/>\r
+      <unit id="org.ini4j.source" version="0.5.4"/>\r
+      <unit id="org.jboss.windup.decompiler.api.forge-addon" version="4.0.0.Beta1"/>\r
+      <unit id="org.jboss.windup.decompiler.api.forge-addon.source" version="4.0.0.Beta1"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon" version="4.0.0.Beta1"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.source" version="4.0.0.Beta1"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-compilertools" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-compilertools.source" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-core" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-core.source" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-reflection" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.decompiler.procyon.windup-procyon-reflection.source" version="1.0.0.20160510"/>\r
+      <unit id="org.jboss.windup.utils.windup-utils.forge-addon" version="4.0.0.Beta1"/>\r
+      <unit id="org.jboss.windup.utils.windup-utils.forge-addon.source" version="4.0.0.Beta1"/>\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
+      <unit id="org.jfree.jcommon.source" version="1.0.23"/>\r
+      <unit id="org.jsoup" version="1.8.3"/>\r
+      <unit id="org.jsoup.source" version="1.8.3"/>\r
+      <unit id="org.jvnet.mimepull" version="1.9.6"/>\r
+      <unit id="org.jvnet.mimepull.source" version="1.9.6"/>\r
+      <unit id="org.mozilla.rhino" version="1.7.7.1"/>\r
+      <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>\r
+      <unit id="org.objenesis" version="2.2.0"/>\r
+      <unit id="org.objenesis.source" version="2.2.0"/>\r
+      <unit id="org.slf4j.api" version="1.7.25.b001"/>\r
+      <unit id="org.slf4j.api.source" version="1.7.25.b001"/>\r
+      <unit id="org.supercsv" version="2.4.0"/>\r
+      <unit id="org.supercsv.source" version="2.4.0"/>\r
+      <unit id="stax2-api" version="3.1.4"/>\r
+      <unit id="stax2-api.source" version="3.1.4"/>\r
+      <repository location="http://www.simantics.org/download/master/external-components/maven"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.apache.batik" version="1.8.0.201611220734"/>\r
+      <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>\r
+      <repository location="http://www.simantics.org/download/master/external-components/manual"/>\r
+    </location>\r
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+      <unit id="org.simantics.sdk.feature.group" version="1.31.0"/>\r
+      <unit id="org.simantics.sdk.source.feature.group" version="1.31.0"/>\r
+      <repository location="http://www.simantics.org/download/master/sdk"/>\r
+    </location>\r
+  </locations>\r
 </target>\r

diff --git a/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd
new file mode 100644 (file)
index 0000000..ad37f58
--- /dev/null
+++ b/releng/org.simantics.r.build.targetdefinition/org.simantics.r.build.targetdefinition.tpd
@@ -0,0 +1,5 @@
+target "Simupedia 1.31.0"
+
+with source allEnvironments
+
+include "http://www.simantics.org/download/master/simantics.tpd"

diff --git a/releng/org.simantics.r.tycho.configuration/pom.xml b/releng/org.simantics.r.tycho.configuration/pom.xml
index f8f1a62ac60cf31699d857e9eb8b6bd48c727454..96df243a5b220b156b4d08a9ee439fdd44053fe6 100644 (file)
--- a/releng/org.simantics.r.tycho.configuration/pom.xml
+++ b/releng/org.simantics.r.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
        <packaging>pom</packaging>\r
 \r
        <properties>\r
-               <tycho.version>0.26.0</tycho.version>\r
-               <tycho.extras.version>0.26.0</tycho.extras.version>\r
+               <tycho.version>1.0.0</tycho.version>\r
+               <tycho.extras.version>1.0.0</tycho.extras.version>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
        </properties>\r
 \r
@@ -45,11 +45,6 @@
                                                </artifact>\r
                                        </target>\r
                                        <environments>\r
-                                               <environment>\r
-                                                       <os>linux</os>\r
-                                                       <ws>gtk</ws>\r
-                                                       <arch>x86</arch>\r
-                                               </environment>\r
                                                <environment>\r
                                                        <os>linux</os>\r
                                                        <ws>gtk</ws>\r