Merge "Implement equals/hashCode for PropertyInfo"

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
index 6d3f7e48e7d421a0e5fe7e444e453f585ce2dfd5..e61937fc9e90aaf92d2dc57767d35c4545d6b91e 100644 (file)
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
@@ -188,6 +188,21 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                this.handles = new int[resourceCount];
                TIntObjectMap<Identity> identityMap = TransferableGraphUtils.mapIdentities(identities);
                
+               // We must process roots first, because internal identifiers depend on them.
+               for(Identity identity : identities) {
+                       IdentityDefinition definition = identity.definition;
+                       if (definition instanceof Root) {
+                               Root root = (Root) definition;
+                               if (root.name.equals(""))
+                                       handles[identity.resource] = builder.handle(RootLibrary);
+                               else {
+                                       Resource existing = advisor.analyzeRoot(graph, root);
+                                       if (existing != null)
+                                               handles[identity.resource] = builder.handle(existing);
+                               }
+                       }
+               }
+               
                for(Identity identity : identities) {
                        IdentityDefinition definition = identity.definition;
                        if(definition instanceof External) {
@@ -227,16 +242,6 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                                        existingInternalMap.put(identity.resource, existing);
                                }
                        }
-                       else if(definition instanceof Root) {
-                               Root root = (Root)definition;
-                               if(root.name.equals(""))
-                                   handles[identity.resource] = builder.handle(RootLibrary);
-                               else  {
-                                       Resource existing = advisor.analyzeRoot(graph, root);
-                                       if(existing != null)
-                                           handles[identity.resource] = builder.handle(existing);
-                               }
-                       }
                        else if(definition instanceof Optional) {
                                External def = (External)definition;
                                Resource parent = builder.resource(handles[def.parent]);
@@ -269,6 +274,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
        }
 
        int[] getClustering() {
+               if (vg != null)
+                       return null;
                Variant v = extensions.get(Extensions.CLUSTERING);
                if(v == null) return null;
                try {
@@ -280,6 +287,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
        }
 
        int[] getClusterSets() {
+               if (vg != null)
+                       return null;
                Variant v = extensions.get(Extensions.CLUSTER_SETS);
                if(v == null) return null;
                try {
@@ -605,7 +614,11 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
                tg.forValues2(null, new ValueProcedure());
                
                for(Resource r : existingInternalMap.valueCollection()) {
-                       graph.deny(r, InstanceOf, null, ExternalEntity, null);
+                       try {
+                               graph.deny(r, InstanceOf, null, ExternalEntity, null);
+                       } catch (DatabaseException e) {
+                               graph.deny(r, InstanceOf, null, ExternalEntity, vg);
+                       }
                }
                
        }

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphImportProcess.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphImportProcess.java
index 4ec7138660fc2dd8c585fefe07bceb96bc4b5c00..6a699d81bce51fa7a46ea1f7c2ff8fe0c00d727f 100644 (file)
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphImportProcess.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/TransferableGraphImportProcess.java
@@ -174,7 +174,11 @@ public class TransferableGraphImportProcess implements TransferableGraphImporter
                missingExternals.add(external);
        }
        
-       void prepare(ReadGraph graph) throws DatabaseException {
+       public Resource[] getResources() {
+               return resources;
+       }
+       
+       public void prepare(ReadGraph graph) throws DatabaseException {
                findBuiltins(graph);
                
                Resource[] resources = new Resource[tg.resourceCount];
@@ -338,7 +342,7 @@ public class TransferableGraphImportProcess implements TransferableGraphImporter
                
        }
 
-       void write(WriteOnlyGraph graph) throws DatabaseException {
+       public void write(WriteOnlyGraph graph) throws DatabaseException {
 
                Resource[] resources = this.resources;
 

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target
index c21ef491a3d0dcc858f95910337fc000e8639400..bbb4defd9fb5aeabadba0385db856b8a356c612d 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <?pde?>\r
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->\r
-<target name="Eclipse 2019-09 (4.13)" sequenceNumber="1571396364">\r
+<target name="Eclipse 2019-09 (4.13)" sequenceNumber="1578920406">\r
   <locations>\r
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>\r
@@ -148,20 +148,20 @@
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.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
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.6.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.6.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.2.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.2.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.6.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.6.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.2.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.2.0.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.1.201909181823"/>\r
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.1.201909181823"/>\r
+      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.6.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.18.0.v20190927-1557"/>\r
+      <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.18.0.v20200110-1352"/>\r
       <repository location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
     </location>\r
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd
index e386cca5f851a72317ac199e8bc2a26af6cb11e7..7b1ce22c0ed953077887434e4670cb51ea438f5f 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-4.13.tpd
@@ -146,7 +146,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/release/" {
        org.eclipse.nebula.widgets.xviewer.feature.feature.group
 }
 
-location "http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/" {
+location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/" {
        org.eclipse.nebula.widgets.nattable.core.feature.feature.group
        org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
        org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group

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 51d63fb3b6d8603961293b66ef25577095aeca81..529902e27d50f5495e167e23bb7bf50926322256 100644 (file)
--- 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/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1568664763">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Eclipse Oxygen" sequenceNumber="1578920363">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -146,17 +146,17 @@
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.0/release/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.1.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.1.201909181823"/>
+      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>

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 db5848b49f09657f90f206f4cbe195fa64915d7b..2dd168a4a1070554885e4bed5c97ab5ce18d3d6b 100644 (file)
--- 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
@@ -144,7 +144,7 @@ location "http://www.simantics.org/update/nebula/releases/2.2.0/release/" {
        org.eclipse.nebula.widgets.xviewer.feature.feature.group
 }
 
-location "http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/" {
+location "http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/" {
        org.eclipse.nebula.widgets.nattable.core.feature.feature.group
        org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
        org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target
index e704292691cf4f0a15f9fec9fb4a0d83a8e2d9a4..2a2f995759b797a770c00543946937e1a8cbadfa 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.target
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <?pde?>\r
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->\r
-<target name="Simantics 1.41.0" sequenceNumber="1571396371">\r
+<target name="Simantics 1.42.0" sequenceNumber="1571396371">\r
   <locations>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>\r
       <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>\r
       <unit id="org.objectweb.asm" version="7.1.0.v20190412-2143"/>\r
@@ -20,7 +20,7 @@
       <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>\r
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" 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.xerces" version="2.9.0.v201101211617"/>\r
@@ -57,7 +57,7 @@
       <unit id="org.eclipse.userstorage.ui.source" version="1.1.0.v20190307-0457"/>\r
       <repository location="http://download.eclipse.org/releases/2019-09/"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>\r
       <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>\r
       <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>\r
@@ -82,7 +82,7 @@
       <unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.500.v20190705-0858"/>\r
       <repository location="http://download.eclipse.org/eclipse/updates/4.13/"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.5.v20190423-0614"/>\r
       <unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.14.5.v20190423-0614"/>\r
       <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.5.v20190502-0212"/>\r
@@ -93,7 +93,7 @@
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.100.v20180301-0132"/>\r
       <repository location="http://download.eclipse.org/rt/ecf/3.14.5/site.p2"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="org.eclipse.nebula.cwt.feature.feature.group" version="1.1.0.201907151344"/>\r
       <unit id="org.eclipse.nebula.effects.stw.feature.feature.group" version="1.0.0.201907151344"/>\r
       <unit id="org.eclipse.nebula.examples.feature.feature.group" version="1.0.4.201907151344"/>\r
@@ -147,7 +147,7 @@
       <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.201907151344"/>\r
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.0/release/"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\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.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
@@ -160,16 +160,16 @@
       <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
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.18.0.v20190927-1557"/>\r
       <repository location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\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.201806070735"/>\r
       <unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201806070735"/>\r
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.0/incubation/"/>\r
     </location>\r
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">\r
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" 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
@@ -395,16 +395,16 @@
       <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
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" 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
       <unit id="io.grpc.feature.feature.group" version="1.21.0.201906191442"/>\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
+    <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
       <unit id="org.simantics.sdk.feature.group" version="0.0.0"/>\r
       <unit id="org.simantics.sdk.source.feature.group" version="0.0.0"/>\r
       <repository location="http://www.simantics.org/download/master/sdk"/>\r
     </location>\r
   </locations>\r
-</target>\r
+</target>
\ No newline at end of file

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd
index dda61631afc8108aa80822a57b1b11debe224b4e..6228efd13c1a1524d1f9d0e617292374a9a8f2ca 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics-4.13.tpd
@@ -1,4 +1,4 @@
-target "Simantics 1.41.0"
+target "Simantics 1.42.0"
 
 with source allEnvironments
 

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 4f55a9595ee968b10e482392469c3bb978f18056..974ebb718ea61fea9fe66a3dfd5964d5365d6f6c 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Simantics 1.42.0" sequenceNumber="1569832089">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Simantics 1.42.0" sequenceNumber="1578920363">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -146,17 +146,17 @@
       <repository location="http://www.simantics.org/update/nebula/releases/2.2.0/release/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.1.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.0.201703192131"/>
-      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.0.201703192131"/>
-      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.e4.source.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group" version="1.6.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group" version="1.2.0.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.1.201909181823"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group" version="1.5.1.201909181823"/>
+      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.6.0/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>