From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 14 Jun 2018 07:10:35 +0000 (+0300)
Subject: Fix split package problem with gnu.trove
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=76eddecd1d1ad1998d4b29c169f6b7878f544ea7;p=simantics%2Fplatform.git

Fix split package problem with gnu.trove

The problem was in org.simantics.acorn and was originally fixed from
release/1.29.0 but is now needed in release/1.28.1 as well.

refs #7156
gitlab #22

Change-Id: I72690843c16ff73e2d4f11bbfe22a4288b64609d
---

diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
index 28c851cb0..d0e7ced89 100644
--- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.simantics.acorn
 Bundle-Version: 1.1.2.qualifier
 Bundle-Vendor: Semantum Oy
 Require-Bundle: gnu.trove3;bundle-version="3.0.0",
- gnu.trove2;bundle-version="2.0.4",
  org.simantics.db.impl;bundle-version="0.8.0",
  org.simantics.db.server;bundle-version="1.0.0",
  org.simantics.compressions;bundle-version="1.0.0",
diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java
index 6b5252161..ddea93e5d 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/lru/ClusterLRU.java
@@ -16,7 +16,7 @@ import org.simantics.db.impl.ClusterBase;
 import org.simantics.db.impl.ClusterI;
 import org.simantics.db.service.ClusterUID;
 
-import gnu.trove.TIntIntHashMap;
+import gnu.trove.map.hash.TIntIntHashMap;
 
 public class ClusterLRU extends LRU<ClusterUID, ClusterInfo> {