Bug 426444 - CBI Build: Cleanup and rename target files in Scout RT
https://bugs.eclipse.org/bugs/show_bug.cgi?id=426444
Cleanup target files.
Update submodules.
Change-Id: I2b51ee20a0f5ebc67f4a80a413699ebb5fb4a080
Reviewed-on: https://git.eclipse.org/r/27790
Reviewed-by: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index a46d73e..d082783 100644
--- a/org.eclipse.scout-feature/pom.xml
+++ b/org.eclipse.scout-feature/pom.xml
@@ -26,8 +26,7 @@
<name>Eclipse Scout Feature</name>
<properties>
- <target-platform>eclipse-3.7</target-platform>
- <platform-version>[3.7,3.8)</platform-version>
+ <target-platform>eclipse-indigo-build</target-platform>
</properties>
<build>
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 97e5ee5..a19872f 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -80,9 +80,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <target-platform>eclipse-3.6</target-platform>
+ <target-platform>eclipse-helios</target-platform>
<rap-repo-target-platform>eclipse-staging</rap-repo-target-platform>
- <rap-repo-platform-version>[3.10,3.11)</rap-repo-platform-version>
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
@@ -779,114 +778,6 @@
</profile>
<profile>
- <id>platform-ganymede</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>ganymede</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-3.4</target-platform>
- <platform-version>[3.4,3.5)</platform-version>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <profile>
- <id>platform-galileo</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>galileo</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-3.5</target-platform>
- <platform-version>[3.5,3.6)</platform-version>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <profile>
<id>platform-helios</id>
<activation>
<property>
@@ -895,8 +786,20 @@
</property>
</activation>
<properties>
- <target-platform>eclipse-3.6</target-platform>
- <platform-version>[3.6,3.7)</platform-version>
+ <target-platform>eclipse-helios</target-platform>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>platform-indigo-build</id>
+ <activation>
+ <property>
+ <name>platform-version-name</name>
+ <value>indigo-build</value>
+ </property>
+ </activation>
+ <properties>
+ <target-platform>eclipse-indigo-build</target-platform>
</properties>
</profile>
@@ -909,8 +812,7 @@
</property>
</activation>
<properties>
- <target-platform>eclipse-3.7</target-platform>
- <platform-version>[3.7,3.8)</platform-version>
+ <target-platform>eclipse-indigo</target-platform>
</properties>
</profile>
@@ -923,22 +825,7 @@
</property>
</activation>
<properties>
- <target-platform>eclipse-3.8</target-platform>
- <platform-version>[3.8,3.9)</platform-version>
- </properties>
- </profile>
-
- <profile>
- <id>platform-kepler</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>kepler</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-3.9</target-platform>
- <platform-version>[3.9,3.10)</platform-version>
+ <target-platform>eclipse-juno</target-platform>
</properties>
</profile>
@@ -952,21 +839,6 @@
</activation>
<properties>
<target-platform>eclipse-staging</target-platform>
- <platform-version>[3.10,3.11)</platform-version>
- </properties>
- </profile>
-
- <profile>
- <id>platform-kepler-i</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>kepler_I</value>
- </property>
- </activation>
- <properties>
- <target-platform>eclipse-3.9I</target-platform>
- <platform-version>[3.9,3.10)</platform-version>
</properties>
</profile>
@@ -979,8 +851,7 @@
</property>
</activation>
<properties>
- <target-platform>eclipse-3.10I</target-platform>
- <platform-version>[3.10,3.11)</platform-version>
+ <target-platform>eclipse-luna-integration</target-platform>
</properties>
</profile>
@@ -993,8 +864,7 @@
</property>
</activation>
<properties>
- <target-platform>eclipse-3.10</target-platform>
- <platform-version>[3.10,3.11)</platform-version>
+ <target-platform>eclipse-luna</target-platform>
</properties>
</profile>
</profiles>
diff --git a/org.eclipse.scout.rap.repository/pom.xml b/org.eclipse.scout.rap.repository/pom.xml
index dbd31f5..3f2015d 100644
--- a/org.eclipse.scout.rap.repository/pom.xml
+++ b/org.eclipse.scout.rap.repository/pom.xml
@@ -28,7 +28,6 @@
<properties>
<target-platform>${rap-repo-target-platform}</target-platform>
- <platform-version>${rap-repo-platform-version}</platform-version>
<p2repo-zip-path>${project.build.directory}/org.eclipse.scout.rap.repository-${project.version}.zip</p2repo-zip-path>
</properties>
diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index 9d5978d..283f7e6 100644
--- a/org.eclipse.scout.repository/pom.xml
+++ b/org.eclipse.scout.repository/pom.xml
@@ -27,8 +27,7 @@
<properties>
<p2repo-zip-path>${project.build.directory}/org.eclipse.scout.repository-${project.version}.zip</p2repo-zip-path>
- <target-platform>eclipse-3.7</target-platform>
- <platform-version>[3.7,3.8)</platform-version>
+ <target-platform>eclipse-indigo-build</target-platform>
</properties>
<build>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index fddadd2..af6b5e7 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit fddadd2d8da9f63161f9b68b60d1a3b975cd70b2
+Subproject commit af6b5e74bc92def1972591a70547a2141877eadf
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 581f319..57a87b1 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 581f3192d3f122a5e42a2a1ac0ea9ec2d446d238
+Subproject commit 57a87b156a3856a41fc2b32bea50ecbb67cb4165
