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 4d0f06c1b8c98845e56a530b6d5617c3fb4bb41e..12a7d566b90eaa3a7202c057d605ee04545c054e 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -26,6 +26,8 @@
         <grpc.version.actual>1.14.0.b007</grpc.version.actual>
         <protobuf.version>3.5.1</protobuf.version>
         <zeroturnaround.version>1.10</zeroturnaround.version>
+        <eclipse.collections.version>9.2.0</eclipse.collections.version>
+        <caffeine.version>2.6.2</caffeine.version>
     </properties>
 
     <repositories>
@@ -290,7 +292,7 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections-api:8.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version}</id>
                                     <override>true</override>
                                     <source>true</source>
                                     <instructions>
@@ -298,8 +300,12 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections:8.1.0</id>
+                                    <id>org.eclipse.collections:eclipse-collections:${eclipse.collections.version}</id>
                                     <source>true</source>
+                                    <instructions>
+                                        <Require-Bundle>org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}"</Require-Bundle>
+                                        <Import-Package>!org.eclipse.*,!sun.misc.*,*;resolution:=optional</Import-Package>
+                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>net.sf.trove4j:trove4j:3.0.3</id>
@@ -532,6 +538,14 @@
                                     <source>true</source>
                                     <transitive>false</transitive>
                                 </artifact>
+                                <artifact>
+                                    <id>com.github.ben-manes.caffeine:caffeine:${caffeine.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-SymbolicName>com.github.benmanes.caffeine</Bundle-SymbolicName>
+                                    </instructions>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>

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 39b63c593852e73470d3111d489ef146b5e33d68..a8f5f2295811decf8f2aa75c0b35ae374d5b10ae 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1536132643">
+<target name="Eclipse Oxygen" sequenceNumber="1536142643">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -287,12 +287,14 @@
       <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections-api" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections.source" version="9.2.0"/>
       <unit id="org.eclipse.jetty.servlets" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.5.v20170502"/>
+      <unit id="com.github.benmanes.caffeine" version="2.6.2"/>
+      <unit id="com.github.benmanes.caffeine.source" version="2.6.2"/>
       <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>

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 83f2c2c7461f4c8a1e624ba24bc93665287a6bda..abbf6cf50c276cdc84634abb48408e7149cee55d 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
@@ -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 f54a47e8bf3bdf0a5cb5970e11386290c927f50c..1cf10acc75a0cd13f028b47c88f037d68a7d3b0b 100644 (file)
--- 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"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Simantics 1.37.0" sequenceNumber="1540817210">
+<target name="Simantics 1.37.0" sequenceNumber="1536142643">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -287,12 +287,14 @@
       <unit id="org.bouncycastle.bcprov-jdk14.source" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14" version="1.38.0"/>
       <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>
-      <unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections-api" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections-api.source" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections" version="9.2.0"/>
+      <unit id="org.eclipse.collections.eclipse-collections.source" version="9.2.0"/>
       <unit id="org.eclipse.jetty.servlets" version="9.4.5.v20170502"/>
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.5.v20170502"/>
+      <unit id="com.github.benmanes.caffeine" version="2.6.2"/>
+      <unit id="com.github.benmanes.caffeine.source" version="2.6.2"/>
       <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.locator" version="2.5.0.b32"/>