Attachment 224019 Details for Bug 395098 – junit.tests.patch v2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] junit.tests.patch v2

junit.tests.patch (text/plain), 5.30 KB, created by Thanh Ha

on 2012-11-27 10:16:57 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thanh Ha

Created: 2012-11-27 10:16:57 EST

Size: 5.30 KB

patch

obsolete

>diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
>index bfbf255..22e9d83 100644
>--- a/eclipse-parent/pom.xml
>+++ b/eclipse-parent/pom.xml
>@@ -22,7 +22,8 @@
> 
>   <properties>
>     <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
>-    <buildId>M${maven.build.timestamp}</buildId>
>+    <buildType>M</buildType>
>+    <buildId>${buildType}${maven.build.timestamp}</buildId>
>     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.2-M-builds</comparator.repo>
>     <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 4b3ae34..788124f 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>
>+
>   
>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 726eb2b..5bb7ac0 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 81c91a8..4a76a7d 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}

Actions: View | Diff

Attachments on bug 395098: 224017 | 224019