From 81cb0c9952ec312e631cdf6981624836744cc054 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 16 Nov 2017 14:40:55 +0100
Subject: [PATCH] Revert "Switch to trove4j version provided by the KNIME
 update site"

This reverts commit 3103321bb85d6bd36e7b03f1ac41f9046237f01e.
---
 autogen/bundlegroups/net.imagej.xml     |  6 +++---
 autogen/bundlegroups/net.imglib2.xml    |  4 ++--
 autogen/bundlegroups/net.sf.trove4j.xml | 13 +++++++++++++
 autogen/bundlegroups/org.scijava.xml    |  2 +-
 autogen/bundlegroups/sc.fiji.xml        |  6 +++---
 autogen/pom.xml                         |  6 +++---
 autogen/update-site.xml                 |  1 +
 7 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 autogen/bundlegroups/net.sf.trove4j.xml

diff --git a/autogen/bundlegroups/net.imagej.xml b/autogen/bundlegroups/net.imagej.xml
index cfc0146..9578257 100644
--- a/autogen/bundlegroups/net.imagej.xml
+++ b/autogen/bundlegroups/net.imagej.xml
@@ -32,7 +32,7 @@
 			<bundleref name="net.imglib2:imglib2-algorithm-fft" version="${imglib2-algorithm-fft.version}" />
 			<bundleref name="net.imglib2:imglib2-algorithm-gpl" version="${imglib2-algorithm-gpl.version}" />
 			<bundleref name="net.imglib2:imglib2-ij" version="${imglib2-ij.version}" />
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="org.apache.commons:commons-math3" version="${commons-math3.version}" isExternal="true" bundleId="org.apache.commons.math3"/>
 			<bundleref name="gov.nist.math:jama" version="${jama.version}" isExternal="true"/>
 		</dependencies>
@@ -142,7 +142,7 @@
 			<bundleref name="net.imagej:imagej-ui-awt" version="${imagej-ui-awt.version}" />
 			<bundleref name="com.miglayout:miglayout" version="${miglayout.version}" />
 			<bundleref name="org.jfree:jfreechart" version="${jfreechart.version}"/>
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="net.imagej:imagej-deprecated" version="${imagej-deprecated.version}" />
 			<bundleref name="net.imagej:imagej-updater" version="${imagej-updater.version}" />
 		</dependencies>
@@ -160,7 +160,7 @@
 		</artifacts>
 		<dependencies>
 			<bundleref name="org.scijava:scijava-common" version="${scijava-common.version}" />
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="net.imagej:imagej-common" version="${imagej-common.version}" />
 			<bundleref name="net.imglib2:imglib2-roi" version="${imglib2-roi.version}" />
 			<bundleref name="net.imglib2:imglib2" version="${imglib2.version}" />
diff --git a/autogen/bundlegroups/net.imglib2.xml b/autogen/bundlegroups/net.imglib2.xml
index 9c3754d..9893cf8 100644
--- a/autogen/bundlegroups/net.imglib2.xml
+++ b/autogen/bundlegroups/net.imglib2.xml
@@ -26,7 +26,7 @@
 			<bundleref name="net.imglib2:imglib2" version="${imglib2.version}" />
 			<bundleref name="net.imagej:imagej-common" version="${imagej-common.version}" />
 			<bundleref name="net.imglib2:imglib2-roi" version="${imglib2-roi.version}" />
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 		</dependencies>
 		<export>net.imglib2.algorithm.*,net.imglib2.multithreading.*</export>
 	</bundle>
@@ -117,7 +117,7 @@
 		</artifacts>
 		<dependencies>
 			<bundleref name="net.imglib2:imglib2" version="${imglib2.version}" />
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 		</dependencies>
 		<export>net.imglib2.roi.*,net.imglib2.labeling.*</export>
 	</bundle>
diff --git a/autogen/bundlegroups/net.sf.trove4j.xml b/autogen/bundlegroups/net.sf.trove4j.xml
new file mode 100644
index 0000000..26f3d56
--- /dev/null
+++ b/autogen/bundlegroups/net.sf.trove4j.xml
@@ -0,0 +1,13 @@
+<!-- trove4j bundle -->
+<bundlegroup name="net.sf.trove4j">
+	<bundle name="trove4j" version="${trove4j.version}">
+		<artifacts>
+			<artifact>
+				<group>net.sf.trove4j</group>
+				<id>trove4j</id>
+				<version>${trove4j.version}</version>
+			</artifact>
+		</artifacts>
+		<export>gnu.trove.*</export>
+	</bundle>
+</bundlegroup>
\ No newline at end of file
diff --git a/autogen/bundlegroups/org.scijava.xml b/autogen/bundlegroups/org.scijava.xml
index b65c131..82133ee 100644
--- a/autogen/bundlegroups/org.scijava.xml
+++ b/autogen/bundlegroups/org.scijava.xml
@@ -117,7 +117,7 @@
 		</artifacts>
 		<export>org.scijava.ui.behaviour.*</export>
 		<dependencies>
-            <bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="com.google.code.gson:gson" version="${gson.version}" isExternal="true" bundleId="com.google.gson"/>
 		</dependencies>
 	</bundle>
diff --git a/autogen/bundlegroups/sc.fiji.xml b/autogen/bundlegroups/sc.fiji.xml
index 61128b8..e2645fc 100644
--- a/autogen/bundlegroups/sc.fiji.xml
+++ b/autogen/bundlegroups/sc.fiji.xml
@@ -16,8 +16,8 @@
 			<bundleref name="net.imglib2:imglib2-realtransform" version="${imglib2-realtransform.version}" />
 			<bundleref name="net.imglib2:imglib2-ui" version="${imglib2-ui.version}" />
 			<bundleref name="net.imglib2:imglib2-algorithm" version="${imglib2-algorithm.version}" />
-            <bundleref name="com.google.code.gson:gson" version="${gson.version}" isExternal="true" bundleId="com.google.gson"/>
-	        <bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+          		<bundleref name="com.google.code.gson:gson" version="${gson.version}" isExternal="true" bundleId="com.google.gson"/>
+	                <bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="org.scijava:ui-behaviour" version="${ui-behaviour.version}" />
 	</dependencies>
 		<export>bdv.*, net.imglib2.img.basictypeaccess.volatiles.*, net.imglib2.interpolation.randomaccess.*, net.imglib2.type.volatiles.*, net.imglib2.display.*</export>
@@ -58,7 +58,7 @@
 			<bundleref name="net.imglib2:imglib2-ui" version="${imglib2-ui.version}" />
 			<bundleref name="net.imglib2:imglib2-algorithm" version="${imglib2-algorithm.version}" />
 			<bundleref name="com.google.code.gson:gson" version="${gson.version}" isExternal="true" bundleId="com.google.gson"/>
-			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" isExternal="true" bundleId="net.sf.trove4j"/>
+			<bundleref name="net.sf.trove4j:trove4j" version="${trove4j.version}" />
 			<bundleref name="org.scijava:ui-behaviour" version="${ui-behaviour.version}" />
 		</dependencies>
 		<export>bdv.util.*</export>
diff --git a/autogen/pom.xml b/autogen/pom.xml
index fe1a53f..db97727 100644
--- a/autogen/pom.xml
+++ b/autogen/pom.xml
@@ -27,6 +27,7 @@
 		<!-- manually manged versions -->
 		<ui-behaviour.version>1.2.0</ui-behaviour.version>
 		<vistools.version>1.0.0-beta-4</vistools.version>
+		<trove4j.version>3.0.3</trove4j.version>
 		<commons-collections.version>3.2.2</commons-collections.version>
 		<args4j.version>2.0.29</args4j.version>
 		<xerces.version>2.11.0</xerces.version>
@@ -34,11 +35,10 @@
  		<ilastik4ij.version>1.0.3</ilastik4ij.version>
  		<!-- We do not want to override the version of guava used during the build, only the one defined in update site -->
 		<guava-external.version>19.0</guava-external.version>
+		<jama.version>1.0.3</jama.version>
 
-        <!-- This are the versions shipped with the KNIME update site -->
+        <!-- This is the version shipped with the KNIME update site -->
 		<commons-math3.version>3.4.1</commons-math3.version>
-		<jama.version>1.0.3</jama.version>
-		<trove4j.version>2.0.2</trove4j.version>
 
         <!-- Manual overide until latest version is available in pom-scijava -->
         <scifio.version>0.33.0</scifio.version>
diff --git a/autogen/update-site.xml b/autogen/update-site.xml
index 49a9428..7779e20 100644
--- a/autogen/update-site.xml
+++ b/autogen/update-site.xml
@@ -17,6 +17,7 @@
 	<include>bundlegroups/io.scif.xml</include>
 	<include>bundlegroups/net.imagej.xml</include>
 	<include>bundlegroups/net.imglib2.xml</include>
+	<include>bundlegroups/net.sf.trove4j.xml</include>
 	<include>bundlegroups/org.knime.knip.xml</include>
 	<include>bundlegroups/org.scijava.xml</include>
 	<include>bundlegroups/com.miglayout.xml</include>