Skip to content

Commit

Permalink
Revert "Switch to trove4j version provided by the KNIME update site"
Browse files Browse the repository at this point in the history 
This reverts commit 3103321.
  • Loading branch information
@gab1one
gab1one committed Nov 16, 2017
1 parent a6265be commit 81cb0c9
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 12 deletions.
6 changes: 3 additions & 3 deletions autogen/bundlegroups/net.imagej.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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}" />
Expand Down
4 changes: 2 additions & 2 deletions autogen/bundlegroups/net.imglib2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 13 additions & 0 deletions autogen/bundlegroups/net.sf.trove4j.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion autogen/bundlegroups/org.scijava.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions autogen/bundlegroups/sc.fiji.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions autogen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
<!-- 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>
<jython-shaded.version>2.7.0</jython-shaded.version>
<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>
Expand Down
1 change: 1 addition & 0 deletions autogen/update-site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 81cb0c9

Please sign in to comment.