restructuring the repo

ControlSystemStudio · Oct 11, 2019 · dfeff7c · dfeff7c
1 parent 9511a23
commit dfeff7c
Show file tree

Hide file tree

Showing 21 changed files with 263 additions and 357 deletions.
diff --git a/applications/pom.xml b/applications/pom.xml
@@ -6,82 +6,32 @@
 <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">
+
+  <!-- USE MAVEN 3.0 -->
+  <prerequisites>
+    <maven>3.0</maven>
+  </prerequisites>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.csstudio</groupId>
   <artifactId>applications</artifactId>
   <version>4.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <!-- USE MAVEN 3.0 -->
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
+
+  <parent>
+    <groupId>org.csstudio</groupId>
+    <artifactId>cs-studio</artifactId>
+    <version>4.6.0-SNAPSHOT</version>
+  </parent>
+
   <!-- PROPERTIES -->
   <properties>
     <!-- VERSIONS -->
-    <tycho.version>1.3.0</tycho.version>
-    <tycho-extras.version>${tycho.version}</tycho-extras.version>
-    <cs-studio.version>4.6</cs-studio.version>
-    <eclipse.central.url>http://download.eclipse.org</eclipse.central.url>
-    <eclipse.mirror.url>${eclipse.central.url}</eclipse.mirror.url>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
-    <baselineMode>fail</baselineMode>
-    <upload.root>s3://download.controlsystemstudio.org</upload.root>
-    <download.root>http://download.controlsystemstudio.org</download.root>
     <cs-studio-central.url>${download.root}/applications/${cs-studio.version}</cs-studio-central.url>
-    <skipTests>false</skipTests>
-    <!-- SonarQube configuration -->
-    <sonar.language>java</sonar.language>
-    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.junit.reportsPath>../${project.artifactId}.test/target/surefire-reports/</sonar.junit.reportsPath>
-    <!--sonar.host.url>INSERT YOUR SONARQUBE URL</sonar.host.url -->
-    <!--sonar.jdbc.url>INSERT YOUR JDBC CONNECTION</sonar.jdbc.url -->
-    <!--sonar.jdbc.driver>INSERT YOUR JDBC DRIVER</sonar.jdbc.driver -->
-    <!--sonar.jdbc.username>username</sonar.jdbc.username! -->
-    <!--sonar.jdbc.password>password</sonar.jdbc.password -->
   </properties>
+
   <!-- Profiles -->
   <profiles>
-    <profile>
-      <id>platform-default</id>
-      <activation>
-        <property>
-          <name>!platform-version-name</name>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>${eclipse.mirror.url}/releases/2018-12</eclipse-site>
-        <eclipse-update-site>${eclipse.mirror.url}/eclipse/updates/4.10</eclipse-update-site>
-        <efx-site>${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site</efx-site>
-      </properties>
-    </profile>
-    <profile>
-      <id>csstudio-composite-repo-enable</id>
-      <activation>
-        <property>
-          <name>csstudio.composite.repo</name>
-        </property>
-      </activation>
-      <repositories>
-        <repository>
-          <id>csstudio-composite-repo</id>
-          <url>file:${csstudio.composite.repo}</url>
-          <layout>p2</layout>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>local-dev</id>
-      <properties>
-        <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
-        <baselineMode>warn</baselineMode>
-      </properties>
-      <repositories>
-      </repositories>
-      <pluginRepositories>
-      </pluginRepositories>
-    </profile>
     <profile>
       <id>cs-studio</id>
       <activation>
@@ -114,39 +64,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-      <id>checkstyle</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.17</version>
-            <executions>
-              <execution>
-                <id>validate</id>
-                <phase>validate</phase>
-                <configuration>
-                  <includes>**/*</includes>
-                  <excludes>**/target/**</excludes>
-                  <configLocation>../build/cs-studio-jenkins-checkstyle</configLocation>
-                  <suppressionsLocation>../build/cs-studio-jenkins-checkstyle-suppressions</suppressionsLocation>
-                  <encoding>UTF-8</encoding>
-                  <consoleOutput>true</consoleOutput>
-                  <outputFile>checkstyle-output.xml</outputFile>
-                  <sourceDirectory>.</sourceDirectory>
-                  <failsOnError>true</failsOnError>
-                  <linkXRef>false</linkXRef>
-                </configuration>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <repositories>
     <repository>

diff --git a/core/base/pom.xml b/core/base/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>base</artifactId>
   <version>4.2.0-SNAPSHOT</version>

diff --git a/core/diirt/pom.xml b/core/diirt/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>diirt</artifactId>
   <packaging>pom</packaging>
@@ -12,4 +12,5 @@
     <module>diirt-repository</module>
     <module>diirt-plugins</module>
   </modules>
+  <version>4.2.0-SNAPSHOT</version>
 </project>
diff --git a/core/p2repo/pom.xml b/core/p2repo/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>core-p2repo</artifactId>
   <packaging>pom</packaging>

diff --git a/core/platform/pom.xml b/core/platform/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>platform</artifactId>
   <packaging>pom</packaging>
@@ -13,4 +13,5 @@
     <module>platform-features</module>
     <module>platform-repository</module>
   </modules>
+  <version>4.2.0-SNAPSHOT</version>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -6,82 +6,28 @@
 <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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.csstudio</groupId>
-  <artifactId>core</artifactId>
-  <version>4.2.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
   <!-- USE MAVEN 3.0 -->
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>core</artifactId>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.csstudio</groupId>
+    <artifactId>cs-studio</artifactId>
+    <version>4.6.0-SNAPSHOT</version>
+  </parent>
+
   <!-- PROPERTIES -->
   <properties>
-    <!-- VERSIONS -->
-    <tycho.version>1.3.0</tycho.version>
-    <tycho-extras.version>${tycho.version}</tycho-extras.version>
-    <cs-studio.version>4.6</cs-studio.version>
-    <eclipse.central.url>http://download.eclipse.org</eclipse.central.url>
-    <eclipse.mirror.url>${eclipse.central.url}</eclipse.mirror.url>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>
-    <baselineMode>fail</baselineMode>
-    <upload.root>s3://download.controlsystemstudio.org</upload.root>
-    <download.root>http://download.controlsystemstudio.org</download.root>
     <cs-studio-central.url>${download.root}/core/${cs-studio.version}</cs-studio-central.url>
-    <skipTests>false</skipTests>
-    <!-- SonarQube configuration -->
-    <sonar.language>java</sonar.language>
-    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.junit.reportsPath>../${project.artifactId}.test/target/surefire-reports/</sonar.junit.reportsPath>
-    <!--sonar.host.url>INSERT YOUR SONARQUBE URL</sonar.host.url -->
-    <!--sonar.jdbc.url>INSERT YOUR JDBC CONNECTION</sonar.jdbc.url -->
-    <!--sonar.jdbc.driver>INSERT YOUR JDBC DRIVER</sonar.jdbc.driver -->
-    <!--sonar.jdbc.username>username</sonar.jdbc.username! -->
-    <!--sonar.jdbc.password>password</sonar.jdbc.password -->
   </properties>
+
   <!-- Profiles -->
   <profiles>
-    <profile>
-      <id>platform-default</id>
-      <activation>
-        <property>
-          <name>!platform-version-name</name>
-        </property>
-      </activation>
-      <properties>
-        <eclipse-site>${eclipse.mirror.url}/releases/2018-12</eclipse-site>
-        <eclipse-update-site>${eclipse.mirror.url}/eclipse/updates/4.10</eclipse-update-site>
-        <efx-site>${eclipse.mirror.url}/efxclipse/runtime-released/3.5.0/site</efx-site>
-      </properties>
-    </profile>
-    <profile>
-      <id>csstudio-composite-repo-enable</id>
-      <activation>
-        <property>
-          <name>csstudio.composite.repo</name>
-        </property>
-      </activation>
-      <repositories>
-        <repository>
-          <id>csstudio-composite-repo</id>
-          <url>file:${csstudio.composite.repo}</url>
-          <layout>p2</layout>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>local-dev</id>
-      <properties>
-        <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
-        <baselineMode>warn</baselineMode>
-      </properties>
-      <repositories>
-      </repositories>
-      <pluginRepositories>
-      </pluginRepositories>
-    </profile>
     <profile>
       <id>cs-studio-sites</id>
       <activation>
@@ -134,39 +80,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-      <id>checkstyle</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.17</version>
-            <executions>
-              <execution>
-                <id>validate</id>
-                <phase>validate</phase>
-                <configuration>
-                  <includes>**/*</includes>
-                  <excludes>**/target/**</excludes>
-                  <configLocation>../build/cs-studio-jenkins-checkstyle</configLocation>
-                  <suppressionsLocation>../build/cs-studio-jenkins-checkstyle-suppressions</suppressionsLocation>
-                  <encoding>UTF-8</encoding>
-                  <consoleOutput>true</consoleOutput>
-                  <outputFile>checkstyle-output.xml</outputFile>
-                  <sourceDirectory>.</sourceDirectory>
-                  <failsOnError>true</failsOnError>
-                  <linkXRef>false</linkXRef>
-                </configuration>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <distributionManagement>
     <site>

diff --git a/core/ui/pom.xml b/core/ui/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>ui</artifactId>
   <packaging>pom</packaging>
@@ -13,4 +13,5 @@
     <module>ui-repository</module>
     <module>ui-features</module>
   </modules>
+  <version>4.2.0-SNAPSHOT</version>
 </project>
diff --git a/core/unorganized/pom.xml b/core/unorganized/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>unorganized</artifactId>
   <version>4.2.0-SNAPSHOT</version>

diff --git a/core/utility/pom.xml b/core/utility/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>core</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>utility</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>utility-plugins</module>
     <module>utility-features</module>
     <module>utility-repository</module>
   </modules>
+  <version>4.1.0-SNAPSHOT</version>
 </project>
diff --git a/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml b/maven-osgi-bundles/epics/plugins/javafx.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>epics-plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>openjfx.swt</artifactId>
   <version>11.0.1</version>

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
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>epics-plugins</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.csstudio.platform.libs.epics</artifactId>
   <packaging>bundle</packaging>

diff --git a/maven-osgi-bundles/epics/plugins/pom.xml b/maven-osgi-bundles/epics/plugins/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>epics</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>epics-plugins</artifactId>
   <packaging>pom</packaging>

diff --git a/maven-osgi-bundles/epics/pom.xml b/maven-osgi-bundles/epics/pom.xml
@@ -5,10 +5,9 @@
   <parent>
     <groupId>org.csstudio</groupId>
     <artifactId>maven-osgi-bundles</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>epics</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>plugins</module>