Bug 429542 - CBI Build: Create Release Builds
https://bugs.eclipse.org/bugs/show_bug.cgi?id=429542
Move profile prepare-release to outer parent.
Update CBI plugins.
Update submodules.
Change-Id: I0ebdd403e0d1fd1a2ed9b8547466df03679a06b7
Reviewed-on: https://git.eclipse.org/r/22865
Reviewed-by: Ken Lee <kle@bsiag.com>
IP-Clean: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>
diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 82d2ff7..22dfa9e 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -67,15 +67,14 @@
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<buildId>${buildType}${maven.build.timestamp}</buildId>
<buildsToKeep>3</buildsToKeep>
-
- <scout.base.version>4.0.0</scout.base.version>
- <scout.version>${scout.base.version}-SNAPSHOT</scout.version>
+
+ <scout.version>${project.parent.version}</scout.version>
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
<tycho.version>0.19.0</tycho.version>
<tycho-extras.version>0.19.0</tycho-extras.version>
- <cbi-plugins.version>1.0.4</cbi-plugins.version>
- <jarsigner.version>1.0.4</jarsigner.version>
+ <cbi-plugins.version>1.0.5</cbi-plugins.version>
+ <jarsigner.version>1.0.5</jarsigner.version>
<compileSource>1.6</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -87,8 +86,8 @@
<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>
- <cbi-jdt-version>3.9.0.v20130604-1421</cbi-jdt-version>
- <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
+ <cbi-jdt-version>3.10.0.v20140120-2305</cbi-jdt-version>
+ <cbi-snapshots-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-snapshots-repo.url>
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
<!-- UI-Test (Tycho-Tests) Arguments -->
@@ -120,7 +119,7 @@
<id>cbi-snapshots</id>
<url>${cbi-snapshots-repo.url}</url>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
@@ -998,37 +997,5 @@
<platform-version>[3.10,3.11)</platform-version>
</properties>
</profile>
-
- <profile>
- <id>prepare-release</id>
- <properties>
- <milestone.version>I</milestone.version>
- <newVersion>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</newVersion>
- </properties>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <defaultGoal>org.eclipse.tycho:tycho-versions-plugin:set-version</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-versions-plugin</artifactId>
- <executions>
- <execution>
- <id>set-version</id>
- <goals>
- <goal>set-version</goal>
- </goals>
- <configuration>
- <newVersion>${newVersion}</newVersion>
- </configuration>
- <phase>validate</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index 6716216..69c4f2b 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit 67162168a270ff0cb7a0683165e26bdff4cb18f9
+Subproject commit 69c4f2b6395fd26109799a85c4374195c725aac2
diff --git a/org.eclipse.scout.rt.incubator b/org.eclipse.scout.rt.incubator
index 395e6e3..897640f 160000
--- a/org.eclipse.scout.rt.incubator
+++ b/org.eclipse.scout.rt.incubator
@@ -1 +1 @@
-Subproject commit 395e6e3c7b68eb94c9ec2ce0640d45041ddd8ce9
+Subproject commit 897640f058a98451f7a0aa52af1840898ba6e69b
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 9d30861..77b9311 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 9d3086115d743b4f77088ac645201fdaa98f0ee7
+Subproject commit 77b9311e40448d8f1d84ecc49030639fa074ce29
diff --git a/pom.xml b/pom.xml
index d8ca334..5470a34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
<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>
</properties>
<distributionManagement>
@@ -73,6 +74,37 @@
<module>org.eclipse.scout.rap.basic.target</module>
</modules>
</profile>
+
+ <profile>
+ <id>prepare-release</id>
+ <properties>
+ <milestone.version>I</milestone.version>
+ </properties>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>org.eclipse.tycho:tycho-versions-plugin:set-version</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>set-version</id>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ <configuration>
+ <newVersion>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</newVersion>
+ </configuration>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
