Bug 395098 - eclipse-junit-tests generates incorrect properties files

Conflicts:

	eclipse-parent/pom.xml

4 files changed, 18 insertions, 11 deletions

diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index 0248f439b..023493a02 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -21,6 +21,9 @@
   <packaging>pom</packaging>
 
   <properties>
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <buildType>M</buildType>
+    <buildId>${buildType}${maven.build.timestamp}</buildId>
     <tycho.version>0.17.0-SNAPSHOT</tycho.version>
     <tycho-extras.version>0.17.0-SNAPSHOT</tycho-extras.version>
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 4b3ae34a8..788124fc4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -24,6 +24,10 @@
   <artifactId>eclipse-junit-tests</artifactId>
   <packaging>eclipse-repository</packaging>
 
+  <properties>
+    <timestamp>${maven.build.timestamp}</timestamp>
+  </properties>
+
   <!--
     igorf: I *guess* junit-tests is built by PDE/Build from org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests 
    -->
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index 726eb2bd6..5bb7ac00e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -1,18 +1,18 @@
 #Properties required by equinox p2 tests
 #Wed, 14 Mar 2012 19:41:56 -0400
 
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=\${basedir}/eclipse-platform-${buildQualifier}-linux-gtk.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildQualifier}-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\eclipse-platform-${buildQualifier}-win32.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildQualifier}-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=\${basedir}/eclipse-platform-${buildQualifier}-macosx-cocoa.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildQualifier}-macosx-cocoa-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=\${basedir}/eclipse-platform-${buildId}-linux-gtk.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-${buildId}-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\eclipse-platform-${buildId}-win32.zip
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-3.7.2-linux-gtk.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-3.7.2-linux-gtk-x86_64.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-3.7.2-win32.zip
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-3.7.2-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=\${basedir}/eclipse-platform-3.7.2-macosx-cocoa.tar.gz
 org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-3.7.2-macosx-cocoa-x86_64.tar.gz
-org.eclipse.equinox.p2.tests.current.build.repo=file:/shared/eclipse/e4/lts/R3_platform-aggregator/TMP/org.eclipse.sdk.epp/target/repository/
+org.eclipse.equinox.p2.tests.current.build.repo=file:/shared/eclipse/e4/lts/eclipse.platform.releng.aggregator/eclipse.platform.repository/target/repository/
 org.eclipse.equinox.p2.tests.last.release.build.repo=http://download.eclipse.org/eclipse/updates/3.7/R-3.7-201106131736
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
index 81c91a842..4a76a7d77 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -1,5 +1,5 @@
 # can't access timestamp, so use version qualifier instead
-timestamp=${buildQualifier}
-buildType=I
-buildId=${buildQualifier}
-buildLabel=${buildQualifier}
+timestamp=${timestamp}
+buildType=${buildType}
+buildId=${buildId}
+buildLabel=${buildId}