Mercurial > hg > release > thermostat-0.5

changeset 794:7847fa71fe23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-deps repo missing error in Eclipse build This commit fixes a build error introduced in [1], where the Eclipse parent POM file lists the test dependencies p2 repository, but this repo has not been built yet. In the changes introduced in [1], we build and run the tests in a second step invoked after the Eclipse build. This error only appears on a fresh clone when there is no existing p2 repository in the build tree, thus it slipped by before. This commit moves the p2 repository specification from the Eclipse parent POM to the POMs for the test plugins. [1] http://icedtea.classpath.org/pipermail/thermostat/2012-November/004063.html Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004145.html
author Elliott Baron <ebaron@redhat.com>
date Tue, 20 Nov 2012 12:59:49 -0500
parents 03f70aded260
children 09c2918d8656
files eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml eclipse/com.redhat.thermostat.eclipse.test/pom.xml eclipse/pom.xml
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml	Tue Nov 20 14:57:05 2012 +0100
+++ b/eclipse/com.redhat.thermostat.eclipse.test.ui/pom.xml	Tue Nov 20 12:59:49 2012 -0500
@@ -30,6 +30,11 @@
       <layout>p2</layout>
       <url>file://${basedir}/../com.redhat.thermostat.eclipse.p2-repo/target/repository/</url>
     </repository>
+    <repository>
+      <id>local_eclipse_test_deps</id>
+      <layout>p2</layout>
+      <url>file://${basedir}/../test-deps-p2-repository/target/repository/</url>
+    </repository>
   </repositories>
 
   <build>
--- a/eclipse/com.redhat.thermostat.eclipse.test/pom.xml	Tue Nov 20 14:57:05 2012 +0100
+++ b/eclipse/com.redhat.thermostat.eclipse.test/pom.xml	Tue Nov 20 12:59:49 2012 -0500
@@ -25,6 +25,11 @@
       <layout>p2</layout>
       <url>file://${basedir}/../com.redhat.thermostat.eclipse.p2-repo/target/repository/</url>
     </repository>
+    <repository>
+      <id>local_eclipse_test_deps</id>
+      <layout>p2</layout>
+      <url>file://${basedir}/../test-deps-p2-repository/target/repository/</url>
+    </repository>
   </repositories>
 
   <build>
--- a/eclipse/pom.xml	Tue Nov 20 14:57:05 2012 +0100
+++ b/eclipse/pom.xml	Tue Nov 20 12:59:49 2012 -0500
@@ -112,11 +112,6 @@
       <url>${orbit-site}</url>
     </repository>
     <repository>
-      <id>local_eclipse_test_deps</id>
-      <layout>p2</layout>
-      <url>file://${basedir}/../test-deps-p2-repository/target/repository/</url>
-    </repository>
-    <repository>
       <id>local_jfreechart</id>
       <layout>p2</layout>
       <url>file://${basedir}/../jfreechart-p2-repository/target/repository/</url>