diff --git a/applications/pom.xml b/applications/pom.xml
index 84fa8979c59..affce10860f 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -6,82 +6,32 @@
+
+
+
+ 3.0
+
+
4.0.0
org.csstudio
applications
4.2.0-SNAPSHOT
pom
-
-
- 3.0
-
+
+
+ org.csstudio
+ cs-studio
+ 4.6.0-SNAPSHOT
+
+
- 1.3.0
- ${tycho.version}
- 4.6
- http://download.eclipse.org
- ${eclipse.central.url}
- UTF-8
- error
- fail
- s3://download.controlsystemstudio.org
- http://download.controlsystemstudio.org
${download.root}/applications/${cs-studio.version}
- false
-
- java
- jacoco
- reuseReports
- ../${project.artifactId}.test/target/surefire-reports/
-
-
-
-
-
+
-
- platform-default
-
-
- !platform-version-name
-
-
-
- ${eclipse.mirror.url}/releases/2018-12
- ${eclipse.mirror.url}/eclipse/updates/4.10
- ${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site
-
-
-
- csstudio-composite-repo-enable
-
-
- csstudio.composite.repo
-
-
-
-
- csstudio-composite-repo
- file:${csstudio.composite.repo}
- p2
-
-
-
-
- local-dev
-
- warning
- warn
-
-
-
-
-
-
cs-studio
@@ -114,39 +64,6 @@
-
- checkstyle
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 2.17
-
-
- validate
- validate
-
- **/*
- **/target/**
- ../build/cs-studio-jenkins-checkstyle
- ../build/cs-studio-jenkins-checkstyle-suppressions
- UTF-8
- true
- checkstyle-output.xml
- .
- true
- false
-
-
- check
-
-
-
-
-
-
-
diff --git a/core/base/pom.xml b/core/base/pom.xml
index 330b7c34bf7..85c7e994b4c 100644
--- a/core/base/pom.xml
+++ b/core/base/pom.xml
@@ -3,7 +3,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
base
4.2.0-SNAPSHOT
diff --git a/core/diirt/pom.xml b/core/diirt/pom.xml
index 2d33d1f62b9..c4d7fe117f6 100644
--- a/core/diirt/pom.xml
+++ b/core/diirt/pom.xml
@@ -3,7 +3,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
diirt
pom
@@ -12,4 +12,5 @@
diirt-repository
diirt-plugins
+ 4.2.0-SNAPSHOT
diff --git a/core/p2repo/pom.xml b/core/p2repo/pom.xml
index 621d65e48b8..5d0db3ab942 100644
--- a/core/p2repo/pom.xml
+++ b/core/p2repo/pom.xml
@@ -3,7 +3,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
core-p2repo
pom
diff --git a/core/platform/pom.xml b/core/platform/pom.xml
index 2f8416602db..42d697784f4 100644
--- a/core/platform/pom.xml
+++ b/core/platform/pom.xml
@@ -4,7 +4,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
platform
pom
@@ -13,4 +13,5 @@
platform-features
platform-repository
+ 4.2.0-SNAPSHOT
diff --git a/core/pom.xml b/core/pom.xml
index 5952691df6a..97b4868825a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,82 +6,28 @@
- 4.0.0
- org.csstudio
- core
- 4.2.0-SNAPSHOT
- pom
3.0
+
+ 4.0.0
+ core
+ pom
+
+
+ org.csstudio
+ cs-studio
+ 4.6.0-SNAPSHOT
+
+
-
- 1.3.0
- ${tycho.version}
- 4.6
- http://download.eclipse.org
- ${eclipse.central.url}
- UTF-8
- error
- fail
- s3://download.controlsystemstudio.org
- http://download.controlsystemstudio.org
${download.root}/core/${cs-studio.version}
- false
-
- java
- jacoco
- reuseReports
- ../${project.artifactId}.test/target/surefire-reports/
-
-
-
-
-
+
-
- platform-default
-
-
- !platform-version-name
-
-
-
- ${eclipse.mirror.url}/releases/2018-12
- ${eclipse.mirror.url}/eclipse/updates/4.10
- ${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site
-
-
-
- csstudio-composite-repo-enable
-
-
- csstudio.composite.repo
-
-
-
-
- csstudio-composite-repo
- file:${csstudio.composite.repo}
- p2
-
-
-
-
- local-dev
-
- warning
- warn
-
-
-
-
-
-
cs-studio-sites
@@ -134,39 +80,6 @@
-
- checkstyle
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 2.17
-
-
- validate
- validate
-
- **/*
- **/target/**
- ../build/cs-studio-jenkins-checkstyle
- ../build/cs-studio-jenkins-checkstyle-suppressions
- UTF-8
- true
- checkstyle-output.xml
- .
- true
- false
-
-
- check
-
-
-
-
-
-
-
diff --git a/core/ui/pom.xml b/core/ui/pom.xml
index b7ab9c9bd61..dcc2ed46ee3 100644
--- a/core/ui/pom.xml
+++ b/core/ui/pom.xml
@@ -4,7 +4,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
ui
pom
@@ -13,4 +13,5 @@
ui-repository
ui-features
+ 4.2.0-SNAPSHOT
diff --git a/core/unorganized/pom.xml b/core/unorganized/pom.xml
index f08b800ed1a..86dd6030032 100644
--- a/core/unorganized/pom.xml
+++ b/core/unorganized/pom.xml
@@ -4,7 +4,7 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
unorganized
4.2.0-SNAPSHOT
diff --git a/core/utility/pom.xml b/core/utility/pom.xml
index 9701e75e2dd..3f8c96939b1 100644
--- a/core/utility/pom.xml
+++ b/core/utility/pom.xml
@@ -4,14 +4,14 @@
org.csstudio
core
- 4.2.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
utility
- 4.1.0-SNAPSHOT
pom
utility-plugins
utility-features
utility-repository
+ 4.1.0-SNAPSHOT
diff --git a/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml b/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml
index b88df1725d8..de214197696 100644
--- a/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml
+++ b/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml
@@ -7,7 +7,7 @@
org.csstudio
epics-plugins
- 0.0.1-SNAPSHOT
+ 4.6.0-SNAPSHOT
openjfx.swt
11.0.1
diff --git a/maven-osgi-bundles/epics/plugins/org.csstudio.platform.libs.epics/pom.xml b/maven-osgi-bundles/epics/plugins/org.csstudio.platform.libs.epics/pom.xml
index b040ee09cac..0397b512265 100644
--- a/maven-osgi-bundles/epics/plugins/org.csstudio.platform.libs.epics/pom.xml
+++ b/maven-osgi-bundles/epics/plugins/org.csstudio.platform.libs.epics/pom.xml
@@ -6,7 +6,7 @@
org.csstudio
epics-plugins
- 0.0.1-SNAPSHOT
+ 4.6.0-SNAPSHOT
org.csstudio.platform.libs.epics
bundle
diff --git a/maven-osgi-bundles/epics/plugins/pom.xml b/maven-osgi-bundles/epics/plugins/pom.xml
index 8760ea63423..57adcd01de5 100644
--- a/maven-osgi-bundles/epics/plugins/pom.xml
+++ b/maven-osgi-bundles/epics/plugins/pom.xml
@@ -5,7 +5,7 @@
org.csstudio
epics
- 0.0.1-SNAPSHOT
+ 4.6.0-SNAPSHOT
epics-plugins
pom
diff --git a/maven-osgi-bundles/epics/pom.xml b/maven-osgi-bundles/epics/pom.xml
index 9a257cf54d7..e20a3731de4 100644
--- a/maven-osgi-bundles/epics/pom.xml
+++ b/maven-osgi-bundles/epics/pom.xml
@@ -5,10 +5,9 @@
org.csstudio
maven-osgi-bundles
- 1.0.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
epics
- 0.0.1-SNAPSHOT
pom
plugins
diff --git a/maven-osgi-bundles/pom.xml b/maven-osgi-bundles/pom.xml
index 92c0b0595f8..4f22f081f68 100644
--- a/maven-osgi-bundles/pom.xml
+++ b/maven-osgi-bundles/pom.xml
@@ -2,32 +2,22 @@
- 4.0.0
-
-
- 3.0
-
- org.csstudio
+ 4.0.0
maven-osgi-bundles
- 1.0.0-SNAPSHOT
pom
maven-osgi-bundles
+
+ org.csstudio
+ cs-studio
+ 4.6.0-SNAPSHOT
+
+
- 1.2.0
- META-INF
- 4.6
- 4.6.0-SNAPSHOT
- 2.4.1
- 3.10.0-v20140318-2214
- yyyyMMddHHmmss
- ${maven.build.timestamp}
- s3://download.controlsystemstudio.org
- http://download.controlsystemstudio.org
${download.root}/maven-osgi-bundles/${cs-studio.version}
-
+
org.eclipse.core
@@ -37,32 +27,10 @@
-
-
- snapshots-repo
- https://oss.sonatype.org/content/repositories/snapshots
-
- false
-
-
- true
-
-
-
-
epics
repository
-
-
-
- org.kuali.maven.wagons
- maven-s3-wagon
- 1.2.1
-
-
-
diff --git a/maven-osgi-bundles/repository/pom.xml b/maven-osgi-bundles/repository/pom.xml
index fdac4280c1c..d18cfb23068 100644
--- a/maven-osgi-bundles/repository/pom.xml
+++ b/maven-osgi-bundles/repository/pom.xml
@@ -6,7 +6,7 @@
org.csstudio
maven-osgi-bundles
- 1.0.0-SNAPSHOT
+ 4.6.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000000..733e20c96e0
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,199 @@
+
+ 4.0.0
+ org.csstudio
+ cs-studio
+ 4.6.0-SNAPSHOT
+ pom
+
+
+
+ maven-osgi-bundles
+ thirdparty
+ core
+ applications
+
+
+
+
+ 3.0
+
+
+
+
+
+
+ 1.3.0
+ ${tycho.version}
+
+ 4.6
+ 4.6.0-SNAPSHOT
+
+ 2.4.3
+
+ http://download.eclipse.org
+ ${eclipse.central.url}
+ 3.10.0-v20140318-2214
+
+ UTF-8
+ error
+ fail
+
+ s3://download.controlsystemstudio.org
+ http://download.controlsystemstudio.org
+
+
+ java
+ jacoco
+ reuseReports
+ ../${project.artifactId}.test/target/surefire-reports/
+
+
+
+
+
+ eclipse
+ ${eclipse.central.url}/releases/2018-12
+ p2
+
+
+ eclipse-updates
+ ${eclipse.central.url}/eclipse/updates/4.10
+ p2
+
+
+ snapshots-repo
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ false
+
+
+ true
+
+
+
+
+
+
+
+ org.kuali.maven.wagons
+ maven-s3-wagon
+ 1.2.1
+
+
+
+
+
+
+
+ platform-default
+
+
+ !platform-version-name
+
+
+
+ ${eclipse.mirror.url}/releases/2018-12
+ ${eclipse.mirror.url}/eclipse/updates/4.10
+ ${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site
+
+
+
+
+ checkstyle
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 2.17
+
+
+ validate
+ validate
+
+ **/*
+ **/target/**
+ ../build/cs-studio-jenkins-checkstyle
+ ../build/cs-studio-jenkins-checkstyle-suppressions
+ UTF-8
+ true
+ checkstyle-output.xml
+ .
+ true
+ false
+
+
+ check
+
+
+
+
+
+
+
+
+
+ cs-studio
+
+
+ !cs-studio
+
+
+
+
+ csstudio-thirdparty
+ ${download.root}/thirdparty/${cs-studio.version}
+ p2
+
+
+ csstudio-maven-osgi-bundles
+ ${download.root}/maven-osgi-bundles/${cs-studio.version}
+ p2
+
+
+ csstudio-core
+ ${download.root}/core/${cs-studio.version}
+ p2
+
+
+
+ csstudio-applications
+ ${download.root}/applications/${cs-studio.version}
+ p2
+
+
+
+
+
+
+ csstudio-composite-repo-enable
+
+
+ csstudio.composite.repo
+
+
+
+
+ csstudio-composite-repo
+ file:${csstudio.composite.repo}
+ p2
+
+
+
+
+
+ local-dev
+
+ warning
+ warn
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/product/cs-studio b/product/cs-studio
deleted file mode 160000
index fe76c8d8931..00000000000
--- a/product/cs-studio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe76c8d893176bf894dbaa85ce29ab6f38388a1f
diff --git a/thirdparty/features/pom.xml b/thirdparty/features/pom.xml
index 67e2ae20913..e1c28b9c7e5 100644
--- a/thirdparty/features/pom.xml
+++ b/thirdparty/features/pom.xml
@@ -5,7 +5,7 @@
org.csstudio
thirdparty
- BUILD-VERSION
+ 4.6.0-SNAPSHOT
org.csstudio
thirdparty-features
diff --git a/thirdparty/plugins/pom.xml b/thirdparty/plugins/pom.xml
index 1ada138dc37..be310ad0d0f 100644
--- a/thirdparty/plugins/pom.xml
+++ b/thirdparty/plugins/pom.xml
@@ -5,7 +5,7 @@
org.csstudio
thirdparty
- BUILD-VERSION
+ 4.6.0-SNAPSHOT
org.csstudio
thirdparty-plugins
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
index a56d41b2955..bfa8ca232c0 100644
--- a/thirdparty/pom.xml
+++ b/thirdparty/pom.xml
@@ -6,104 +6,16 @@
+
4.0.0
- org.csstudio
thirdparty
- BUILD-VERSION
pom
-
-
- 3.0
-
-
-
-
-
- 1.3.0
- ${tycho.version}
- 4.6
- http://download.eclipse.org
- UTF-8
- error
- fail
- s3://download.controlsystemstudio.org
- http://download.controlsystemstudio.org
- ${download.root}/thirdparty/${cs-studio.version}
-
-
-
-
-
-
-
-
- eclipse
- ${eclipse.central.url}/releases/2018-12
- p2
-
-
- eclipse-updates
- ${eclipse.central.url}/eclipse/updates/4.10
- p2
-
-
-
-
-
- cs-studio
-
-
- !cs-studio
-
-
-
-
- csstudio-maven-osgi-bundles
- ${download.root}/maven-osgi-bundles/${cs-studio.version}
- p2
-
-
-
-
-
- csstudio-composite-repo-enable
-
-
- csstudio.composite.repo
-
-
-
-
- csstudio-composite-repo
- file:${csstudio.composite.repo}
- p2
-
-
-
-
- local-dev
-
- warning
- warn
-
-
-
-
-
-
-
+
+ org.csstudio
+ cs-studio
+ 4.6.0-SNAPSHOT
+
@@ -111,16 +23,13 @@
features
repository
-
+
+
+
+ ${download.root}/thirdparty/${cs-studio.version}
+
-
-
- org.kuali.maven.wagons
- maven-s3-wagon
- 1.2.1
-
-
@@ -260,5 +169,4 @@
-
diff --git a/thirdparty/repository/pom.xml b/thirdparty/repository/pom.xml
index 61f657757d7..65677905956 100644
--- a/thirdparty/repository/pom.xml
+++ b/thirdparty/repository/pom.xml
@@ -11,7 +11,7 @@
org.csstudio
thirdparty
- BUILD-VERSION
+ 4.6.0-SNAPSHOT
org.csstudio