commit 7269819d7335ddfeed2051f332b9d319eb8ea8f5
author Ken Lee <kle@bsiag.com> Thu Jun 27 17:19:33 2013 +0200
committer Ken Lee <kle@bsiag.com> Thu Jun 27 11:23:20 2013 -0400
tree 2090faca78fbd600e0597ff238ab35ec7311d1bb
parent 02a7deb9ba9d76a6d2cf1991c01afaf73230e135

Bug 411769 - CBI Build: Create develop branch

https://bugs.eclipse.org/bugs/show_bug.cgi?id=411769

Adds correct directory for nightly. Builds uses Eclipse 3.7.

Change-Id: Ieabebccf49ed3f940e5ed779826ae88d22a3e4e0
Reviewed-on: https://git.eclipse.org/r/14105
Reviewed-by: Ken Lee <kle@bsiag.com>
IP-Clean: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>

org.eclipse.scout.parent/pom.xml

diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index fed2530..755deaf 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -65,10 +65,12 @@
     <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
     <buildType>N</buildType>
     <buildId>${buildType}${maven.build.timestamp}</buildId>
+    <scoutTargetVersion>3.10</scoutTargetVersion>
+    <stageTargetNightlyDir>nightly/${scoutTargetVersion}</stageTargetNightlyDir>
 
     <scout.version>3.10.0-SNAPSHOT</scout.version>
 
-    <comparator.repo>http://download.eclipse.org/eclipse/updates/4.2-M-builds</comparator.repo>
+    <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
     <tycho.version>0.17.0</tycho.version>
     <tycho-extras.version>0.17.0</tycho-extras.version>
 
@@ -76,7 +78,7 @@
     <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-3.7</target-platform>
 
     <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>

org.eclipse.scout.rap.repository/pom.xml

diff --git a/org.eclipse.scout.rap.repository/pom.xml b/org.eclipse.scout.rap.repository/pom.xml
index 74523c6..c022a76 100644
--- a/org.eclipse.scout.rap.repository/pom.xml
+++ b/org.eclipse.scout.rap.repository/pom.xml
@@ -192,8 +192,8 @@
                 <id>stage</id>
                 <phase>install</phase>
                 <configuration>
-                  <updatesiteDir>N${maven.build.timestamp}</updatesiteDir>
-                  <compositeDir>nightly/3.9/scout.rap</compositeDir>
+                  <updatesiteDir>${buildId}</updatesiteDir>
+                  <compositeDir>${stageTargetNightlyDir}/scout.rap</compositeDir>
                   <maxSize>3</maxSize>
                 </configuration>
                 <goals>

org.eclipse.scout.repository/pom.xml

diff --git a/org.eclipse.scout.repository/pom.xml b/org.eclipse.scout.repository/pom.xml
index f8524bd..33983ac 100644
--- a/org.eclipse.scout.repository/pom.xml
+++ b/org.eclipse.scout.repository/pom.xml
@@ -148,9 +148,6 @@
 
     <profile>
       <id>eclipse-stage</id>
-      <properties>
-        <stageTargetDir>nightly/3.9</stageTargetDir>
-      </properties>
 
       <build>
         <plugins>
@@ -160,7 +157,7 @@
             <version>1.0.0-SNAPSHOT</version>
             <configuration>
               <updatesiteDir>${buildId}</updatesiteDir>
-              <compositeDir>${stageTargetDir}/scout.main</compositeDir>
+              <compositeDir>${stageTargetNightlyDir}/scout.main</compositeDir>
               <maxSize>3</maxSize>
             </configuration>
             <executions>