From 09428742cceaabef182dbaacb05368513e21a591 Mon Sep 17 00:00:00 2001
From: Miro Richard Eklund <miro.eklund@semantum.fi>
Date: Wed, 9 Aug 2017 16:14:13 +0300
Subject: [PATCH] Update locations to use mirror-locations

Mirror-locations are now used rather than eclipse's download site.

Before merge to master, update the locations to use /master/ rather than
/private/eclipse-4.7/.

Amend: Updated private/eclipse-4.7 to master

refs #7358

Change-Id: I62c8eb2f06cf79a5759d21da3a51a0db1dca3c16
---
 ...imantics.sdk.build.targetdefinition.target | 17 ++++++++-----
 ...g.simantics.sdk.build.targetdefinition.tpd | 15 +++++++----
 .../simantics.target                          | 25 +++++++++++--------
 .../simantics.tpd                             |  6 ++---
 4 files changed, 39 insertions(+), 24 deletions(-)

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 d99e6fd4f..04120326f 100644
--- 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Oxygen" sequenceNumber="1500623485">
+<?pde version="3.8"?><target name="Eclipse Oxygen" sequenceNumber="1502282008">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -111,7 +111,7 @@
 <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201706221838"/>
 <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201706221838"/>
 <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201706221838"/>
-<repository location="http://download.eclipse.org/nebula/releases/latest"/>
+<repository location="http://www.simantics.org/update/nebula/releases/1.3.0/release/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.5.0.201703192131"/>
@@ -124,11 +124,16 @@
 <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://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+<repository location="http://www.simantics.org/update/nebula/nattable/releases/1.5.0/repository/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.e4.tools.spies.feature.feature.group" version="0.17.0.v20170601-1400"/>
-<repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>
+<repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-oxygen/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201708070950"/>
+<unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201708070950"/>
+<repository location="http://www.simantics.org/update/nebula/releases/1.3.0/incubation/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
@@ -295,12 +300,12 @@
 <unit id="org.supercsv.source" version="2.4.0"/>
 <unit id="stax2-api" version="3.1.4"/>
 <unit id="stax2-api.source" version="3.1.4"/>
-<repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/maven"/>
+<repository location="http://www.simantics.org/download/master/external-components/maven"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.batik" version="1.8.0.201611220734"/>
 <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
-<repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/manual"/>
+<repository location="http://www.simantics.org/download/master/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 1fc2f710c..ca9d6be94 100644
--- 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
@@ -92,7 +92,7 @@ location "http://www.simantics.org/update/eclipse/updates/4.7/" {
 	org.eclipse.swt.tools.feature.feature.group
 }
 
-location "http://download.eclipse.org/nebula/releases/latest" {
+location "http://www.simantics.org/update/nebula/releases/1.3.0/release/" {
 	org.eclipse.nebula.cwt.feature.feature.group
 	org.eclipse.nebula.effects.stw.feature.feature.group
 	org.eclipse.nebula.examples.feature.feature.group
@@ -114,7 +114,7 @@ location "http://download.eclipse.org/nebula/releases/latest" {
 	org.eclipse.nebula.widgets.xviewer.feature.feature.group
 }
 
-location "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
+location "http://www.simantics.org/update/nebula/nattable/releases/1.5.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
@@ -127,11 +127,16 @@ location "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
 	org.eclipse.nebula.widgets.nattable.extension.poi.source.feature.feature.group
 }
 
-location "http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/" {
+location "http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-oxygen/" {
 	org.eclipse.e4.tools.spies.feature.feature.group
 }
 
-location "http://www.simantics.org/download/private/eclipse-4.7/external-components/maven" {
+location "http://www.simantics.org/update/nebula/releases/1.3.0/incubation/" {
+	org.eclipse.nebula.incubation.feature.feature.group
+	org.eclipse.nebula.examples.incubation.feature.feature.group
+}
+
+location "http://www.simantics.org/download/master/external-components/maven" {
 	bouncycastle.bcmail-jdk14
 	bouncycastle.bcprov-jdk14
 	ch.qos.logback.classic
@@ -298,7 +303,7 @@ location "http://www.simantics.org/download/private/eclipse-4.7/external-compone
 	stax2-api.source
 }
 
-location "http://www.simantics.org/download/private/eclipse-4.7/external-components/manual" {
+location "http://www.simantics.org/download/master/external-components/manual" {
 	org.apache.batik
 	org.apache.poi.feature.feature.group
 }
\ No newline at end of file
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 9290a8b82..346566d3a 100644
--- 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"?> 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Simantics 1.30.0 Oxygen" sequenceNumber="1500622610">
+<target name="Simantics 1.31.0" sequenceNumber="1502286441">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -113,7 +113,7 @@
       <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201706221838"/>
       <unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="1.0.0.201706221838"/>
       <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201706221838"/>
-      <repository location="http://download.eclipse.org/nebula/releases/latest"/>
+      <repository location="http://www.simantics.org/update/nebula/releases/1.3.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"/>
@@ -126,11 +126,16 @@
       <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://download.eclipse.org/nattable/releases/1.5.0/repository"/>
+      <repository location="http://www.simantics.org/update/nebula/nattable/releases/1.5.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"/>
-      <repository location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.tools/latest/"/>
+      <repository location="http://www.simantics.org/update/e4/snapshots/org.eclipse.e4.tools/latest-oxygen/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.incubation.feature.feature.group" version="1.0.0.201708070950"/>
+      <unit id="org.eclipse.nebula.examples.incubation.feature.feature.group" version="1.0.0.201708070950"/>
+      <repository location="http://www.simantics.org/update/nebula/releases/1.3.0/incubation/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="bouncycastle.bcmail-jdk14" version="138.0.0"/>
@@ -297,17 +302,17 @@
       <unit id="org.supercsv.source" version="2.4.0"/>
       <unit id="stax2-api" version="3.1.4"/>
       <unit id="stax2-api.source" version="3.1.4"/>
-      <repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/maven"/>
+      <repository location="http://www.simantics.org/download/master/external-components/maven"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.batik" version="1.8.0.201611220734"/>
       <unit id="org.apache.poi.feature.feature.group" version="3.15.0.b0002"/>
-      <repository location="http://www.simantics.org/download/private/eclipse-4.7/external-components/manual"/>
+      <repository location="http://www.simantics.org/download/master/external-components/manual"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.simantics.sdk.feature.group" version="1.31.0"/>
-      <unit id="org.simantics.sdk.source.feature.group" version="1.31.0"/>
-      <repository location="http://www.simantics.org/download/private/eclipse-4.7/sdk"/>
+      <unit id="org.simantics.sdk.feature.group" version="1.30.0"/>
+      <unit id="org.simantics.sdk.source.feature.group" version="1.30.0"/>
+      <repository location="http://www.simantics.org/download/master/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 cb0e15abc..b67572b3f 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -1,10 +1,10 @@
-target "Simantics 1.30.0 Oxygen"
+target "Simantics 1.31.0"
 
 with source allEnvironments
 
-include "org.simantics.sdk.build.targetdefinition.tpd"
+include "http://www.simantics.org/download/master/org.simantics.sdk.build.targetdefinition.tpd"
 
-location "http://www.simantics.org/download/private/eclipse-4.7/sdk" {
+location "http://www.simantics.org/download/master/sdk" {
 	org.simantics.sdk.feature.group
 	org.simantics.sdk.source.feature.group
 }
-- 
2.43.2