Merge commit 'c3dbc3ffd02ee897f2abb48241cbcf4c5cc50548' into release/1.25.0

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
index e42b58148b40e7e12c9158b5f2a17c21dc1e6e65..e87461c54210ae0f10d6e765769fed4caebf9cf8 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target
@@ -193,12 +193,12 @@
 <unit id="org.slf4j.api.source" version="1.7.20"/>
 <unit id="stax2-api" version="3.1.4"/>
 <unit id="stax2-api.source" version="3.1.4"/>
-<repository location="http://www.simantics.org/download/master/external-components/maven"/>
+<repository location="http://www.simantics.org/download/release/1.25.0/external-components/maven"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
 <unit id="org.apache.batik" version="1.8.0.201611220734"/>
-<repository location="http://www.simantics.org/download/master/external-components/manual"/>
+<repository location="http://www.simantics.org/download/release/1.25.0/external-components/manual"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>

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 d09693543cf82dbc5f5920be44282e138f8253ce..16eefc6fc4e3039eeac285f80344ccd6e864e6fc 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
@@ -210,12 +210,12 @@
 <unit id="org.slf4j.api.source" version="1.7.20"/>
 <unit id="stax2-api" version="3.1.4"/>
 <unit id="stax2-api.source" version="3.1.4"/>
-<repository location="http://www.simantics.org/download/master/external-components/maven"/>
+<repository location="http://www.simantics.org/download/release/1.25.0/external-components/maven"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
 <unit id="org.apache.batik" version="1.8.0.201611220734"/>
-<repository location="http://www.simantics.org/download/master/external-components/manual"/>
+<repository location="http://www.simantics.org/download/release/1.25.0/external-components/manual"/>
 </location>
 </locations>
 </target>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 07a30c2b9a4a1337a6a6956e646508f935135e8c..fbc25f5a248d688e2b38a9a3a375e20729a43306 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -5,7 +5,7 @@
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
 <unit id="org.simantics.sdk.feature.group" version="1.25.0"/>\r
 <unit id="org.simantics.sdk.source.feature.group" version="1.25.0"/>\r
-<repository location="http://www.simantics.org/download/master/sdk"/>\r
+<repository location="http://www.simantics.org/download/release/1.25.0/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
@@ -216,12 +216,12 @@
 <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
+<repository location="http://www.simantics.org/download/release/1.25.0/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
+<repository location="http://www.simantics.org/download/release/1.25.0/external-components/manual"/>\r
 </location>\r
 </locations>\r
 </target>\r