From: jsimomaa Date: Wed, 12 Dec 2018 14:07:40 +0000 (+0200) Subject: Update eclipse-collections to version 9.2.0 & add caffeine X-Git-Tag: v1.43.0~136^2~233 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F2545%2F6;p=simantics%2Fplatform.git Update eclipse-collections to version 9.2.0 & add caffeine gitlab #231 Change-Id: I7d9f767f16702d3ae40820557dff0c9d574cc9aa --- diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index 4d0f06c1b..12a7d566b 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -26,6 +26,8 @@ 1.14.0.b007 3.5.1 1.10 + 9.2.0 + 2.6.2 @@ -290,7 +292,7 @@ true - org.eclipse.collections:eclipse-collections-api:8.1.0 + org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version} true true @@ -298,8 +300,12 @@ - org.eclipse.collections:eclipse-collections:8.1.0 + org.eclipse.collections:eclipse-collections:${eclipse.collections.version} true + + org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}" + !org.eclipse.*,!sun.misc.*,*;resolution:=optional + net.sf.trove4j:trove4j:3.0.3 @@ -532,6 +538,14 @@ true false + + com.github.ben-manes.caffeine:caffeine:${caffeine.version} + true + true + + com.github.benmanes.caffeine + + 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 39b63c593..a8f5f2295 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,7 +1,7 @@ - + @@ -287,12 +287,14 @@ - - - - + + + + + + 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 83f2c2c74..abbf6cf50 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 @@ -292,6 +292,8 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.eclipse.collections.eclipse-collections.source org.eclipse.jetty.servlets org.eclipse.jetty.servlets.source + com.github.benmanes.caffeine + com.github.benmanes.caffeine.source org.glassfish.hk2.api org.glassfish.hk2.api.source org.glassfish.hk2.locator diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index f54a47e8b..1cf10acc7 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - + @@ -287,12 +287,14 @@ - - - - + + + + + +