bump to 1.1.0

* changed KNIME/KNIP minimum versions * changed to Java 8
knime-ip · Oct 11, 2015 · b0d5eb0 · b0d5eb0
1 parent 8a7b00f
commit b0d5eb0
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 46 deletions.
diff --git a/org.knime.knip.imagej3d.base/.classpath b/org.knime.knip.imagej3d.base/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/ij3d_knip_build.jar"/>

diff --git a/org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs b/org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF
@@ -2,24 +2,25 @@ Manifest-Version: 1.0
 Bundle-Name: KNIME ImageJ 3D Viewer Integration
 Bundle-SymbolicName: org.knime.knip.imagej3d.base;singleton:=true
 Bundle-ManifestVersion: 2
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Eclipse-RegisterBuddy: org.knime.knip.imagej2.core
 Bundle-Vendor: University of Konstanz / FIJI (http://3dviewer.neurofly.de/)
-Require-Bundle: org.knime.workbench.repository;bundle-version="[2.10.0,3.0.0)",
+Require-Bundle: org.knime.workbench.repository;bundle-version="[3.0.0,4.0.0)",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.knime.knip.base;bundle-version="[1.2.0,2.0.0)",
  org.knime.knip.core;bundle-version="[1.2.0,2.0.0)",
- org.knime.knip.imagej2.core;bundle-version="[0.9.0,0.10.0)",
- org.knime.core;bundle-version="[2.10.0,3.0.0)",
+ org.knime.knip.imagej2.core;bundle-version="[0.10.0,0.11.0)",
+ org.knime.core;bundle-version="[3.0.0,4.0.0)",
  imglib2;bundle-version="2.2.0",
  imagej-common;bundle-version="0.12.0",
  ij;bundle-version="1.49.0",
  imglib2-ij;bundle-version="2.0.0",
  knip-tmp-imglib2-ops;bundle-version="0.1.4",
- scijava-common;bundle-version="2.37.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ scijava-common;bundle-version="2.47.0",
+ scijava-cache;bundle-version="0.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/ij3d_knip_build.jar,
  lib/j3dcore.jar,

diff --git a/org.knime.knip.imagej3d.base/src/org/knime/knip/imagej3d/ImageJ3DTableCellView.java b/org.knime.knip.imagej3d.base/src/org/knime/knip/imagej3d/ImageJ3DTableCellView.java
@@ -49,14 +49,6 @@
 
 package org.knime.knip.imagej3d;
 
-import ij.ImagePlus;
-import ij.process.ByteProcessor;
-import ij.process.ImageProcessor;
-import ij3d.Content;
-import ij3d.ContentConstants;
-import ij3d.Image3DUniverse;
-import ij3d.ImageWindow3D;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -75,17 +67,6 @@
 import javax.swing.SwingWorker;
 import javax.swing.ToolTipManager;
 
-import net.imagej.ImgPlus;
-import net.imglib2.converter.Converter;
-import net.imglib2.ops.operation.Operations;
-import net.imglib2.ops.operation.iterableinterval.unary.MinMax;
-import net.imglib2.ops.operation.real.unary.Normalize;
-import net.imglib2.type.Type;
-import net.imglib2.type.numeric.RealType;
-import net.imglib2.type.numeric.real.DoubleType;
-import net.imglib2.type.numeric.real.FloatType;
-import net.imglib2.util.ValuePair;
-
 import org.knime.core.data.DataValue;
 import org.knime.core.node.NodeLogger;
 import org.knime.core.node.config.ConfigRO;
@@ -97,6 +78,23 @@
 import org.knime.knip.imagej2.core.util.ImageProcessorFactory;
 import org.knime.knip.imagej2.core.util.ImgToIJ;
 
+import ij.ImagePlus;
+import ij.process.ByteProcessor;
+import ij.process.ImageProcessor;
+import ij3d.Content;
+import ij3d.ContentConstants;
+import ij3d.Image3DUniverse;
+import ij3d.ImageWindow3D;
+import net.imagej.ImgPlus;
+import net.imglib2.converter.Converter;
+import net.imglib2.ops.operation.Operations;
+import net.imglib2.ops.operation.iterableinterval.unary.MinMax;
+import net.imglib2.ops.operation.real.unary.Normalize;
+import net.imglib2.type.Type;
+import net.imglib2.type.numeric.RealType;
+import net.imglib2.type.numeric.real.DoubleType;
+import net.imglib2.type.numeric.real.FloatType;
+import net.imglib2.util.ValuePair;
 import view4d.Timeline;
 import view4d.TimelineGUI;
 

diff --git a/org.knime.knip.imagej3d.bin.linux.amd64/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.bin.linux.amd64/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86_64
 Bundle-SymbolicName: org.knime.knip.imagej3d.bin.linux.amd64;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 1.1.0.qualifier
+Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: University of Konstanz
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64))
 
diff --git a/org.knime.knip.imagej3d.bin.linux.x86/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.bin.linux.x86/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86
 Bundle-SymbolicName: org.knime.knip.imagej3d.bin.linux.x86
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: University of Konstanz
-Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86))
diff --git a/org.knime.knip.imagej3d.bin.macosx.amd64/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.bin.macosx.amd64/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ImageJ 3D Viewer Libraries for OSX
 Bundle-SymbolicName: org.knime.knip.imagej3d.bin.macosx.amd64;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: University of Konstanz
-Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
 Eclipse-PlatformFilter: (&(osgi.os=macosx)(osgi.arch=x86_64))
 Bundle-ClassPath: .
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 
 
diff --git a/org.knime.knip.imagej3d.bin.windows.amd64/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.bin.windows.amd64/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ImageJ 3D Viewer Libraries for Windows x86_64
 Bundle-SymbolicName: org.knime.knip.imagej3d.bin.windows.amd64
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: University of Konstanz
-Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86_64))
diff --git a/org.knime.knip.imagej3d.bin.windows.x86/META-INF/MANIFEST.MF b/org.knime.knip.imagej3d.bin.windows.x86/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ImageJ 3D Viewer Libraries for Linux x86
 Bundle-SymbolicName: org.knime.knip.imagej3d.bin.windows.x86
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: University of Konstanz
-Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Fragment-Host: org.knime.knip.imagej3d.base;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86))
diff --git a/org.knime.knip.imagej3d.feature/feature.xml b/org.knime.knip.imagej3d.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.knime.knip.imagej3d.feature"
       label="KNIME Image Processing - ImageJ 3D Viewer Integration"
-      version="1.0.1.qualifier"
+      version="1.1.0.qualifier"
       provider-name="KNIME / FIJI (http://3dviewer.neurofly.de/)">
 
    <description>

diff --git a/org.knime.knip.imagej3d.update/feature.xml b/org.knime.knip.imagej3d.update/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.knime.knip.imagej3d.update"
       label="KNIME Image Processing - ImageJ 3D Viewer Integration"
-      version="1.0.1.qualifier">
+      version="1.1.0.qualifier">
 
    <includes
          id="org.knime.knip.imagej3d.feature"