From 47dca86df0556fe27d49c50e8388471af000cc3e Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 21 Nov 2016 00:11:57 +0200
Subject: [PATCH] Use direct repository links instead of composite repository
 link.

There seems to be problems with Tycho and composite repositories and
furthermore, otherwise the composite repository would always have to be
bumped separately to get updates to clients.

refs #6813

Change-Id: I90f164f8df1048340b30fb6f2c33823323a0c632
---
 ....simantics.sdk.build.targetdefinition-semantum.target | 9 ++++++---
 .../org.simantics.sdk.build.targetdefinition.target      | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

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 0c90b8da7..df23acca2 100644
--- 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
@@ -150,8 +150,6 @@
 <unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>
 <unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>
 <unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>
-<unit id="org.apache.poi" version="3.15.0"/>
-<unit id="org.apache.poi.source" version="3.15.0"/>
 <unit id="org.apache.xmlbeans" version="2.6.0"/>
 <unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
@@ -181,7 +179,12 @@
 <unit id="org.ini4j.source" version="0.5.4"/>
 <unit id="org.slf4j.api" version="1.7.20"/>
 <unit id="org.slf4j.api.source" version="1.7.20"/>
-<repository location="http://dev.simupedia.com/download/master/external-components"/>
+<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.poi" version="3.15.0"/>
+<unit id="org.apache.poi.source" version="3.15.0"/>
+<repository location="http://www.simantics.org/download/master/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 2f1fac569..b886e339e 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
@@ -167,8 +167,6 @@
 <unit id="org.apache.pdfbox.xmpbox.source" version="2.0.3"/>
 <unit id="org.apache.pdfbox.fontbox" version="2.0.3"/>
 <unit id="org.apache.pdfbox.fontbox.source" version="2.0.3"/>
-<unit id="org.apache.poi" version="3.15.0"/>
-<unit id="org.apache.poi.source" version="3.15.0"/>
 <unit id="org.apache.xmlbeans" version="2.6.0"/>
 <unit id="org.eclipse.collections.eclipse-collections-api" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
@@ -198,7 +196,12 @@
 <unit id="org.ini4j.source" version="0.5.4"/>
 <unit id="org.slf4j.api" version="1.7.20"/>
 <unit id="org.slf4j.api.source" version="1.7.20"/>
-<repository location="http://www.simantics.org/download/master/external-components"/>
+<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.poi" version="3.15.0"/>
+<unit id="org.apache.poi.source" version="3.15.0"/>
+<repository location="http://www.simantics.org/download/master/external-components/manual"/>
 </location>
 </locations>
 </target>
-- 
2.47.1