From e8429f2292c97c72550da96ae0de694b760dc156 Mon Sep 17 00:00:00 2001 From: Steffen Fissler <116347597+steffen-fissler@users.noreply.github.com> Date: Thu, 24 Aug 2023 10:36:35 +0200 Subject: [PATCH 1/4] Change knime.version to 5.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b38c3dd..4aa2871 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 2.1.0 -SNAPSHOT - 5.0 + 5.1 2.7.5 ${tycho.version} UTF-8 From 634c782d17a76773001c0f18c9c205853a4d6c04 Mon Sep 17 00:00:00 2001 From: Steffen Fissler <116347597+steffen-fissler@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:47:21 +0200 Subject: [PATCH 2/4] KNIME 5.1 ready * Update classpaths * tests feature: update boundaries and JavaSE * cp feature: update boundaries * testing feature: -XstartOnFirstThread --- se.redfield.cp.tests/.classpath | 8 ++++++-- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- se.redfield.cp.tests/META-INF/MANIFEST.MF | 6 +++--- se.redfield.cp.tests/pom.xml | 1 + se.redfield.cp/.classpath | 4 ++-- se.redfield.cp/META-INF/MANIFEST.MF | 7 ++++--- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/se.redfield.cp.tests/.classpath b/se.redfield.cp.tests/.classpath index eca7bdb..675a5e2 100644 --- a/se.redfield.cp.tests/.classpath +++ b/se.redfield.cp.tests/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/se.redfield.cp.tests/.settings/org.eclipse.jdt.core.prefs b/se.redfield.cp.tests/.settings/org.eclipse.jdt.core.prefs index 0c68a61..d4540a5 100644 --- a/se.redfield.cp.tests/.settings/org.eclipse.jdt.core.prefs +++ b/se.redfield.cp.tests/.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=17 +org.eclipse.jdt.core.compiler.compliance=17 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=17 diff --git a/se.redfield.cp.tests/META-INF/MANIFEST.MF b/se.redfield.cp.tests/META-INF/MANIFEST.MF index 2820a18..ed1172b 100644 --- a/se.redfield.cp.tests/META-INF/MANIFEST.MF +++ b/se.redfield.cp.tests/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: Testing Bundle-SymbolicName: se.redfield.cp.tests;singleton:=true Bundle-Version: 2.1.0.qualifier Automatic-Module-Name: se.redfield.cp.tests -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.knime.core;bundle-version="[5.0.0,6.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: org.knime.core;bundle-version="[5.1.0,6.0.0)", org.junit;bundle-version="[4.12.0,5.0.0)", - org.knime.testing;bundle-version="[5.0.0,6.0.0)" + org.knime.testing;bundle-version="[5.1.0,6.0.0)" Import-Package: se.redfield.cp.nodes, se.redfield.cp.settings, se.redfield.cp.utils diff --git a/se.redfield.cp.tests/pom.xml b/se.redfield.cp.tests/pom.xml index 9618eaa..3c236ed 100644 --- a/se.redfield.cp.tests/pom.xml +++ b/se.redfield.cp.tests/pom.xml @@ -24,6 +24,7 @@ ${tycho.version} true + -XstartOnFirstThread diff --git a/se.redfield.cp/.classpath b/se.redfield.cp/.classpath index 06bb5d7..81fe078 100644 --- a/se.redfield.cp/.classpath +++ b/se.redfield.cp/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/se.redfield.cp/META-INF/MANIFEST.MF b/se.redfield.cp/META-INF/MANIFEST.MF index 19d8bf8..a7db4d4 100644 --- a/se.redfield.cp/META-INF/MANIFEST.MF +++ b/se.redfield.cp/META-INF/MANIFEST.MF @@ -1,5 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: se.redfield.cp Bundle-Name: Conformal Prediction extension for KNIME Workbench Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SymbolicName: se.redfield.cp; singleton:=true @@ -8,9 +9,9 @@ Bundle-ClassPath: . Bundle-Activator: se.redfield.cp.ConformalPredictionPlugin Bundle-Vendor: Redfield AB Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)", - org.knime.workbench.core;bundle-version="[5.0.0,6.0.0)", - org.knime.workbench.repository;bundle-version="[5.0.0,6.0.0)", - org.knime.base;bundle-version="[5.0.0,6.0.0)" + org.knime.workbench.core;bundle-version="[5.1.0,6.0.0)", + org.knime.workbench.repository;bundle-version="[5.1.0,6.0.0)", + org.knime.base;bundle-version="[5.1.0,6.0.0)" Bundle-ActivationPolicy: lazy Export-Package: se.redfield.cp, se.redfield.cp.nodes, From 826e83e22a9b09f6150479e70a4fb83c47eb13f5 Mon Sep 17 00:00:00 2001 From: Steffen Fissler <116347597+steffen-fissler@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:57:51 +0200 Subject: [PATCH 3/4] Adjust ColumnPattern ExtractorTest Did this test ever run before? --- .../cp/testing/ColumnPatternExctractorTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/se.redfield.cp.tests/src/se/redfield/cp/testing/ColumnPatternExctractorTest.java b/se.redfield.cp.tests/src/se/redfield/cp/testing/ColumnPatternExctractorTest.java index 5759453..1fad14e 100644 --- a/se.redfield.cp.tests/src/se/redfield/cp/testing/ColumnPatternExctractorTest.java +++ b/se.redfield.cp.tests/src/se/redfield/cp/testing/ColumnPatternExctractorTest.java @@ -30,14 +30,14 @@ import se.redfield.cp.settings.ClassifierSettings; import se.redfield.cp.utils.ColumnPatternExtractor; -class ColumnPatternExctractorTest { +public class ColumnPatternExctractorTest { @Test - void test() { - DataColumnSpec c1 = new DataColumnSpecCreator("P-value (1)", StringCell.TYPE).createSpec(); - DataColumnSpec c2 = new DataColumnSpecCreator("P-value(2)", StringCell.TYPE).createSpec(); - DataColumnSpec c3 = new DataColumnSpecCreator("P-value ()", StringCell.TYPE).createSpec(); - DataColumnSpec c4 = new DataColumnSpecCreator("P-value (4)", StringCell.TYPE).createSpec(); + public void test() { + DataColumnSpec c1 = new DataColumnSpecCreator("p-value (1)", StringCell.TYPE).createSpec(); + DataColumnSpec c2 = new DataColumnSpecCreator("p-value(2)", StringCell.TYPE).createSpec(); + DataColumnSpec c3 = new DataColumnSpecCreator("p-value ()", StringCell.TYPE).createSpec(); + DataColumnSpec c4 = new DataColumnSpecCreator("p-value (4)", StringCell.TYPE).createSpec(); DataColumnSpec c5 = new DataColumnSpecCreator("Some string", StringCell.TYPE).createSpec(); DataTableSpec spec = new DataTableSpec(c1, c2, c3, c4, c5); From 400bc357c58e67a58b60c8e23717fba1a41ad5dc Mon Sep 17 00:00:00 2001 From: Steffen Fissler <116347597+steffen-fissler@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:25:47 +0200 Subject: [PATCH 4/4] Delete -XstartOnFirstThread argument Might have been only MacOS specific --- se.redfield.cp.tests/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/se.redfield.cp.tests/pom.xml b/se.redfield.cp.tests/pom.xml index 3c236ed..9618eaa 100644 --- a/se.redfield.cp.tests/pom.xml +++ b/se.redfield.cp.tests/pom.xml @@ -24,7 +24,6 @@ ${tycho.version} true - -XstartOnFirstThread