From eea29958ee9783e1683ac77b53805b94cb32ecc1 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 10:53:05 +0100 Subject: [PATCH 01/12] add org.apache.commons.commons-io to Manifest.mf --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 9ce5d370..493504a2 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="4.6.0", org.apache.log4j;bundle-version="[1.2.21,2.0.0)" + org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)" Export-Package: com.genericworkflownodes.knime.base.data.port, com.genericworkflownodes.knime.commandline, com.genericworkflownodes.knime.commandline.impl, From 6505db38496e52482470aea4ae8667032780754e Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 11:48:17 +0100 Subject: [PATCH 02/12] bump version to 1.2.0 --- com.genericworkflownodes.knime.config.testing/pom.xml | 2 +- com.genericworkflownodes.knime.config/pom.xml | 2 +- com.genericworkflownodes.knime.feature/pom.xml | 2 +- com.genericworkflownodes.knime.node_generator/pom.xml | 2 +- com.genericworkflownodes.knime.testing.feature/pom.xml | 2 +- com.genericworkflownodes.knime.tests/pom.xml | 2 +- com.genericworkflownodes.knime/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/com.genericworkflownodes.knime.config.testing/pom.xml b/com.genericworkflownodes.knime.config.testing/pom.xml index 80944c2d..c6976a99 100644 --- a/com.genericworkflownodes.knime.config.testing/pom.xml +++ b/com.genericworkflownodes.knime.config.testing/pom.xml @@ -66,5 +66,5 @@ ../com.genericworkflownodes.maven eclipse-test-plugin - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT diff --git a/com.genericworkflownodes.knime.config/pom.xml b/com.genericworkflownodes.knime.config/pom.xml index f17d22b5..6a029e78 100644 --- a/com.genericworkflownodes.knime.config/pom.xml +++ b/com.genericworkflownodes.knime.config/pom.xml @@ -30,5 +30,5 @@ ../com.genericworkflownodes.maven eclipse-plugin - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT diff --git a/com.genericworkflownodes.knime.feature/pom.xml b/com.genericworkflownodes.knime.feature/pom.xml index b2305d68..934745ae 100644 --- a/com.genericworkflownodes.knime.feature/pom.xml +++ b/com.genericworkflownodes.knime.feature/pom.xml @@ -9,5 +9,5 @@ ../com.genericworkflownodes.maven eclipse-feature - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT \ No newline at end of file diff --git a/com.genericworkflownodes.knime.node_generator/pom.xml b/com.genericworkflownodes.knime.node_generator/pom.xml index 062ca22a..fff5a425 100644 --- a/com.genericworkflownodes.knime.node_generator/pom.xml +++ b/com.genericworkflownodes.knime.node_generator/pom.xml @@ -42,7 +42,7 @@ com.genericworkflownodes.knime.config com.genericworkflownodes.knime.config - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT eclipse-plugin diff --git a/com.genericworkflownodes.knime.testing.feature/pom.xml b/com.genericworkflownodes.knime.testing.feature/pom.xml index 6ec0e2f6..cd1204b7 100644 --- a/com.genericworkflownodes.knime.testing.feature/pom.xml +++ b/com.genericworkflownodes.knime.testing.feature/pom.xml @@ -9,5 +9,5 @@ ../com.genericworkflownodes.maven eclipse-feature - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT \ No newline at end of file diff --git a/com.genericworkflownodes.knime.tests/pom.xml b/com.genericworkflownodes.knime.tests/pom.xml index b5da5dcd..8e5725f7 100644 --- a/com.genericworkflownodes.knime.tests/pom.xml +++ b/com.genericworkflownodes.knime.tests/pom.xml @@ -61,5 +61,5 @@ ../com.genericworkflownodes.maven eclipse-test-plugin - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT diff --git a/com.genericworkflownodes.knime/pom.xml b/com.genericworkflownodes.knime/pom.xml index 5bb55124..9d8d1d63 100644 --- a/com.genericworkflownodes.knime/pom.xml +++ b/com.genericworkflownodes.knime/pom.xml @@ -9,5 +9,5 @@ ../com.genericworkflownodes.maven eclipse-plugin - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT \ No newline at end of file From f6536db57683906d8ed4f5a7b83deb8fd4db0971 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 11:53:49 +0100 Subject: [PATCH 03/12] bump knime version to 5.4 --- .../templates/mavenparent/parent.pom.xml.template | 2 +- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 2 +- com.genericworkflownodes.maven/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template index a35616c8..12adcfe3 100644 --- a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template +++ b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template @@ -5,7 +5,7 @@ 0.0.1-SNAPSHOT - 4.7 + 5.4 http://update.knime.org/analytics-platform/${knime.version}/ https://abibuilder.cs.uni-tuebingen.de/archive/gkn/updateSite/${knime.version}/ 3.0.1 diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 493504a2..cc5d41f7 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.knime.core.data.uritype;bundle-version="[3.0.0,6.0.0)", com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", - org.knime.filehandling.core;bundle-version="4.6.0", + org.knime.filehandling.core;bundle-version="5.4.0", org.apache.log4j;bundle-version="[1.2.21,2.0.0)" org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)" Export-Package: com.genericworkflownodes.knime.base.data.port, diff --git a/com.genericworkflownodes.maven/pom.xml b/com.genericworkflownodes.maven/pom.xml index 7b9a6f94..dc715105 100644 --- a/com.genericworkflownodes.maven/pom.xml +++ b/com.genericworkflownodes.maven/pom.xml @@ -4,7 +4,7 @@ com.genericworkflownodes.maven 0.0.1-SNAPSHOT - 4.6 + 5.4 17 http://update.knime.org/analytics-platform/${knime.version}/ 3.0.1 From e437cbe239faeab6013d1eea87bf25abf7ef4fca Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:03:59 +0100 Subject: [PATCH 04/12] Update log4j version --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index cc5d41f7..900b8201 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", - org.apache.log4j;bundle-version="[1.2.21,2.0.0)" + org.apache.log4j;bundle-version="[2.17.0,3.0.0)" org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)" Export-Package: com.genericworkflownodes.knime.base.data.port, com.genericworkflownodes.knime.commandline, From 42c4403003a81934bb1ebda79ea2d18499923167 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:10:59 +0100 Subject: [PATCH 05/12] Set com.genericworkflownodes.knime.config versions for manifest --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 900b8201..36ccf300 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-Vendor: Freie Universitaet Berlin, Universitaet Tuebingen, and the Generi Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.knime.base;bundle-version="[3.0.0,6.0.0)", org.knime.core.data.uritype;bundle-version="[3.0.0,6.0.0)", - com.genericworkflownodes.knime.config;bundle-version="1.0.0", + com.genericworkflownodes.knime.config;bundle-version="[1.0.0",2.0.0), org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", org.apache.log4j;bundle-version="[2.17.0,3.0.0)" From 2006dec64dde5e6b4e62ad8d4944ee54585ea7c8 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:13:55 +0100 Subject: [PATCH 06/12] revert --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 36ccf300..900b8201 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-Vendor: Freie Universitaet Berlin, Universitaet Tuebingen, and the Generi Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.knime.base;bundle-version="[3.0.0,6.0.0)", org.knime.core.data.uritype;bundle-version="[3.0.0,6.0.0)", - com.genericworkflownodes.knime.config;bundle-version="[1.0.0",2.0.0), + com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", org.apache.log4j;bundle-version="[2.17.0,3.0.0)" From de90e26df9450ff5e8e42e98478c57c0a108fea1 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:21:25 +0100 Subject: [PATCH 07/12] Update min knime version reqs --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 900b8201..2d696726 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-ClassPath: genericnodes.jar, lib/org-netbeans-swing-outline.jar Bundle-Vendor: Freie Universitaet Berlin, Universitaet Tuebingen, and the GenericWorkflowNodes Team Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", - org.knime.base;bundle-version="[3.0.0,6.0.0)", - org.knime.core.data.uritype;bundle-version="[3.0.0,6.0.0)", + org.knime.base;bundle-version="[5.3.0,6.0.0)", + org.knime.core.data.uritype;bundle-version="[5.3.0,6.0.0)", com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", From 272efb056036197ee771bca393e3ea3f405603c4 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:27:35 +0100 Subject: [PATCH 08/12] NOP --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 2d696726..9fe5e690 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -36,3 +36,4 @@ Bundle-Activator: com.genericworkflownodes.knime.GenericNodesPlugin Eclipse-RegisterBuddy: org.knime.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: com.genericworkflownodes.knime + \ No newline at end of file From d31e77bf6b501c7fd310e4a2e8bcc1e52ee2bded Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:30:19 +0100 Subject: [PATCH 09/12] revert --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 9fe5e690..900b8201 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-ClassPath: genericnodes.jar, lib/org-netbeans-swing-outline.jar Bundle-Vendor: Freie Universitaet Berlin, Universitaet Tuebingen, and the GenericWorkflowNodes Team Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", - org.knime.base;bundle-version="[5.3.0,6.0.0)", - org.knime.core.data.uritype;bundle-version="[5.3.0,6.0.0)", + org.knime.base;bundle-version="[3.0.0,6.0.0)", + org.knime.core.data.uritype;bundle-version="[3.0.0,6.0.0)", com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", @@ -36,4 +36,3 @@ Bundle-Activator: com.genericworkflownodes.knime.GenericNodesPlugin Eclipse-RegisterBuddy: org.knime.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: com.genericworkflownodes.knime - \ No newline at end of file From a048d79f3fa64bd2a428630b32b41fab0ecf621a Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:33:49 +0100 Subject: [PATCH 10/12] fix missing comma --- com.genericworkflownodes.knime/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF index 900b8201..9fe663be 100644 --- a/com.genericworkflownodes.knime/META-INF/MANIFEST.MF +++ b/com.genericworkflownodes.knime/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", com.genericworkflownodes.knime.config;bundle-version="1.0.0", org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)", org.knime.filehandling.core;bundle-version="5.4.0", - org.apache.log4j;bundle-version="[2.17.0,3.0.0)" + org.apache.log4j;bundle-version="[2.17.0,3.0.0)", org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)" Export-Package: com.genericworkflownodes.knime.base.data.port, com.genericworkflownodes.knime.commandline, From 15752cc72a481de8483334aba864135f5cdb0f92 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:49:01 +0100 Subject: [PATCH 11/12] update update site --- .../templates/mavenparent/parent.pom.xml.template | 2 +- com.genericworkflownodes.maven/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template index 12adcfe3..69df3469 100644 --- a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template +++ b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template @@ -6,7 +6,7 @@ 0.0.1-SNAPSHOT 5.4 - http://update.knime.org/analytics-platform/${knime.version}/ + http://update.knime.com/analytics-platform/${knime.version}/ https://abibuilder.cs.uni-tuebingen.de/archive/gkn/updateSite/${knime.version}/ 3.0.1 3.0.1 diff --git a/com.genericworkflownodes.maven/pom.xml b/com.genericworkflownodes.maven/pom.xml index dc715105..4382ce72 100644 --- a/com.genericworkflownodes.maven/pom.xml +++ b/com.genericworkflownodes.maven/pom.xml @@ -6,7 +6,7 @@ 5.4 17 - http://update.knime.org/analytics-platform/${knime.version}/ + http://update.knime.com/analytics-platform/${knime.version}/ 3.0.1 3.0.1 -Xmx1024m From f919dfa822811c5032492a00a19ad9b94d1108c9 Mon Sep 17 00:00:00 2001 From: Samuel Wein Date: Mon, 27 Jan 2025 12:56:28 +0100 Subject: [PATCH 12/12] try removing "knime.update.site" --- .../templates/mavenparent/parent.pom.xml.template | 4 +++- com.genericworkflownodes.maven/pom.xml | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template index 69df3469..02d28789 100644 --- a/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template +++ b/com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/mavenparent/parent.pom.xml.template @@ -6,7 +6,7 @@ 0.0.1-SNAPSHOT 5.4 - http://update.knime.com/analytics-platform/${knime.version}/ + https://abibuilder.cs.uni-tuebingen.de/archive/gkn/updateSite/${knime.version}/ 3.0.1 3.0.1 @@ -14,6 +14,7 @@ UTF-8 UTF-8 + 17 - http://update.knime.com/analytics-platform/${knime.version}/ + 3.0.1 3.0.1 -Xmx1024m @@ -15,6 +15,7 @@ scm:git:https://github.com/genericworkflownodes/GenericKnimeNodes.git 3.10.1 +