Switch to aries spifly 1.2.3

gitlab #405

Change-Id: I51289aa93a2705364fd654df1bd35b6d6d4242ae

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 1913b5a106c3e33463cbce4696271ae7bcf6f9fa..ba63fcdb4bc2ecbfb4a2dc76397d27178306508a 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
@@ -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 88ff7ee83e4cc1e81e6036f7cca1a816b72bb0a1..8e53c71fd30dbaf8afc7e43249c7f02d12026b00 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
@@ -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 ad2f8c4eaa7a3697b207e4108c424ff0431ff933..125cfdd38b679b6399157bd4a409053fd1cf1f63 100644 (file)
--- 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"/>