Merge tag 'Luna_4.0_SR2_RC4'
diff --git a/org.eclipse.scout-feature/feature.xml b/org.eclipse.scout-feature/feature.xml
index 9e63ec3..892b72a 100644
--- a/org.eclipse.scout-feature/feature.xml
+++ b/org.eclipse.scout-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout"
label="%featureName"
- version="4.0.0.qualifier"
+ version="4.0.200.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout"
license-feature="org.eclipse.license"
@@ -26,11 +26,11 @@
</url>
<requires>
- <import feature="org.eclipse.scout.rt.source" version="4.0.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.source" version="4.0.0" match="compatible"/>
- <import feature="org.eclipse.scout.sdk.rap.source" version="4.0.0" match="compatible"/>
- <import feature="org.eclipse.scout.rt.testing.source" version="4.0.0" match="compatible"/>
- <import feature="org.eclipse.scout.rt.spec.source" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.source" version="4.0.200" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.source" version="4.0.200" match="compatible"/>
+ <import feature="org.eclipse.scout.sdk.rap.source" version="4.0.200" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.testing.source" version="4.0.200" match="compatible"/>
+ <import feature="org.eclipse.scout.rt.spec.source" version="4.0.200" match="compatible"/>
</requires>
</feature>
diff --git a/org.eclipse.scout-feature/pom.xml b/org.eclipse.scout-feature/pom.xml
index 72e6803..a2a5749 100644
--- a/org.eclipse.scout-feature/pom.xml
+++ b/org.eclipse.scout-feature/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.maven.plugins.updatesite/pom.xml b/org.eclipse.scout.maven.plugins.updatesite/pom.xml
index ee03c3b..f32e2a0 100644
--- a/org.eclipse.scout.maven.plugins.updatesite/pom.xml
+++ b/org.eclipse.scout.maven.plugins.updatesite/pom.xml
@@ -15,7 +15,7 @@
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<dependencies>
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index be41313..45b822d 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.scout.parent</artifactId>
@@ -68,7 +68,7 @@
<buildId>${buildType}${maven.build.timestamp}</buildId>
<buildsToKeep>3</buildsToKeep>
- <scout.version>4.0.0-SNAPSHOT</scout.version>
+ <scout.version>4.0.200-SNAPSHOT</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
<tycho.version>0.20.0</tycho.version>
@@ -782,114 +782,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>
@@ -960,20 +852,6 @@
</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>
-
- <profile>
<id>platform-luna-i</id>
<activation>
<property>
diff --git a/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target b/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
index 2d9da4a..642c912 100644
--- a/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
+++ b/org.eclipse.scout.rap.basic.target/org.eclipse.scout.rap.basic.target_template.target
@@ -3,13 +3,13 @@
<target name="scout-rap-basic-target.target">
<locations>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="scout_nightly" location="http://download.eclipse.org/scout/nightly"/>
+ <repository id="scout_nightly_4.0" location="http://download.eclipse.org/scout/nightly/4.0/"/>
<unit id="org.eclipse.scout.rt.rap.basic.target.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="jar:$SCOUT_RT_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-4.0.0-SNAPSHOT.zip!/"/>
+ <repository location="jar:$SCOUT_RT_REPO_TARGET_LOCATION$/target/org.eclipse.scout.rt.rap-repository-4.0.200-SNAPSHOT.zip!/"/>
<unit id="org.eclipse.scout.rt.rap.source.feature.group" version="0.0.0"/>
</location>
diff --git a/org.eclipse.scout.rap.basic.target/pom.xml b/org.eclipse.scout.rap.basic.target/pom.xml
index a3b245c..aad9f22 100644
--- a/org.eclipse.scout.rap.basic.target/pom.xml
+++ b/org.eclipse.scout.rap.basic.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rap.repository/pom.xml b/org.eclipse.scout.rap.repository/pom.xml
index 101229a..5e16c1d 100644
--- a/org.eclipse.scout.rap.repository/pom.xml
+++ b/org.eclipse.scout.rap.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -185,7 +185,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<executions>
<execution>
<id>stage</id>
diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index c1c1081..005ab3d 100644
--- a/org.eclipse.scout.repository/pom.xml
+++ b/org.eclipse.scout.repository/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.eclipse.scout.maven.plugins</groupId>
<artifactId>org.eclipse.scout.maven.plugins.updatesite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<configuration>
<updatesiteDir>${buildId}</updatesiteDir>
<compositeDir>${stageTargetDir}/scout.main</compositeDir>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index e67b906..460b517 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit e67b9064600dc6f720564885f2f5cdcb829bc67f
+Subproject commit 460b517a6d551d5eda7b005de9ee86f292c55ebc
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
index 86eecd2..1aa07ca 160000
--- a/org.eclipse.scout.rt.incubator
+++ b/org.eclipse.scout.rt.incubator
@@ -1 +1 @@
-Subproject commit 86eecd2e9b927b2f6d2b3c41be58e5b430993b21
+Subproject commit 1aa07ca18ff4ad18e388447aa5db6da7a6f665b7
diff --git a/org.eclipse.scout.rt.rap.target-feature/feature.xml b/org.eclipse.scout.rt.rap.target-feature/feature.xml
index 3c55ee8..338fdee 100644
--- a/org.eclipse.scout.rt.rap.target-feature/feature.xml
+++ b/org.eclipse.scout.rt.rap.target-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout.rt.rap.target"
label="%featureName"
- version="4.0.0.qualifier"
+ version="4.0.200.qualifier"
provider-name="%providerName"
plugin="org.eclipse.scout.rt.rap.target"
license-feature="org.eclipse.license"
@@ -29,7 +29,7 @@
id="org.eclipse.scout.rt.rap.target"
download-size="0"
install-size="0"
- version="4.0.0.qualifier"
+ version="4.0.200.qualifier"
unpack="false"/>
</feature>
diff --git a/org.eclipse.scout.rt.rap.target-feature/pom.xml b/org.eclipse.scout.rt.rap.target-feature/pom.xml
index 1f34315..e4f15fa 100644
--- a/org.eclipse.scout.rt.rap.target-feature/pom.xml
+++ b/org.eclipse.scout.rt.rap.target-feature/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
index 6c7a60e..c1986dc 100644
--- a/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.rap.target/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scout RAP Target
Bundle-SymbolicName: org.eclipse.scout.rt.rap.target
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.200.qualifier
Bundle-Vendor: Eclipse Scout Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
index 543ae69..b8d3fac 100644
--- a/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
+++ b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
@@ -2,7 +2,7 @@
<?pde version="3.6"?><target name="Rap" sequenceNumber="13">
<locations>
<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository id="rap_2.3" location="http://download.eclipse.org/rt/rap/2.3/RC4-20140610-0925/"/>
+ <repository id="rap_2.3" location="http://download.eclipse.org/rt/rap/2.3/SR2-RC3-20150128-1013/"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
</location>
diff --git a/org.eclipse.scout.rt.rap.target/pom.xml b/org.eclipse.scout.rt.rap.target/pom.xml
index 7adf9bd..4472a70 100644
--- a/org.eclipse.scout.rt.rap.target/pom.xml
+++ b/org.eclipse.scout.rt.rap.target/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index a9dc0dd..4ae6a3d 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit a9dc0dd709ee72cdfdf2902ca2ab8d27ce003490
+Subproject commit 4ae6a3d0a0900ab2510b87a6282f7ad1f915bdd8
diff --git a/pom.xml b/pom.xml
index 0de5fd0..09280e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,12 @@
<groupId>org.eclipse.scout</groupId>
<artifactId>eclipse.scout-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout-aggregator.git</tycho.scmUrl>
- <scout.base.version>4.0.0</scout.base.version>
+ <scout.base.version>4.0.200</scout.base.version>
</properties>
<distributionManagement>
@@ -79,7 +79,7 @@
<id>prepare-release</id>
<properties>
<milestone.version>I</milestone.version>
- <scout.build.version>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</scout.build.version>
+ <newVersion>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</newVersion>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@@ -97,9 +97,7 @@
<goal>set-version</goal>
</goals>
<configuration>
- <newVersion>${scout.build.version}</newVersion>
- <properties>scout.version</properties>
- <artifacts>eclipse.scout-aggregator,org.eclipse.scout.parent</artifacts>
+ <newVersion>${newVersion}</newVersion>
</configuration>
<phase>validate</phase>
</execution>
