From 1b6da5d2b2f7f4e0636e26fa0af74c69af330081 Mon Sep 17 00:00:00 2001 From: Gabriel Einsdorf Date: Mon, 8 Jul 2024 15:12:15 +0200 Subject: [PATCH 1/3] Fixed scijava plugin json generation --- pom.xml | 2 +- runEclipseHelper.sh | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fabfd0d..d8566a3 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ ${session.executionRootDirectory}/runEclipseHelper.sh - ${project.build.outputDirectory} + ${project.build.directory} diff --git a/runEclipseHelper.sh b/runEclipseHelper.sh index 1ef94b2..0190820 100755 --- a/runEclipseHelper.sh +++ b/runEclipseHelper.sh @@ -4,7 +4,7 @@ # skip execution if we are in the root dir if [[ -f "$(pwd)/runEclipseHelper.sh" ]]; then echo "skipping execution in the root directory" - return 0 + exit 0 fi if [[ -z $JAVA8 ]]; then @@ -22,4 +22,13 @@ 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 +$JAVA8 -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" + +if [[ -f $scijavaPluginFile ]]; then + mkdir -p "$outputDir/../META-INF/json/" + mv "$scijavaPluginFile" "$outputDir/../META-INF/json/org.scijava.plugin.Plugin" + echo "Scijava plugin file detected, moving it to the META-INF directory" +fi \ No newline at end of file From 89c5336d6e16f30ff7cd8dea31bd592ddf4326d1 Mon Sep 17 00:00:00 2001 From: Gabriel Einsdorf Date: Mon, 8 Jul 2024 16:40:10 +0200 Subject: [PATCH 2/3] Added org.scijava.plugin.Plugin files togit --- .gitignore | 3 +-- .../META-INF/json/org.scijava.plugin.Plugin | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 org.knime.scijava.commands/META-INF/json/org.scijava.plugin.Plugin diff --git a/.gitignore b/.gitignore index cff786e..383e6e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ target/ bin/ *.jar -.polyglot.* -**/META-INF/json/* \ No newline at end of file +.polyglot.* \ No newline at end of file diff --git a/org.knime.scijava.commands/META-INF/json/org.scijava.plugin.Plugin b/org.knime.scijava.commands/META-INF/json/org.scijava.plugin.Plugin new file mode 100644 index 0000000..a1127b0 --- /dev/null +++ b/org.knime.scijava.commands/META-INF/json/org.scijava.plugin.Plugin @@ -0,0 +1 @@ +{"class":"classes.org.knime.scijava.commands.process.DefaultKnimePostprocessor","values":{"priority":0.0,"type":"org.scijava.module.process.PostprocessorPlugin"}}{"class":"classes.org.knime.scijava.commands.settings.DefaultNodeModelSettingsService","values":{"type":"org.knime.scijava.commands.settings.NodeModelSettingsService"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelStringType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelAggregationMethodType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelIntegerType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelLongType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelDoubleType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelBooleanType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.types.SettingsModelColorType","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypePlugin"}}{"class":"classes.org.knime.scijava.commands.settings.DefaultNodeSettingsHarvester","values":{"priority":0.0,"type":"org.scijava.module.process.PreprocessorPlugin"}}{"class":"classes.org.knime.scijava.commands.settings.DefaultSettingsModelTypeService","values":{"type":"org.knime.scijava.commands.settings.SettingsModelTypeService"}}{"class":"classes.org.knime.scijava.commands.settings.DefaultNodeDialogSettingsService","values":{"type":"org.knime.scijava.commands.settings.NodeDialogSettingsService"}}{"class":"classes.org.knime.scijava.commands.io.DefaultOutputDataRowService","values":{"priority":0.0,"type":"org.knime.scijava.commands.io.OutputDataRowService"}}{"class":"classes.org.knime.scijava.commands.io.DefaultInputDataRowService","values":{"priority":0.0,"type":"org.knime.scijava.commands.io.InputDataRowService"}}{"class":"classes.org.knime.scijava.commands.widget.KNIMEWidgetService","values":{"priority":100.0,"type":"org.scijava.widget.WidgetService"}}{"class":"classes.org.knime.scijava.commands.simplemapping.DefaultSimpleColumMappingService","values":{"type":"org.knime.scijava.commands.simplemapping.SimpleColumnMappingService"}}{"class":"classes.org.knime.scijava.commands.simplemapping.DefaultSimpleMappingPreProcessor","values":{"priority":100.0,"type":"org.scijava.module.process.PreprocessorPlugin"}}{"class":"classes.org.knime.scijava.commands.DefaultKnimeExecutionService","values":{"priority":0.0,"type":"org.knime.scijava.commands.KNIMEExecutionService"}}{"class":"classes.org.knime.scijava.commands.converter.DefaultConverterCacheService","values":{"type":"org.knime.scijava.commands.converter.ConverterCacheService"}} \ No newline at end of file From 30b7a040449426f92bacbde6c41cc8b3e75e9749 Mon Sep 17 00:00:00 2001 From: Ali Marvi Date: Tue, 25 Nov 2025 15:06:09 +0100 Subject: [PATCH 3/3] Migrated to Java21 --- org.knime.scijava.commands.testing/.classpath | 6 ++- .../.settings/org.eclipse.jdt.core.prefs | 9 +++-- .../META-INF/MANIFEST.MF | 2 +- org.knime.scijava.commands/.classpath | 6 ++- .../.settings/org.eclipse.jdt.core.prefs | 37 +++++++++++++++---- .../META-INF/MANIFEST.MF | 2 +- org.knime.scijava.core/.classpath | 6 ++- .../.settings/org.eclipse.jdt.core.prefs | 9 +++-- org.knime.scijava.core/META-INF/MANIFEST.MF | 2 +- pom.xml | 24 +++++++----- runEclipseHelper.sh | 6 +-- 11 files changed, 77 insertions(+), 32 deletions(-) diff --git a/org.knime.scijava.commands.testing/.classpath b/org.knime.scijava.commands.testing/.classpath index eca7bdb..35386b9 100644 --- a/org.knime.scijava.commands.testing/.classpath +++ b/org.knime.scijava.commands.testing/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.knime.scijava.commands.testing/.settings/org.eclipse.jdt.core.prefs b/org.knime.scijava.commands.testing/.settings/org.eclipse.jdt.core.prefs index 0c68a61..3a79233 100644 --- a/org.knime.scijava.commands.testing/.settings/org.eclipse.jdt.core.prefs +++ b/org.knime.scijava.commands.testing/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.knime.scijava.commands.testing/META-INF/MANIFEST.MF b/org.knime.scijava.commands.testing/META-INF/MANIFEST.MF index 8fa46ae..8027903 100644 --- a/org.knime.scijava.commands.testing/META-INF/MANIFEST.MF +++ b/org.knime.scijava.commands.testing/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KNIP Scijava Commands Testing Bundle-SymbolicName: org.knime.scijava.commands.testing;singleton:=true Bundle-Version: 0.6.2.qualifier Fragment-Host: org.knime.scijava.commands;bundle-version="0.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BuddyPolicy: registered Require-Bundle: org.knime.testing;bundle-version="3.0.0", org.knime.core;bundle-version="3.0.0", diff --git a/org.knime.scijava.commands/.classpath b/org.knime.scijava.commands/.classpath index 20fefe5..8a75342 100644 --- a/org.knime.scijava.commands/.classpath +++ b/org.knime.scijava.commands/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.knime.scijava.commands/.settings/org.eclipse.jdt.core.prefs b/org.knime.scijava.commands/.settings/org.eclipse.jdt.core.prefs index 9d42ea0..b955e73 100644 --- a/org.knime.scijava.commands/.settings/org.eclipse.jdt.core.prefs +++ b/org.knime.scijava.commands/.settings/org.eclipse.jdt.core.prefs @@ -1,15 +1,19 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -17,17 +21,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -113,11 +120,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -148,6 +156,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -172,13 +182,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -226,6 +240,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -262,9 +278,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -290,7 +309,11 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/org.knime.scijava.commands/META-INF/MANIFEST.MF b/org.knime.scijava.commands/META-INF/MANIFEST.MF index dda999c..14743d6 100644 --- a/org.knime.scijava.commands/META-INF/MANIFEST.MF +++ b/org.knime.scijava.commands/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", scijava-ui-awt;bundle-version="0.1.6", scijava-ui-swing;bundle-version="0.11.0", org.knime.scijava.core;bundle-version="0.6.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-ClassPath: scijava_commands.jar Export-Package: org.knime.scijava.commands, diff --git a/org.knime.scijava.core/.classpath b/org.knime.scijava.core/.classpath index eca7bdb..35386b9 100644 --- a/org.knime.scijava.core/.classpath +++ b/org.knime.scijava.core/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.knime.scijava.core/.settings/org.eclipse.jdt.core.prefs b/org.knime.scijava.core/.settings/org.eclipse.jdt.core.prefs index 3a21537..92dd3c2 100644 --- a/org.knime.scijava.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.knime.scijava.core/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.knime.scijava.core/META-INF/MANIFEST.MF b/org.knime.scijava.core/META-INF/MANIFEST.MF index cd4e867..b12f0ef 100644 --- a/org.knime.scijava.core/META-INF/MANIFEST.MF +++ b/org.knime.scijava.core/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0", org.knime.base;bundle-version="[3.3.0,6.0.0)", org.knime.workbench.repository;bundle-version="[3.3.0,6.0.0)", scijava-common;bundle-version="2.74.2" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Export-Package: org.knime.scijava.core, diff --git a/pom.xml b/pom.xml index d8566a3..7f84814 100644 --- a/pom.xml +++ b/pom.xml @@ -12,11 +12,14 @@ 1.0.0 -SNAPSHOT - 5.1 - 2.7.5 + nightly + 4.0.13 ${tycho.version} UTF-8 UTF-8 + 21 + 21 + 21 @@ -84,7 +87,7 @@ - org.eclipse.tycho.extras + org.eclipse.tycho tycho-buildtimestamp-jgit ${tycho.extras.version} @@ -116,7 +119,7 @@ org.eclipse.tycho.extras tycho-dependency-tools-plugin - 1.7.0 + ${tycho.version} list-dependencies @@ -134,7 +137,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.2.0 run-eclipse-helper @@ -152,14 +155,14 @@ - org.eclipse.tycho.extras - tycho-source-feature-plugin + org.eclipse.tycho + tycho-source-plugin - source-feature + feature-source package - source-feature + feature-source @@ -180,7 +183,7 @@ tycho-packaging-plugin - org.eclipse.tycho.extras + org.eclipse.tycho tycho-buildtimestamp-jgit ${tycho.extras.version} @@ -206,6 +209,7 @@ org.eclipse.tycho target-platform-configuration + JavaSE-21 diff --git a/runEclipseHelper.sh b/runEclipseHelper.sh index 0190820..7340225 100755 --- a/runEclipseHelper.sh +++ b/runEclipseHelper.sh @@ -7,8 +7,8 @@ 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" +if [[ -z $JAVA_HOME ]]; then + echo "JAVA_HOME environment variable not set. Please set it to the path of a Java 8 java executable" exit 1 fi @@ -22,7 +22,7 @@ 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_HOME -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"