You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/01/19 15:01:32 UTC
svn commit: r497817 - in
/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence:
project.properties project.xml subproject/maven.xml
subproject/subproject2/maven.xml
Author: aheritier
Date: Fri Jan 19 06:01:31 2007
New Revision: 497817
URL: http://svn.apache.org/viewvc?view=rev&rev=497817
Log:
Fix tests to be able to run them behind a proxy and archiva
maven.repo.remote isn't a good property to test.
Modified:
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.properties
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.xml
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml
maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml
Modified: maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.properties?view=diff&rev=497817&r1=497816&r2=497817
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.properties (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.properties Fri Jan 19 06:01:31 2007
@@ -17,4 +17,5 @@
parent.project.property=okiedokie
parent.project.property.override=original
-maven.repo.remote=dummy
+pom.url.test=dummy
+maven.src.dir=dummy
\ No newline at end of file
Modified: maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.xml?view=diff&rev=497817&r1=497816&r2=497817
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/project.xml Fri Jan 19 06:01:31 2007
@@ -27,7 +27,7 @@
<logo/>
<shortDescription/>
<description>${maven.build.dir}</description>
- <url>${maven.repo.remote}</url>
+ <url>${pom.url.test}</url>
<siteAddress/>
<siteDirectory/>
<distributionSite/>
Modified: maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml?view=diff&rev=497817&r1=497816&r2=497817
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/maven.xml Fri Jan 19 06:01:31 2007
@@ -51,9 +51,9 @@
<ant:fail>Sorry, but parent.build.property.override = '${value}', inherited incorrectly</ant:fail>
</j:if>
<ant:echo>inherited builtin property override test</ant:echo>
- <j:set var="value" value="${maven.repo.remote}"/>
+ <j:set var="value" value="${maven.src.dir}"/>
<j:if test="${value != 'dummy'}">
- <ant:fail>Sorry, but maven.repo.remote = '${value}', inherited incorrectly</ant:fail>
+ <ant:fail>Sorry, but maven.src.dir = '${value}', inherited incorrectly</ant:fail>
</j:if>
<ant:echo>inherited builtin property POM substitution</ant:echo>
<j:set var="value" value="${pom.url}"/>
Modified: maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml?view=diff&rev=497817&r1=497816&r2=497817
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/src/reactor-build/inheritence/subproject/subproject2/maven.xml Fri Jan 19 06:01:31 2007
@@ -63,9 +63,9 @@
<ant:fail>Sorry, but parent.build.property.override = '${value}', inherited incorrectly in 2nd subproject</ant:fail>
</j:if>
<ant:echo>inherited builtin property override test</ant:echo>
- <j:set var="value" value="${maven.repo.remote}"/>
+ <j:set var="value" value="${maven.src.dir}"/>
<j:if test="${value != 'dummy'}">
- <ant:fail>Sorry, but maven.repo.remote = '${value}', inherited incorrectly</ant:fail>
+ <ant:fail>Sorry, but maven.src.dir = '${value}', inherited incorrectly</ant:fail>
</j:if>
<ant:echo>inherited builtin property POM substitution</ant:echo>
<j:set var="value" value="${pom.url}"/>