diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..a4584c4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,61 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] + +jobs: + build: + runs-on: ubuntu-latest + defaults: + run: + shell: bash -l {0} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: maven + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: xvfb-run mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=3D-e-Chem_knime-plants + build-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: maven + - name: Build + run: mvn -B package + - name: Test executable + run: bin.windows/src/main/resources/bin/PLANTS + build-macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: maven + - name: Build + run: mvn package + - name: Test executable + run: bin.macosx/src/main/resources/bin/PLANTS diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..3fceb34 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + org.eclipse.tycho + tycho-build + 2.7.5 + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 361939b..61aa3db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ The file is formatted as described on http://keepachangelog.com/. ## [Unreleased] +## [0.3.6] 2023-11-22 + +### Changes + +- Requires KNIME 5.1 + ## [0.3.5] 2019-06-27 ### Changes diff --git a/CITATION.cff b/CITATION.cff index 7521079..54b1ead 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,6 @@ authors: - given-names: Chris family-names: de Graaf affiliation: Vrije Universiteit Amsterdam -version: v0.3.5 -date-released: 2019-06-27 repository-code: https://github.com/3D-e-Chem/knime-plants license: Apache-2.0 references: diff --git a/README.md b/README.md index 39ef1b3..4987ff9 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,18 @@ KNIME nodes to configure, run and analyze PLANTS protein-ligand docking -PLANTS homepage at http://www.mnf.uni-tuebingen.de/fachbereiche/pharmazie-und-biochemie/pharmazie/pharmazeutische-chemie/pd-dr-t-exner/research/plants.html +PLANTS homepage at http://www.tcd.uni-konstanz.de/research/plants.php -[![Build Status Linux & OS X ](https://travis-ci.org/3D-e-Chem/knime-plants.svg?branch=master)](https://travis-ci.org/3D-e-Chem/knime-plants) -[![Build status Windows ](https://ci.appveyor.com/api/projects/status/wnwuac96jd7v76ri?svg=true)](https://ci.appveyor.com/project/3D-e-Chem/knime-plants) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nl.esciencecenter.e3dchem.knime.plants%3Anl.esciencecenter.e3dchem.knime.plants&metric=alert_status)](https://sonarcloud.io/dashboard?id=nl.esciencecenter.e3dchem.knime.plants%3Anl.esciencecenter.e3dchem.knime.plants) -[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=nl.esciencecenter.e3dchem.knime.plants%3Anl.esciencecenter.e3dchem.knime.plants&metric=coverage)](https://sonarcloud.io/dashboard?id=nl.esciencecenter.e3dchem.knime.plants%3Anl.esciencecenter.e3dchem.knime.plants) +[![Java CI with Maven](https://github.com/3D-e-Chem/knime-plants/actions/workflows/build.yml/badge.svg)](https://github.com/3D-e-Chem/knime-plants/actions/workflows/build.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=3D-e-Chem_knime-plants&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=3D-e-Chem_knime-plants) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=3D-e-Chem_knime-plants&metric=coverage)](https://sonarcloud.io/summary/new_code?id=3D-e-Chem_knime-plants) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.997272.svg)](https://doi.org/10.5281/zenodo.997272) This project uses [Eclipse Tycho](https://www.eclipse.org/tycho/) to perform build steps. # License -Included in PLANTS nodes plugin is the PLANTS executable with academic license (http://www.mnf.uni-tuebingen.de/fachbereiche/pharmazie-und-biochemie/pharmazie/pharmazeutische-chemie/pd-dr-t-exner/research/plants.html). +Included in PLANTS nodes plugin is the PLANTS executable with academic license (http://www.tcd.uni-konstanz.de/research/plants.php). When installing the plugin you have to accept this license agreement, you agree to use the included PLANTS executable only for academic usage. To use these nodes in a commercial manner you need to acquire a valid license yourself and configure the PLANTS node to use the commercial executable. @@ -24,13 +23,13 @@ The PLANTS KNIME nodes themselves have the Apache 2.0 license. Requirements: -* KNIME, https://www.knime.org, version 4.0 or higher +* KNIME, https://www.knime.org, version 5.1 or higher Steps to get the PLANTS KNIME node inside KNIME: 1. Goto Help > Install new software ... menu 2. Press add button -3. Fill text fields with the `https://3d-e-chem.github.io/updates` update site url. +3. Fill text fields with the `https://3d-e-chem.github.io/updates/5.1` update site url. 4. Select --all sites-- in `work with` pulldown 5. Select the node 6. Install software @@ -59,11 +58,11 @@ The update site can be used to perform a local installation. Steps to get development environment setup based on https://github.com/knime/knime-sdk-setup#sdk-setup: -1. Install Java 8 -2. Install Eclipse for [RCP and RAP developers](https://www.eclipse.org/downloads/packages/release/2018-12/r/eclipse-ide-rcp-and-rap-developers) -3. Configure Java 8 inside Eclipse Window > Preferences > Java > Installed JREs +1. Install Java 17 +2. Install Eclipse for [RCP and RAP developers](https://www.eclipse.org/downloads/packages/installer) +3. Configure Java 17 inside Eclipse Window > Preferences > Java > Installed JREs 4. Import this repo as an Existing Maven project -5. Activate target platform by going to Window > Preferences > Plug-in Development > Target Platform and check the `KNIME Analytics Platform (4.0) - nl.esciencecenter.e3dchem.knime.plants.targetplatform/KNIME-AP-4.0.target` target definition. +5. Activate target platform by going to Window > Preferences > Plug-in Development > Target Platform and check the `KNIME Analytics Platform (5.1) - nl.esciencecenter.e3dchem.knime.plants.targetplatform/KNIME-AP-5.1.target` target definition. During import the Tycho Eclipse providers must be installed. diff --git a/bin.feature/build.properties b/bin.feature/build.properties new file mode 100644 index 0000000..64f93a9 --- /dev/null +++ b/bin.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/bin.feature/feature.xml b/bin.feature/feature.xml new file mode 100644 index 0000000..2751c6d --- /dev/null +++ b/bin.feature/feature.xml @@ -0,0 +1,260 @@ + + + + + KNIME nodes to configure, run and analyze PLANTS protein-ligand docking + + + + Copyright Netherlands eScience Center 2015 + + + + Included in PLANTS nodes plugin is the PLANTS executable with academic license (http://www.mnf.uni-tuebingen.de/fachbereiche/pharmazie-und-biochemie/pharmazie/pharmazeutische-chemie/pd-dr-t-exner/research/plants.html). +By accepting this license agreement, you agree to use the included PLANTS executable only for academic usage. +To use these nodes in a commercial manner you need to acquire a valid license yourself and configure the PLANTS node to use the commercial executable. + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright (c) 2012, 2013 The Nodeclipse Authors. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + + + + + + + diff --git a/bin.feature/pom.xml b/bin.feature/pom.xml new file mode 100644 index 0000000..1197531 --- /dev/null +++ b/bin.feature/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + + nl.esciencecenter.e3dchem.knime.plants + nl.esciencecenter.e3dchem.knime.plants + 0.3.6-SNAPSHOT + + + nl.esciencecenter.e3dchem.knime.plants.bin.feature + eclipse-feature + diff --git a/bin.linux/META-INF/MANIFEST.MF b/bin.linux/META-INF/MANIFEST.MF index 8d4241a..b2de56e 100644 --- a/bin.linux/META-INF/MANIFEST.MF +++ b/bin.linux/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KNIME nodes for PLANTS, Linux binaries Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.linux;singleton:=true -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Netherlands eScience Center Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/bin.linux/pom.xml b/bin.linux/pom.xml index 823e2d8..5317d01 100644 --- a/bin.linux/pom.xml +++ b/bin.linux/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.linux diff --git a/bin.macosx/META-INF/MANIFEST.MF b/bin.macosx/META-INF/MANIFEST.MF index 7f69a65..2fd91b2 100644 --- a/bin.macosx/META-INF/MANIFEST.MF +++ b/bin.macosx/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KNIME nodes for PLANTS, MacOSX binaries Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.macosx;singleton:=true -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Netherlands eScience Center Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/bin.macosx/pom.xml b/bin.macosx/pom.xml index 8c75241..8b6ef99 100644 --- a/bin.macosx/pom.xml +++ b/bin.macosx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.macosx diff --git a/bin.windows/META-INF/MANIFEST.MF b/bin.windows/META-INF/MANIFEST.MF index 23ada35..68ef5a6 100644 --- a/bin.windows/META-INF/MANIFEST.MF +++ b/bin.windows/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KNIME nodes for PLANTS, Windows binaries Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.windows;singleton:=true -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Netherlands eScience Center Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/bin.windows/pom.xml b/bin.windows/pom.xml index f461d91..33a2f30 100644 --- a/bin.windows/pom.xml +++ b/bin.windows/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.windows diff --git a/bin.windows32/META-INF/MANIFEST.MF b/bin.windows32/META-INF/MANIFEST.MF index 95a71ff..b374fd4 100644 --- a/bin.windows32/META-INF/MANIFEST.MF +++ b/bin.windows32/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KNIME nodes for PLANTS, Windows binaries 32bit Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.bin.windows32;singleton:=true -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Netherlands eScience Center Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/bin.windows32/pom.xml b/bin.windows32/pom.xml index a3654bd..f23628c 100644 --- a/bin.windows32/pom.xml +++ b/bin.windows32/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants.bin.windows32 diff --git a/feature/feature.xml b/feature/feature.xml index 2261bd9..c4c2181 100644 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -2,10 +2,8 @@ + version="0.3.6.qualifier" + provider-name="Netherlands eScience Center"> KNIME nodes to configure, run and analyze PLANTS protein-ligand docking @@ -228,6 +226,10 @@ http://www.apache.org/licenses/ + + - - - - - - - diff --git a/feature/pom.xml b/feature/pom.xml index 89ea3b4..57cfd63 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -5,7 +5,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.feature diff --git a/p2/category.xml b/p2/category.xml index 299ddf9..0637752 100644 --- a/p2/category.xml +++ b/p2/category.xml @@ -1,6 +1,9 @@ - + + + + diff --git a/p2/pom.xml b/p2/pom.xml index 589ff7f..86b5d02 100644 --- a/p2/pom.xml +++ b/p2/pom.xml @@ -4,7 +4,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.p2 eclipse-repository diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF index d905bca..67375ef 100644 --- a/plugin/META-INF/MANIFEST.MF +++ b/plugin/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KNIME nodes for PLANTS Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.plugin;singleton:=true -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: nl.esciencecenter.e3dchem.knime.plants.Activator Bundle-Vendor: Netherlands eScience Center Require-Bundle: org.eclipse.core.runtime, - org.knime.workbench.core;bundle-version="[4.0.0,5.0.0)", - org.knime.workbench.repository;bundle-version="[4.0.0,5.0.0)", - org.knime.base;bundle-version="[4.0.0,5.0.0)", - org.knime.core;bundle-version="[4.0.0,5.0.0)", - org.knime.chem.types;bundle-version="[4.0.0,5.0.0)", + org.knime.workbench.core;bundle-version="[4.0.0,6.0.0)", + org.knime.workbench.repository;bundle-version="[4.0.0,6.0.0)", + org.knime.base;bundle-version="[4.0.0,6.0.0)", + org.knime.core;bundle-version="[4.0.0,6.0.0)", + org.knime.chem.types;bundle-version="[4.0.0,6.0.0)", com.vernalis.knime;bundle-version="[1.20.3,2.0.0)", nl.esciencecenter.e3dchem.plugin, org.eclipse.jface @@ -21,4 +21,3 @@ Bundle-ClassPath: ., Export-Package: nl.esciencecenter.e3dchem.knime.plants, nl.esciencecenter.e3dchem.knime.plants.configure, nl.esciencecenter.e3dchem.knime.plants.run -Eclipse-PlatformFilter: (| (& (osgi.arch=x86) (osgi.os=win32)) (& (osgi.arch=x86_64) (| (osgi.os=macosx) (osgi.os=linux) (osgi.os=win32)))) diff --git a/plugin/pom.xml b/plugin/pom.xml index 9a9629a..865dfce 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -4,12 +4,12 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.plugin eclipse-plugin - ../tests/target/jacoco.exec + ../tests/target/jacoco/report/jacoco.xml ../tests/target/surefire-reports diff --git a/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/configure/SingleStringCellFactory.java b/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/configure/SingleStringCellFactory.java index 7909aae..1c26ab3 100644 --- a/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/configure/SingleStringCellFactory.java +++ b/plugin/src/main/java/nl/esciencecenter/e3dchem/knime/plants/configure/SingleStringCellFactory.java @@ -19,4 +19,13 @@ public DataCell getCell(DataRow row) { return new StringCell(content); } + @Override + public DataCell[] getCells(final DataRow row) { + return new DataCell[] { getCell(row) }; + } + + @Override + public DataCell[] getCells(final DataRow row, final long rowIndex) { + return new DataCell[] { getCell(row) }; + } } diff --git a/pom.xml b/pom.xml index 34b6d3f..011bf4b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT pom @@ -18,8 +18,8 @@ https://github.com/3D-e-Chem/knime-plants/issues - Travis CI - http://travis-ci.org/3D-e-Chem/knime-plants + GitHub actions + https://github.com/3D-e-Chem/knime-plants/issues @@ -27,15 +27,34 @@ - 1.4.0 - 1.4.0 + 2.7.5 + ${tycho.version} -Xmx512m + 0.8.10 + 17 + 3.10.1 UTF-8 UTF-8 - KNIME-AP-4.0 + 5.1 + KNIME-AP-${knime.version} scm:git:https://github.com/3D-e-Chem/knime-plants.git https://sonarcloud.io 3d-e-chem + + --add-opens=java.security.jgss/sun.security.jgss.krb5=ALL-UNNAMED + --add-opens=java.base/sun.security.ssl=ALL-UNNAMED + --add-opens=java.base/sun.security.util=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.lang.invoke=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.nio.channels=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + --add-opens=java.base/sun.nio=ALL-UNNAMED + --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED + --add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED + -Dmisc.io.testing=true @@ -103,11 +122,6 @@ - - org.eclipse.tycho.extras - tycho-pack200a-plugin - ${tycho.extras.version} - @@ -149,6 +163,7 @@ bin.macosx bin.windows bin.windows32 - targetplatform + bin.feature + targetplatform diff --git a/targetplatform/KNIME-AP-4.0.target b/targetplatform/KNIME-AP-5.1.target similarity index 89% rename from targetplatform/KNIME-AP-4.0.target rename to targetplatform/KNIME-AP-5.1.target index b6aa027..9b45459 100644 --- a/targetplatform/KNIME-AP-4.0.target +++ b/targetplatform/KNIME-AP-5.1.target @@ -1,7 +1,6 @@ - @@ -11,16 +10,16 @@ - + - + - + @@ -29,10 +28,10 @@ - + - + -server -Dsun.java2d.d3d=false diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index e47db46..562e636 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -20,7 +20,7 @@ Contributors: nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 9bbb883..8c34047 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: nl.esciencecenter.e3dchem.knime.plants.tests -Bundle-Version: 0.3.5.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Version: 0.3.6.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.12.0", - org.knime.core;bundle-version="[4.0.0,5.0.0)", - org.knime.base;bundle-version="[4.0.0,5.0.0)", - org.knime.testing;bundle-version="[4.0.0,5.0.0)", - org.knime.jsnippets;bundle-version="[4.0.0,5.0.0)", + org.knime.core;bundle-version="[4.0.0,6.0.0)", + org.knime.base;bundle-version="[4.0.0,6.0.0)", + org.knime.testing;bundle-version="[4.0.0,6.0.0)", + org.knime.jsnippets;bundle-version="[4.0.0,6.0.0)", org.eclipse.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.swtbot.junit4_x, org.eclipse.swtbot.eclipse.finder, diff --git a/tests/pom.xml b/tests/pom.xml index bc57201..be5d601 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ nl.esciencecenter.e3dchem.knime.plants nl.esciencecenter.e3dchem.knime.plants - 0.3.5-SNAPSHOT + 0.3.6-SNAPSHOT nl.esciencecenter.e3dchem.knime.plants.tests @@ -17,7 +17,7 @@ org.jacoco jacoco-maven-plugin - 0.8.0 + ${jacoco.version} @@ -41,7 +41,7 @@ org.jacoco org.jacoco.ant - 0.8.0 + ${jacoco.version} ant-contrib @@ -109,7 +109,9 @@ tycho-surefire-plugin ${tycho.version} - ${tycho.testArgLine} ${tycho.test.jvmArgs} + ${tycho.testArgLine} + ${tycho.test.jvmArgs} + ${knime.ini.testArgs} true false @@ -120,15 +122,43 @@ ${tycho.version} + eclipse-feature - nl.esciencecenter.e3dchem.knime.plants.feature + org.knime.features.clfixes 0.0.0 - + + eclipse-feature + org.knime.features.workbench + 0.0.0 + + + eclipse-feature + org.knime.features.core + 0.0.0 + + + eclipse-feature + org.knime.features.testing.application + 0.0.0 + + + eclipse-feature + org.knime.features.base + 0.0.0 + + + eclipse-feature + nl.esciencecenter.e3dchem.knime.plants.bin.feature + 0.0.0 + + +