Skip to content

Commit 24612ce

Browse files
Sebastian Gerauthorsten-meinl-knime
Sebastian Gerau
authored and
thorsten-meinl-knime
committed
Updated parent pom info; Some reformatting of content for readability.
1 parent 19bd115 commit 24612ce

File tree

4 files changed

+73
-67
lines changed

4 files changed

+73
-67
lines changed

‎.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>knime-core-parent</name>
3+
<name>knime-core</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎org.knime.startup.macosx/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<artifactId>org.knime.startup.macosx</artifactId>
66

77
<parent>
8-
<groupId>org.knime.core</groupId>
9-
<artifactId>knime-core-parent</artifactId>
8+
<groupId>org.knime</groupId>
9+
<artifactId>knime-core</artifactId>
1010
<version>3.8.0-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>

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

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
3-
<modelVersion>4.0.0</modelVersion>
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+
<modelVersion>4.0.0</modelVersion>
46

5-
<artifactId>org.knime.update.core</artifactId>
6-
<packaging>eclipse-repository</packaging>
7+
<parent>
8+
<groupId>org.knime</groupId>
9+
<artifactId>knime-core</artifactId>
10+
<version>3.7.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
713

8-
<parent>
9-
<groupId>org.knime.core</groupId>
10-
<artifactId>knime-core-parent</artifactId>
11-
<version>3.6.0-SNAPSHOT</version>
12-
<relativePath>../pom.xml</relativePath>
13-
</parent>
14+
<artifactId>org.knime.update.core</artifactId>
15+
<packaging>eclipse-repository</packaging>
1416

15-
<build>
16-
<plugins>
17-
<plugin>
18-
<groupId>org.eclipse.tycho</groupId>
19-
<artifactId>tycho-p2-repository-plugin</artifactId>
20-
<configuration>
21-
<finalName>org.knime.update.core_${qualifiedVersion}</finalName>
22-
</configuration>
23-
</plugin>
24-
</plugins>
25-
</build>
17+
<build>
18+
<plugins>
19+
<plugin>
20+
<groupId>org.eclipse.tycho</groupId>
21+
<artifactId>tycho-p2-repository-plugin</artifactId>
22+
<configuration>
23+
<finalName>org.knime.update.core_${qualifiedVersion}</finalName>
24+
</configuration>
25+
</plugin>
26+
</plugins>
27+
</build>
2628
</project>

‎pom.xml

+47-43
Original file line numberDiff line numberDiff line change
@@ -12,63 +12,67 @@
1212
</parent>
1313

1414
<groupId>org.knime</groupId>
15-
<artifactId>knime-core-parent</artifactId>
15+
<artifactId>knime-core</artifactId>
1616
<version>3.8.0-SNAPSHOT</version>
1717
<packaging>pom</packaging>
1818

1919
<properties>
20-
<!-- Use Jenkins's project parameterization capabilities to set a string
21-
parameter named KNIME_TARGET_PLATFORM_URL to the desired P2 update site value.
22-
For building locally you can set KNIME_TARGET_PLATFORM_URL in the respective
23-
run configuration 'Environment' tab with a file:// or http:// URL value pointing
24-
to the desired P2 update site.
20+
<!--
21+
Use Jenkins's project parameterization capabilities to set a string
22+
parameter named KNIME_TARGET_PLATFORM_URL to the desired P2 update site value.
23+
For building locally you can set KNIME_TARGET_PLATFORM_URL in the respective
24+
run configuration 'Environment' tab with a file:// or http:// URL value pointing
25+
to the desired P2 update site.
2526
-->
2627
<knime.target.platform.url>${env.KNIME_TARGET_PLATFORM_URL}</knime.target.platform.url>
2728
</properties>
2829

2930
<modules>
3031
<module>org.knime.base</module>
31-
<module>org.knime.base.logisticregression</module>
32-
<module>org.knime.base.treeensembles</module>
33-
<module>org.knime.base.treeensembles2</module>
34-
<module>org.knime.core</module>
35-
<module>org.knime.core.data.uritype</module>
36-
<module>org.knime.core.pmml</module>
37-
<module>org.knime.core.ui</module>
38-
<module>org.knime.core.wizard</module>
39-
<module>org.knime.ext.sun</module>
40-
<module>org.knime.features.base</module>
41-
<module>org.knime.jsnippets</module>
42-
<module>org.knime.product</module>
43-
<module>org.knime.product.desktop</module>
44-
<module>org.knime.startup.macosx</module>
45-
<module>org.knime.stats</module>
46-
<module>org.knime.time</module>
47-
<module>org.knime.timeseries</module>
48-
<module>org.knime.workbench</module>
49-
<module>org.knime.workbench.core</module>
50-
<module>org.knime.workbench.editor</module>
51-
<module>org.knime.workbench.help</module>
52-
<module>org.knime.workbench.repository</module>
53-
<module>org.knime.workbench.ui</module>
54-
<module>org.knime.workbench.ui.browser</module>
55-
<module>org.knime.workbench.ui.layout</module>
56-
<module>org.knime.workbench.workflowcoach</module>
57-
<module>org.knime.update.core</module>
32+
<module>org.knime.base.logisticregression</module>
33+
<module>org.knime.base.treeensembles</module>
34+
<module>org.knime.base.treeensembles2</module>
35+
<module>org.knime.core</module>
36+
<module>org.knime.core.data.uritype</module>
37+
<module>org.knime.core.pmml</module>
38+
<module>org.knime.core.ui</module>
39+
<module>org.knime.core.wizard</module>
40+
<module>org.knime.ext.sun</module>
41+
<module>org.knime.features.base</module>
42+
<module>org.knime.jsnippets</module>
43+
<module>org.knime.product</module>
44+
<module>org.knime.product.desktop</module>
45+
<module>org.knime.startup.macosx</module>
46+
<module>org.knime.stats</module>
47+
<module>org.knime.time</module>
48+
<module>org.knime.timeseries</module>
49+
<module>org.knime.workbench</module>
50+
<module>org.knime.workbench.core</module>
51+
<module>org.knime.workbench.editor</module>
52+
<module>org.knime.workbench.help</module>
53+
<module>org.knime.workbench.repository</module>
54+
<module>org.knime.workbench.ui</module>
55+
<module>org.knime.workbench.ui.browser</module>
56+
<module>org.knime.workbench.ui.layout</module>
57+
<module>org.knime.workbench.workflowcoach</module>
58+
<module>org.knime.update.core</module>
5859

59-
<!-- Test Modules -->
60-
<module>org.knime.base.tests</module>
61-
<module>org.knime.base.logisticregression.tests</module>
62-
<module>org.knime.base.treeensembles2.tests</module>
60+
<!-- Test Modules -->
61+
<module>org.knime.base.tests</module>
62+
<module>org.knime.base.logisticregression.tests</module>
63+
<module>org.knime.base.treeensembles2.tests</module>
6364

64-
<!-- Disabled 'org.knime.jsnippets.tests' because node setup fails? -->
65-
<!-- <module>org.knime.core.tests</module> -->
65+
<!-- Disabled 'org.knime.jsnippets.tests' because node setup fails? -->
66+
<!-- <module>org.knime.core.tests</module> -->
6667

67-
<!-- Disabled 'org.knime.jsnippets.tests' because 'org.knime.base.node.jsnippet.ui.BundleListPanelTest' fails -->
68-
<!-- <module>org.knime.jsnippets.tests</module> -->
68+
<!--
69+
Disabled 'org.knime.jsnippets.tests' because 'org.knime.base.node.jsnippet.ui.BundleListPanelTest'
70+
fails
71+
-->
72+
<!-- <module>org.knime.jsnippets.tests</module> -->
6973

70-
<module>org.knime.product.tests</module>
71-
<module>org.knime.workbench.repository.tests</module>
74+
<module>org.knime.product.tests</module>
75+
<module>org.knime.workbench.repository.tests</module>
7276
</modules>
7377

7478
<repositories>

0 commit comments

Comments
 (0)