Skip to content
This repository was archived by the owner on Nov 23, 2023. It is now read-only.

Commit 97bff3d

Browse files
sverhoevensverhoeven
committed
Catch up to tycho-knime-node-archetype
1 parent d3fd6bb commit 97bff3d

File tree

8 files changed

+51
-7
lines changed

8 files changed

+51
-7
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The file is formatted as described on http://keepachangelog.com/.
55

66
## [Unreleased]
77

8+
Synced with [tycho-knime-node-archetype v1.5.0](https://github.com/3D-e-Chem/tycho-knime-node-archetype/releases/tag/v1.5.0).
9+
810
### Changed
911

1012
* Upgraded to v2.0.0 of nl.esciencecenter.e3dchem.python.plugin

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![Build Status](https://travis-ci.org/3D-e-Chem/knime-python-node-archetype.svg?branch=master)](https://travis-ci.org/3D-e-Chem/knime-python-node-archetype)
44
[![Build status](https://ci.appveyor.com/api/projects/status/5dory9qjycepcmcn/branch/master?svg=true)](https://ci.appveyor.com/project/3D-e-Chem/knime-python-node-archetype/branch/master)
55
[![Download](https://api.bintray.com/packages/nlesc/knime-python-node-archetype/knime-python-node-archetype/images/download.svg) ](https://bintray.com/nlesc/knime-python-node-archetype/knime-python-node-archetype/_latestVersion)
6+
[![DOI](https://zenodo.org/badge/63080247.svg)](https://zenodo.org/badge/latestdoi/63080247)
67

78
Generates [KNIME](http://www.knime.org) workflow node skeleton repository with sample code.
89
The node executes a Python script which is included in the skeleton.
@@ -28,7 +29,8 @@ See https://github.com/3D-e-Chem/knime-python-wrapper for more information how t
2829
* Java >=1.8
2930
* Maven >=3.0
3031

31-
The archetype is hosted on a BinTray repository. Maven does not resolve to this BinTray repository by default so it must be added.
32+
The archetype is hosted on a [BinTray repository](https://dl.bintray.com/nlesc/knime-python-node-archetyp).
33+
Maven does not resolve to this BinTray repository by default so it must be added.
3234

3335
The ~/.m2/settings.xml should contain the following profile:
3436

@@ -112,8 +114,9 @@ Further instructions about generated project can be found in it's README.md file
112114
1. Adjust version in pom.xml
113115
2. Update CHANGELOG.md & README.md & archetype-catalog.xml
114116
3. Commit & push
115-
4. Create Github release
116-
5. Deploy to Bintray, see Deploy chapter below
117+
4. Create GitHub release
118+
5. Correct License in the Zenodo entry and publish the entry
119+
6. Deploy to Bintray, see Deploy chapter below
117120

118121
### Deploy
119122

‎src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<requiredProperties>
66
<requiredProperty key="tycho_version">
7-
<defaultValue>1.0.0</defaultValue>
7+
<defaultValue>1.1.0</defaultValue>
88
</requiredProperty>
99
<requiredProperty key="java_version">
1010
<defaultValue>1.8</defaultValue>

‎src/main/resources/archetype-resources/.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ${symbol_pound} 2. Flip the switch for the `${github_repository}` repo
77
sudo: false
88
language: java
99
matrix:
10+
fast_finish: true
1011
include:
1112
- os: linux
1213
jdk: oraclejdk8

‎src/main/resources/archetype-resources/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ Tests can be executed with `mvn verify`, they will be run in a separate KNIME en
9494
Test results will be written to `test/target/surefire-reports` directory.
9595
Code coverage reports (html+xml) can be found in the `tests/target/jacoco/report/` directory.
9696

97+
The tests can be run against a different KNIME version using `mvn verify -Dknime.version=3.5` where `3.5` is the major.minor version of KNIME.
98+
9799
${symbol_pound}${symbol_pound}${symbol_pound} Unit tests
98100

99101
Unit tests written in Junit4 format can be put in `tests/src/java`.

‎src/main/resources/archetype-resources/p2/category.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,20 @@
44
#set( $qversion = $version.replace("-SNAPSHOT", ".qualifier") )
55
<?xml version="1.0" encoding="UTF-8"?>
66
<site>
7-
<feature url="features/${parentArtifactId}.feature-${qversion}.jar" id="${parentArtifactId}.feature" version="${qversion}">
7+
<feature id="${parentArtifactId}.feature" version="${qversion}">
88
<category name="nl.esciencecenter.3D-e-Chem"/>
99
</feature>
10+
<feature id="${parentArtifactId}.feature.source" version="${qversion}">
11+
<category name="nl.esciencecenter.3D-e-Chem.sources"/>
12+
</feature>
1013
<category-def name="nl.esciencecenter.3D-e-Chem" label="KNIME 3D-e-Chem Contributions">
1114
<description>
1215
3D-e-Chem: Collection KNIME nodes &amp; Extensions for the NLeSC 3d-e-Chem project
1316
</description>
1417
</category-def>
18+
<category-def name="nl.esciencecenter.3D-e-Chem.sources" label="KNIME 3D-e-Chem Contributions Sources">
19+
<description>
20+
3D-e-Chem Sources: Sources of KNIME nodes &amp; Extensions for the NLeSC 3d-e-Chem project
21+
</description>
22+
</category-def>
1523
</site>

‎src/main/resources/archetype-resources/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,34 @@
112112
</execution>
113113
</executions>
114114
</plugin>
115+
<plugin>
116+
<groupId>org.eclipse.tycho.extras</groupId>
117+
<artifactId>tycho-source-feature-plugin</artifactId>
118+
<version>${tycho.extras.version}</version>
119+
<executions>
120+
<execution>
121+
<id>source-feature</id>
122+
<phase>package</phase>
123+
<goals>
124+
<goal>source-feature</goal>
125+
</goals>
126+
</execution>
127+
</executions>
128+
</plugin>
129+
<plugin>
130+
<groupId>org.eclipse.tycho</groupId>
131+
<artifactId>tycho-p2-plugin</artifactId>
132+
<version>${tycho.version}</version>
133+
<executions>
134+
<execution>
135+
<id>attach-p2-metadata</id>
136+
<phase>package</phase>
137+
<goals>
138+
<goal>p2-metadata</goal>
139+
</goals>
140+
</execution>
141+
</executions>
142+
</plugin>
115143
<plugin>
116144
<groupId>org.eclipse.tycho.extras</groupId>
117145
<artifactId>tycho-pack200a-plugin</artifactId>

‎src/test/resources/projects/basic/archetype.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#Fri May 20 12:14:51 CEST 2016
22
package=foo.bar.knime.somenode
3-
version=1.0.0
3+
version=1.0.0-SNAPSHOT
44
groupId=foo.bar
55
artifactId=foo.bar.knime
6-
tycho_version=1.0.0
6+
tycho_version=1.1.0
77
java_version=1.8
88
knime_version=3.5
99
github_organization=foo

0 commit comments

Comments
 (0)