Merge branch 'master' into release/1.44.0

Change-Id: Ic3354d21bd649913c1d41590c8dd787aef66603e

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 708e508ed9f21d1291dba93699c794f2d9adf348..2243e9ce646aeaa0c166fadd2d21066e91b88312 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587101489">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1591093826">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -391,13 +391,13 @@
       <unit id="com.impossibl.pgjdbc-ng.source" version="0.8.3"/>
       <unit id="stax2-api" version="4.2.0"/>
       <unit id="stax2-api.source" version="4.2.0"/>
-      <repository location="http://www.simantics.org/download/master/external-components/maven/"/>
+      <repository location="http://www.simantics.org/download/release/1.44.0/external-components/maven/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik.feature.feature.group" version="0.0.0"/>
       <unit id="org.apache.poi.feature.feature.group" version="0.0.0"/>
       <unit id="io.grpc.feature.feature.group" version="0.0.0"/>
-      <repository location="http://www.simantics.org/download/master/external-components/manual"/>
+      <repository location="http://www.simantics.org/download/release/1.44.0/external-components/manual"/>
     </location>
   </locations>
 </target>

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 6a0428e20586c934171ff043f0a2a125e99e7324..ce86269bfa64bf3d3d7911b909128764d0e8572c 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
@@ -173,7 +173,7 @@ location "http://www.simantics.org/update/collections/10.2.0/repository/" {
        org.eclipse.collections.feature.source.feature.group
 }
 
-location "http://www.simantics.org/download/master/external-components/maven/" {
+location "http://www.simantics.org/download/release/1.44.0/external-components/maven/" {
        bouncycastle.bcmail-jdk14
        bouncycastle.bcprov-jdk14
        ch.qos.logback.classic
@@ -396,7 +396,7 @@ location "http://www.simantics.org/download/master/external-components/maven/" {
        stax2-api.source
 }
 
-location "http://www.simantics.org/download/master/external-components/manual" {
+location "http://www.simantics.org/download/release/1.44.0/external-components/manual" {
        org.apache.batik.feature.feature.group lazy
        org.apache.poi.feature.feature.group lazy
        io.grpc.feature.feature.group lazy

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 10ff40e65a91788d1f415c2b2d9ec0664f28ed7f..186fd334f338174e4d93d53d4174d743a5409392 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Simantics 1.44.0" sequenceNumber="1587101469">
+<target name="Simantics 1.44.0" sequenceNumber="1591093826">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -391,18 +391,18 @@
       <unit id="com.impossibl.pgjdbc-ng.source" version="0.8.3"/>
       <unit id="stax2-api" version="4.2.0"/>
       <unit id="stax2-api.source" version="4.2.0"/>
-      <repository location="http://www.simantics.org/download/master/external-components/maven/"/>
+      <repository location="http://www.simantics.org/download/release/1.44.0/external-components/maven/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik.feature.feature.group" version="0.0.0"/>
       <unit id="org.apache.poi.feature.feature.group" version="0.0.0"/>
       <unit id="io.grpc.feature.feature.group" version="0.0.0"/>
-      <repository location="http://www.simantics.org/download/master/external-components/manual"/>
+      <repository location="http://www.simantics.org/download/release/1.44.0/external-components/manual"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.simantics.sdk.feature.group" version="0.0.0"/>
       <unit id="org.simantics.sdk.source.feature.group" version="0.0.0"/>
-      <repository location="http://www.simantics.org/download/master/sdk"/>
+      <repository location="http://www.simantics.org/download/release/1.44.0/sdk"/>
     </location>
   </locations>
 </target>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
index f607a133f843e1903d5866a7695beafbd72ac911..07b7fee6aa900e500ca18a33b3183550883cbc37 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -4,7 +4,7 @@ with source allEnvironments
 
 include "./org.simantics.sdk.build.targetdefinition.tpd"
 
-location "http://www.simantics.org/download/master/sdk" {
+location "http://www.simantics.org/download/release/1.44.0/sdk" {
        org.simantics.sdk.feature.group lazy
        org.simantics.sdk.source.feature.group lazy
 }