Skip to content

Commit 4d9cb7a

Browse files
committed
bump to version 0.10.0
* update dependencies to KNIME 3.0 and KNIP 1.4.0 * Use Java 8
1 parent 32deb64 commit 4d9cb7a

8 files changed

Lines changed: 25 additions & 19 deletions

File tree

org.knime.knip.omero.feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.knime.knip.omero.feature"
44
label="KNIME Image Processing - OMERO Integration"
5-
version="0.9.0.qualifier"
5+
version="0.10.0.qualifier"
66
provider-name="KNIME / OME">
77

88
<description>

org.knime.knip.omero.libs/.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="META-INF/toolsLib/omero.insight.jar"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
54
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
65
<classpathentry kind="src" path="src"/>
76
<classpathentry exported="true" kind="lib" path="insightLib/ai_path.jar"/>
@@ -82,5 +81,6 @@
8281
<classpathentry exported="true" kind="lib" path="insightLib/turbojpeg.jar"/>
8382
<classpathentry exported="true" kind="lib" path="insightLib/wsdl4j.jar"/>
8483
<classpathentry exported="true" kind="lib" path="insightLib/xalan.jar"/>
84+
<classpathentry exported="true" kind="lib" path="META-INF/toolsLib/omero.insight.jar"/>
8585
<classpathentry kind="output" path="bin"/>
8686
</classpath>

org.knime.knip.omero.libs/.settings/org.eclipse.jdt.core.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
34
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=1.8
46
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
57
org.eclipse.jdt.core.compiler.debug.localVariable=generate
68
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
79
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
810
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
11+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
912
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
1013
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
1114
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -14,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
1417
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
1518
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
1619
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
20+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1721
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
1822
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
1923
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -82,6 +86,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
8286
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
8387
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
8488
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
89+
org.eclipse.jdt.core.compiler.source=1.8
8590
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
8691
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
8792
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16

org.knime.knip.omero.libs/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: OmeroConnector-Node extension for KNIME Workbench Libraries
44
Bundle-SymbolicName: org.knime.knip.omero.libs;singleton:=true
5-
Bundle-Version: 0.9.0.qualifier
5+
Bundle-Version: 0.10.0.qualifier
66
Bundle-ClassPath: omeroconnector.jar,
77
insightLib/ai_path.jar,
88
insightLib/assumeng.jar,
@@ -297,5 +297,5 @@ Export-Package:
297297
util.org.openmicroscopy.shoola.util.ui.treetable.model,
298298
util.org.openmicroscopy.shoola.util.ui.treetable.renderers,
299299
util.org.openmicroscopy.shoola.util.ui.treetable.util
300-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
300+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
301301

org.knime.knip.omero.update/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.knime.knip.omero.update"
44
label="KNIP Update Site"
5-
version="0.9.0.qualifier">
5+
version="0.10.0.qualifier">
66

77
<includes
88
id="org.knime.knip.omero.feature"

org.knime.knip.omero/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>

org.knime.knip.omero/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
44
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5-
org.eclipse.jdt.core.compiler.compliance=1.7
5+
org.eclipse.jdt.core.compiler.compliance=1.8
66
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
77
org.eclipse.jdt.core.compiler.debug.localVariable=generate
88
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -86,7 +86,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
8686
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
8787
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
8888
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
89-
org.eclipse.jdt.core.compiler.source=1.7
89+
org.eclipse.jdt.core.compiler.source=1.8
9090
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
9191
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
9292
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16

org.knime.knip.omero/META-INF/MANIFEST.MF

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: OmeroConnector-Node extension for KNIME Workbench
44
Bundle-SymbolicName: org.knime.knip.omero;singleton:=true
5-
Bundle-Version: 0.9.0.qualifier
5+
Bundle-Version: 0.10.0.qualifier
66
Bundle-ClassPath: omeroconnector.jar
77
Bundle-Activator: org.knime.knip.omero.OmeroReaderNodePlugin
88
Bundle-Vendor:
99
Require-Bundle: org.eclipse.core.runtime,
1010
org.knime.knip.omero.libs;bundle-version="0.8.2",
11-
org.knime.workbench.core;bundle-version="[2.10.0,3.0.0)",
12-
org.knime.workbench.repository;bundle-version="[2.10.0,3.0.0)",
13-
org.knime.base;bundle-version="[2.10.0,3.0.0)",
14-
org.knime.knip.base;bundle-version="[1.2.0,1.4.0)",
15-
org.knime.knip.core;bundle-version="[1.2.0,1.4.0)",
16-
imglib2;bundle-version="2.2.0",
17-
imagej-common;bundle-version="0.12.0"
11+
org.knime.workbench.core;bundle-version="[3.0.0,4.0.0)",
12+
org.knime.workbench.repository;bundle-version="[3.0.0,4.0.0)",
13+
org.knime.base;bundle-version="[3.0.0,4.0.0)",
14+
org.knime.knip.base;bundle-version="[1.4.0,2.0.0)",
15+
org.knime.knip.core;bundle-version="[1.4.0,2.0.0)",
16+
imglib2;bundle-version="2.4.0",
17+
imagej-common;bundle-version="0.18.0",
18+
scijava-cache;bundle-version="0.1.0"
1819
Bundle-ActivationPolicy: lazy
1920
Export-Package: org.knime.knip.omero
20-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
21+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2122

0 commit comments

Comments
 (0)