From ded09d56e02cf8fbc8692955c375285310cb27a5 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sat, 18 Jan 2020 23:44:30 +0200
Subject: [PATCH] Switch to aries spifly 1.2.3

gitlab #405

Change-Id: I51289aa93a2705364fd654df1bd35b6d6d4242ae
---
 .../org.simantics.sdk.build.targetdefinition.target          | 5 +----
 .../org.simantics.sdk.build.targetdefinition.tpd             | 3 ---
 .../simantics.target                                         | 5 +----
 3 files changed, 2 insertions(+), 11 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 1913b5a10..ba63fcdb4 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
@@ -259,10 +259,7 @@
       <unit id="net.ucanaccess.source" version="3.0.7"/>
       <unit id="org.antlr.runtime" version="3.5.2"/>
       <unit id="org.antlr.runtime.source" version="3.5.2"/>
-      <unit id="org.apache.aries.spifly.core-internal" version="1.0.14"/>
-      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.14"/>
-      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.14"/>
-      <unit id="org.apache.aries.util" version="1.0.0"/>
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.3"/>
       <unit id="org.apache.commons.codec" version="1.10.0"/>
       <unit id="org.apache.commons.codec.source" version="1.10.0"/>
       <unit id="org.apache.commons.collections" version="3.2.2"/>
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 88ff7ee83..8e53c71fd 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
@@ -260,10 +260,7 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	net.ucanaccess.source
 	org.antlr.runtime
 	org.antlr.runtime.source
-	org.apache.aries.spifly.core-internal
 	org.apache.aries.spifly.dynamic.bundle
-	org.apache.aries.spifly.weaver-internal
-	org.apache.aries.util
 	org.apache.commons.codec
 	org.apache.commons.codec.source
 	org.apache.commons.collections
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index ad2f8c4ea..125cfdd38 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -259,10 +259,7 @@
       <unit id="net.ucanaccess.source" version="3.0.7"/>
       <unit id="org.antlr.runtime" version="3.5.2"/>
       <unit id="org.antlr.runtime.source" version="3.5.2"/>
-      <unit id="org.apache.aries.spifly.core-internal" version="1.0.14"/>
-      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.14"/>
-      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.14"/>
-      <unit id="org.apache.aries.util" version="1.0.0"/>
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.3"/>
       <unit id="org.apache.commons.codec" version="1.10.0"/>
       <unit id="org.apache.commons.codec.source" version="1.10.0"/>
       <unit id="org.apache.commons.collections" version="3.2.2"/>
-- 
2.47.1