Enh/update ext to build via java21

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

@@ -35,7 +35,7 @@ Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  spim_data;bundle-version="2.2.1",
  miglayout;bundle-version="3.7.4",
  bigdataviewer-ui-panel;bundle-version="0.1.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ClassPath: knip-base.jar
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.knime.knip.base.KNIMEKNIPPlugin

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

@@ -7,7 +7,7 @@ Bundle-Version: 1.8.3.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0",
  org.knime.core;bundle-version="3.1.1",
  org.knime.workbench.repository;bundle-version="3.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.apache.log4j
 Export-Package: org.knime.knip.cellviewer,
  org.knime.knip.cellviewer.interfaces

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

@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.knime.knip.core;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Version: 1.8.3.qualifier
 Bundle-Vendor: University of Konstanz
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ClassPath: knip-core.jar
 Eclipse-BuddyPolicy: registered
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",

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

@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0",
  imagej-mesh;bundle-version="0.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.knime.knip.features,
  org.knime.knip.features.sets,
  org.knime.knip.features.sets.optimizedfeatures

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

@@ -3,7 +3,7 @@ Bundle-Name: KNIME Image IO
 Bundle-SymbolicName: org.knime.knip.io;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Version: 1.8.3.qualifier
-Eclipse-BuddyPolicy: registered
+Eclipse-BuddyPolicy: boot
 Bundle-Vendor: University of Konstanz
 Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  org.knime.workbench.repository;bundle-version="[3.0.0,6.0.0)",
@@ -23,9 +23,10 @@ Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  scifio-lifesci;bundle-version="0.7.0",
  org.knime.knip.cellviewer;bundle-version="1.5.0",
  org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: knip-io.jar
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=21))"
 Export-Package: org.knime.knip.io,
  org.knime.knip.io.formats,
  org.knime.knip.io.node.dialog,

org.knime.knip.io/plugin.xml

@@ -157,10 +157,12 @@
 			<FileExtension extension="zvi"></FileExtension>
         </FileExtensionMapping>
      </extension>
+     <!-- Temporarily disabled due to split package issue with org.w3c.dom in Java 21 / Tycho 4.x
      <extension
            point="org.knime.knip.cellviewer.cellviews">
         <CellView
               CellViewProviderFactory="org.knime.knip.io.view.XMLCellViewFactory">
         </CellView>
      </extension>
+     -->
 </plugin>

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

@@ -23,7 +23,7 @@ Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  imagej-ops,
  imglib2-cache;bundle-version="1.0.9",
  scijava-search;bundle-version="0.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: knip-io2.jar,
  libs/scifio-1.0.0-SNAPSHOT.jar,

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

@@ -15,7 +15,7 @@ Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  imglib2-roi;bundle-version="0.8.0",
  imagej-common;bundle-version="0.12.0",
  scijava-common;bundle-version="2.36.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ClassPath: kniptesting.jar
 Bundle-ActivationPolicy: lazy
 

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

@@ -21,6 +21,6 @@ Require-Bundle: org.knime.base;bundle-version="[3.0.0,6.0.0)",
  knip-trackmate-fork;bundle-version="2.7.3",
  imagej-ops;bundle-version="0.16.0",
  org.knime.knip.cellviewer;bundle-version="1.5.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ClassPath: kniptracking.jar
 

pom.xml

@@ -12,11 +12,14 @@
 	<properties>
 		<revision>1.0.0</revision>
 		<changelist>-SNAPSHOT</changelist>
-		<knime.version>5.2</knime.version>
-		<tycho.version>2.7.5</tycho.version>
+		<knime.version>nightly</knime.version>
+		<tycho.version>4.0.13</tycho.version>
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+		<maven.compiler.release>21</maven.compiler.release>
 	</properties>
 
 	<!-- List the modules of your project here -->
@@ -57,6 +60,16 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.9.11</version>
+					<configuration>
+						<source>21</source>
+						<target>21</target>
+						<release>21</release>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-maven-plugin</artifactId>
@@ -83,21 +96,30 @@
 					<artifactId>tycho-p2-director-plugin</artifactId>
 					<version>${tycho.version}</version>
 				</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<release>21</release>
+					<useJDK>BREE</useJDK>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<trimStackTrace>false</trimStackTrace>
+					<includes>
+						<include>%regex[.*]</include>
+					</includes>
+				</configuration>
+			</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-surefire-plugin</artifactId>
-					<version>${tycho.version}</version>
-					<configuration>
-						<trimStackTrace>false</trimStackTrace>
-						<includes>
-							<include>%regex[.*]</include>
-						</includes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho.extras</groupId>
 					<artifactId>tycho-buildtimestamp-jgit</artifactId>
-					<version>${tycho.extras.version}</version>
+					<version>${tycho.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho.extras</groupId>
@@ -109,11 +131,6 @@
 					<artifactId>tycho-p2-extras-plugin</artifactId>
 					<version>${tycho.extras.version}</version>
 				</plugin>
-				<plugin>
-					<groupId>org.eclipse.tycho.extras</groupId>
-					<artifactId>tycho-source-feature-plugin</artifactId>
-					<version>${tycho.extras.version}</version>
-				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-source-plugin</artifactId>
@@ -127,7 +144,7 @@
 				<plugin>
 					<groupId>org.eclipse.tycho.extras</groupId>
 					<artifactId>tycho-dependency-tools-plugin</artifactId>
-					<version>1.7.0</version>
+					<version>${tycho.extras.version}</version>
 					<executions>
 						<execution>
 							<id>list-dependencies</id>
@@ -145,7 +162,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.6.0</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>run-eclipse-helper</id>
@@ -164,14 +181,14 @@
 
 				<!-- This plugin configuration block is only needed if the repository contains plug-ins that don't have any sources. If it is omitted
 		 		Tycho will complain. -->
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>source-feature</id>
+						<id>feature-source</id>
 						<phase>package</phase>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -192,9 +209,9 @@
 				<artifactId>tycho-packaging-plugin</artifactId>
 				<dependencies>
 					<dependency>
-						<groupId>org.eclipse.tycho.extras</groupId>
+						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-buildtimestamp-jgit</artifactId>
-						<version>${tycho.extras.version}</version>
+						<version>${tycho.version}</version>
 					</dependency>
 				</dependencies>
 				<configuration>
@@ -218,6 +235,8 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<configuration>
+					<executionEnvironment>JavaSE-21</executionEnvironment>
+					<pomDependencies>consider</pomDependencies>
 					<environments>
 						<!-- These can be removed once we shut down the Buckminster build -->
 						<environment>

runEclipseHelper.sh

@@ -7,22 +7,32 @@ if [[ -f "$(pwd)/runEclipseHelper.sh" ]]; then
 	exit 0
 fi
 
-if [[ -z $JAVA8 ]]; then
-	echo "JAVA8 environment variable not set. Please set it to the path of a Java 8 java executable"
-	exit 1
+# Determine which Java to use
+if [[ -n $JAVA8 ]]; then
+	JAVA_CMD=$JAVA8
+	echo "Using JAVA8 environment variable: $JAVA_CMD"
+else
+	# Fall back to java from PATH (e.g., JDK 21 on Jenkins)
+	JAVA_CMD=$(which java)
+	if [[ -z $JAVA_CMD ]]; then
+		echo "No Java executable found. Please set JAVA8 or ensure java is in PATH."
+		exit 0
+	fi
+	echo "JAVA8 not set. Using java from PATH: $JAVA_CMD"
 fi
 
 if [[ -z $KNIP_EXTERNALS_US ]]; then
-	echo "KNIP_EXTERNALS_US environment variable not set. Please set it to the path of the knip-externals update site directory"
-	exit 1
+	echo "KNIP_EXTERNALS_US environment variable not set. Skipping EclipseHelper annotation processor."
+	echo "Please set it to the path of the knip-externals update site directory if scijava annotations are needed."
+	exit 0
 fi
 
 
 outputDir=$1
 
 # find scijava_common.jar
 scijavaCommonJar=$(find "$KNIP_EXTERNALS_US" -name 'scijava-common_*.jar' | head -n 1)
-$JAVA8 -Dscijava.log.level=debug -classpath "$scijavaCommonJar:$outputDir" org.scijava.annotations.EclipseHelper
+$JAVA_CMD -Dscijava.log.level=debug -classpath "$scijavaCommonJar:$outputDir" org.scijava.annotations.EclipseHelper
 
 # if there are scijava plugin annotations, this file will be created
 scijavaPluginFile="${outputDir}/META-INF/json/org.scijava.plugin.Plugin"