Skip to content

Commit 8f28588

Browse files
gab1onethorsten-meinl-knime
gab1one
authored and
thorsten-meinl-knime
committedFeb 26, 2020
DEVOPS-210: Convert repository to new build system
·
bigdata/4.7.6analytics-platform/4.2.0
1 parent 90cd8d3 commit 8f28588

File tree

17 files changed

+1019
-10
lines changed

17 files changed

+1019
-10
lines changed
 

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
*/bin/
2-
*/target/
2+
**/target/
33
*/build/
44
*.pyc*
55
**/.pydevproject
6+
.flattened-pom.xml
7+
org.knime.dl.keras/knime-dl-keras.jar
8+
org.knime.dl.python/knime-dl-python.jar

‎.mvn/extensions.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<extensions>
3+
<extension>
4+
<groupId>org.eclipse.tycho.extras</groupId>
5+
<artifactId>tycho-pomless</artifactId>
6+
<version>1.4.0</version>
7+
</extension>
8+
<extension>
9+
<groupId>com.nuance.clu.maven</groupId>
10+
<artifactId>maven-feature-branch-extension</artifactId>
11+
<version>0.5.5</version>
12+
</extension>
13+
</extensions>

‎.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>knime-deeplearning</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎.settings/org.eclipse.core.resources.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

‎Jenkinsfile

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!groovy
2+
def BN = BRANCH_NAME == "master" || BRANCH_NAME.startsWith("releases/") ? BRANCH_NAME : "master"
3+
4+
library "knime-pipeline@$BN"
5+
6+
properties([
7+
// provide a list of upstream jobs which should trigger a rebuild of this job
8+
pipelineTriggers([
9+
upstream('knime-python/' + env.BRANCH_NAME.replaceAll('/', '%2F')),
10+
upstream('knime-distance/' + env.BRANCH_NAME.replaceAll('/', '%2F'))
11+
]),
12+
buildDiscarder(logRotator(numToKeepStr: '5')),
13+
disableConcurrentBuilds()
14+
])
15+
16+
try {
17+
// provide the name of the update site project
18+
knimetools.defaultTychoBuild('org.knime.update.deeplearning')
19+
20+
// Specifying configurations is optional. If omitted, the default configurations will be used
21+
// (see jenkins-pipeline-libraries/vars/workflowTests.groovy)
22+
// def testConfigurations = [
23+
// "ubuntu18.04 && python-3",
24+
// "windows && python-3"
25+
// ]
26+
27+
// workflowTests.runTests(
28+
// // The name of the feature that pulls in all required dependencies for running workflow tests.
29+
// // You can also provide a list here but separating it into one feature makes it clearer and allows
30+
// // pulling in independant plug-ins, too.
31+
// "org.knime.features.ap-repository-template.testing.feature.group",
32+
// // with or without assertions
33+
// false,
34+
// // a list of upstream jobs to look for when getting dependencies
35+
// ["knime-core", "knime-shared", "knime-tp"],
36+
// // optional list of test configurations
37+
// testConfigurations
38+
// )
39+
40+
stage('Sonarqube analysis') {
41+
env.lastStage = env.STAGE_NAME
42+
// passing the test configuration is optional but must be done when they are
43+
// used above in the workflow tests
44+
// workflowTests.runSonar(testConfigurations)
45+
workflowTests.runSonar()
46+
}
47+
} catch (ex) {
48+
currentBuild.result = 'FAILED'
49+
throw ex
50+
} finally {
51+
notifications.notifyBuild(currentBuild.result);
52+
}
53+
54+
/* vim: set ts=4: */

‎org.knime.dl.keras.testing/build.properties

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
bin.includes = fragment.xml,\
22
META-INF/,\
3-
data/,\
4-
external-licenses/
3+
.,\
4+
data/
55
jars.compile.order = knime-dl-core.jar
66
source.. = src/
77
output.. = bin/
8-
src.includes = src/,\
9-
data/,\
10-
external-licenses/
8+
src.includes = data/
9+

‎org.knime.dl.python.testing/build.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
bin.includes = fragment.xml,\
22
META-INF/,\
3+
.,\
34
py/
4-
jars.compile.order = knime-dl-core.jar
55
source.. = src/
66
output.. = bin/
7-
src.includes = src/

‎org.knime.dl.testing/build.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
bin.includes = fragment.xml,\
2+
.,\
23
META-INF/
3-
jars.compile.order = knime-dl-core.jar
44
source.. = src/
55
output.. = bin/
6-
src.includes = src/

‎org.knime.dl/build.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
bin.includes = plugin.xml,\
22
META-INF/,\
33
schema/,\
4+
.,\
45
icons/
56
jars.compile.order = knime-dl-core.jar
67
source.. = src/

‎org.knime.features.dl.testing/.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.knime.features.dl.keras</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>

‎org.knime.features.dl.testing/build.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin.includes = feature.xml

‎org.knime.features.dl.testing/feature.xml

+753
Large diffs are not rendered by default.

‎org.knime.update.deeplearning/.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.knime.update.deeplearning</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.m2e.core.maven2Builder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
16+
</natures>
17+
</projectDescription>

‎org.knime.update.deeplearning/.settings/org.eclipse.m2e.core.prefs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎org.knime.update.deeplearning/category.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<feature id="org.knime.features.dl.keras" version="0.0.0">
4+
<category name="knime-deeplearning" />
5+
</feature>
6+
<feature id="org.knime.features.dl.keras.source" version="0.0.0">
7+
<category name="knime-deeplearning" />
8+
</feature>
9+
10+
<category-def name="knime-deeplearning" label="Build artifacts from knime-deeplearning">
11+
<description>Build artifacts from knime-deeplearning</description>
12+
</category-def>
13+
</site>

‎org.knime.update.deeplearning/pom.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>org.knime</groupId>
10+
<artifactId>knime-deeplearning</artifactId>
11+
<version>${revision}${changelist}</version>
12+
<relativePath>../pom.xml</relativePath>
13+
</parent>
14+
15+
<artifactId>org.knime.update.deeplearning</artifactId>
16+
<packaging>eclipse-repository</packaging>
17+
</project>

‎pom.xml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.knime.maven</groupId>
9+
<artifactId>ap.parent</artifactId>
10+
<version>1.0.0</version>
11+
</parent>
12+
13+
<groupId>org.knime</groupId>
14+
<artifactId>knime-deeplearning</artifactId>
15+
<version>${revision}${changelist}</version>
16+
<packaging>pom</packaging>
17+
18+
<properties>
19+
<revision>4.2.0</revision>
20+
<changelist>-SNAPSHOT</changelist>
21+
<feature-branch-extension.branchListProperty>git.branch</feature-branch-extension.branchListProperty>
22+
<feature-branch-extension.appendArtifactoryProperties>false</feature-branch-extension.appendArtifactoryProperties>
23+
</properties>
24+
25+
<modules>
26+
<module>org.knime.dl</module>
27+
<module>org.knime.dl.keras</module>
28+
<module>org.knime.dl.keras.testing</module>
29+
<module>org.knime.dl.python</module>
30+
<module>org.knime.dl.python.testing</module>
31+
<module>org.knime.dl.testing</module>
32+
<module>org.knime.features.dl.keras</module>
33+
<module>org.knime.update.deeplearning</module>
34+
</modules>
35+
36+
<!-- List all required repositories here. The variables are defined in knime-maven-parent/pom.xml. -->
37+
<repositories>
38+
<repository>
39+
<id>p2-knime-core</id>
40+
<layout>p2</layout>
41+
<url>${knime.core.p2}</url>
42+
</repository>
43+
<repository>
44+
<id>p2-knime-shared</id>
45+
<layout>p2</layout>
46+
<url>${knime.shared.p2}</url>
47+
</repository>
48+
<repository>
49+
<id>p2-knime-base</id>
50+
<layout>p2</layout>
51+
<url>${knime.base.p2}</url>
52+
</repository>
53+
<repository>
54+
<id>p2-knime-jfreechart</id>
55+
<layout>p2</layout>
56+
<url>${knime.jfreechart.p2}</url>
57+
</repository>
58+
<repository>
59+
<id>p2-knime-filehandling</id>
60+
<layout>p2</layout>
61+
<url>${knime.filehandling.p2}</url>
62+
</repository>
63+
<repository>
64+
<id>p2-knime-python</id>
65+
<layout>p2</layout>
66+
<url>${knime.python.p2}</url>
67+
</repository>
68+
<repository>
69+
<id>p2-knime-distance</id>
70+
<layout>p2</layout>
71+
<url>${knime.distance.p2}</url>
72+
</repository>
73+
<repository>
74+
<id>p2-knime-svg</id>
75+
<layout>p2</layout>
76+
<url>${knime.svg.p2}</url>
77+
</repository>
78+
<repository>
79+
<id>p2-knime-expressions</id>
80+
<layout>p2</layout>
81+
<url>${knime.expressions.p2}</url>
82+
</repository>
83+
<repository>
84+
<id>p2-knime-workbench</id>
85+
<layout>p2</layout>
86+
<url>${knime.workbench.p2}</url>
87+
</repository>
88+
<repository>
89+
<id>p2-knime-javasnippet</id>
90+
<layout>p2</layout>
91+
<url>${knime.javasnippet.p2}</url>
92+
</repository>
93+
<repository>
94+
<id>p2-knime-tp</id>
95+
<layout>p2</layout>
96+
<url>${knime.tp.p2}</url>
97+
</repository>
98+
</repositories>
99+
100+
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.