Hi Lukas,
I don't know if it's related to your change but the cruisecontrol plugin
test fails now :
[exec] +----------------------------------------
[exec] | Executing testPlugin Maven Cruisecontrol plugin test - cvs
[exec] | Memory: 75M/82M
[exec] +----------------------------------------
[exec] build:start:
[exec] clean:clean:
[exec] xdoc:clean:
[exec] [delete] Deleting directory
E:\Projects\Maven\SCM\m1-trunks\plugins\cruisecontrol\src\plugin-test\cvs-scm\target
[exec] clean:
[exec] test-init:
[exec] test-cruisecontrol-configure:
[exec] scm:find-connection:
[exec] [echo] Using connection: scm:cvs:pserver:[EMAIL PROTECTED]
:/home/cvspublic:dummy
[exec] scm:validate:
[exec] [echo] DEPRECATED: scm:validate has been deprecated
[exec] BUILD FAILED
[exec] Errors stack :
[exec] >> Unable to obtain goal [plugins:test-all]
[exec] >> File......
file:/E:/Projects/Maven/SCM/m1-trunks/core/../plugins/maven.xml
[exec] >> Element... maven:reactor
[exec] >> Line...... 29
[exec] >> Column.... 185
[exec] >> Unable to obtain goal [plugin:test]
[exec] >> File...... file:/E:/Data/maven-1/cache/maven-
plugin-plugin-1.8-SNAPSHOT/plugin.jelly
[exec] >> Element... maven:maven
[exec] >> Line...... 499
[exec] >> Column.... 34
[exec] >> Unable to obtain goal [testPlugin]
[exec] >> File...... file:/E:/Data/maven-1/cache/maven-
multiproject-plugin-1.6-SNAPSHOT/plugin.jelly
[exec] >> Element... maven:reactor
[exec] >> Line...... 227
[exec] >> Column.... 64
[exec] >> Unable to obtain goal [test-cruisecontrol-configure]
[exec] >> File...... file:/E:/Data/maven-1/cache/maven-
scm-plugin-1.6.1-SNAPSHOT/plugin.jelly
[exec] >> Element... ant:fail
[exec] >> Line...... 372
[exec] >> Column.... 21
[exec] >> You must specify maven.scm.cvs.root
The cruisecontrol plugin seems to use this property but this one is
deprecated in the scm plugin and isn't defined in the project used to test
the CC plugin.
Any idea ? Should we update the CC plugin ?
Arnaud
On 10/31/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: ltheussl
Date: Tue Oct 31 07:43:50 2006
New Revision: 469532
URL: http://svn.apache.org/viewvc?view=rev&rev=469532
Log:
PR: MPSCM-89
SCM Parse Connection output is wrong / misleading.
Removed the use of scm:parse-connection (deprecated).
Modified:
maven/maven-1/plugins/trunk/scm/plugin.jelly
maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/scm/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/scm/plugin.jelly?view=diff&rev=469532&r1=469531&r2=469532
==============================================================================
--- maven/maven-1/plugins/trunk/scm/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/scm/plugin.jelly Tue Oct 31 07:43:50 2006
@@ -110,6 +110,7 @@
</j:if>
<j:if test="${scmConnection == null}">
+ <j:set var="scmMethod" value="${maven.scm.method}"/>
<j:if test="${scmMethod == 'cvs'}">
<j:set var="value" value="${maven.scm.cvs.root}" />
<j:if test="${!empty(value)}">
@@ -238,11 +239,11 @@
</goal>
- <!-- TODO: change prereqs to scm:find-connection only -->
- <goal name="scm:perform-release"
prereqs="scm:parse-connection,scm:check-deprecated-cvs-vars"
+ <goal name="scm:perform-release"
prereqs="scm:find-connection,scm:check-deprecated-cvs-vars"
description="Perform a release from SCM">
<j:if test="${scmConnection == null}">
<!-- TODO: remove these legacy methods -->
+ <j:set var="scmMethod" value="${maven.scm.method}"/>
<j:if test="${scmMethod == 'cvs'}">
<j:set var="cvsRoot" value="${maven.scm.cvs.root}" />
<j:if test="${!empty(cvsRoot)}">
@@ -276,9 +277,8 @@
<attainGoal name="scm:bootstrap" />
</goal>
- <!-- TODO: change prereqs to scm:find-connection only -->
<goal name="scm:prepare-release"
- prereqs="scm:parse-connection,scm:check-deprecated-cvs-vars"
+ prereqs="scm:find-connection,scm:check-deprecated-cvs-vars"
description="Prepare for a release in SCM">
<ant:echo>Verifying no modifications are present</ant:echo>
@@ -362,7 +362,9 @@
DEPRECATED METHODS
-->
- <goal name="scm:validate" prereqs="scm:parse-connection">
+ <goal name="scm:validate" prereqs="scm:find-connection">
+ <ant:echo>DEPRECATED: scm:validate has been deprecated</ant:echo>
+ <j:set var="scmMethod" value="${maven.scm.method}"/>
<j:choose>
<j:when test="${scmMethod == 'cvs'}">
<j:set var="cvsRoot" value="${maven.scm.cvs.root}"/>
@@ -389,6 +391,7 @@
<goal name="scm:checkout-project"
prereqs="scm:validate">
<ant:echo>DEPRECATED: please use scm:checkout</ant:echo>
+ <j:set var="scmMethod" value="${maven.scm.method}"/>
<j:choose>
<j:when test="${scmMethod == 'cvs'}">
<attainGoal name="scm:cvs-checkout-project"/>
@@ -399,9 +402,8 @@
</j:choose>
</goal>
- <j:set var="scmMethod" value="${maven.scm.method}"/>
-
<goal name="scm:parse-connection" prereqs="scm:find-connection">
+ <ant:echo>DEPRECATED: please use scm:find-connection</ant:echo>
<j:if test="${scmConnection != null}">
<j:set var="delim" value=":"/>
<j:if test="${scmConnection.length() gt 3}">
@@ -523,6 +525,7 @@
<goal name="scm:update-project" prereqs="scm:validate">
<ant:echo>DEPRECATED: please use the scm:update goal
instead</ant:echo>
+ <j:set var="scmMethod" value="${maven.scm.method}"/>
<j:choose>
<j:when test="${scmMethod == 'cvs'}">
<attainGoal name="scm:cvs-update-project"/>
Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?view=diff&rev=469532&r1=469531&r2=469532
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Tue Oct 31 07:43:50
2006
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.6.1-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPSCM-89">SCM Parse
Connection output is wrong / misleading.</action>
<action dev="ltheussl" type="fix"
issue="MPSCM-86">scm:prepare-release does not commit modified changes.xml
.</action>
<action dev="ltheussl" type="update">Update dom4j and jelly
dependencies to match the ones in maven 1.1 core.</action>
<action dev="aheritier" type="update">Update dependencies to unify
them between plugins. The following dependencies are updated :
commons-jelly-tags-interaction v1.0 to v1.1, jaxen v1.0-FCS-full to
1.1-beta-9. Add the dependency to jline for commons-jelly-tags-interaction
v1.1.</action>
