Merge branch 'releases/4.0.x' into develop
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 824787d..41ca52f 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/RC3-20140602-1108/"/>
+ <repository id="rap_2.3" location="http://download.eclipse.org/rt/rap/2.3/RC4-20140610-0925/"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
</location>
diff --git a/pom.xml b/pom.xml
index f7a7d73..48ff47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,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>
@@ -133,9 +133,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>
