Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPSCM-89

Browse Source 
SCM Parse Connection output is wrong / misleading.
Removed the use of scm:parse-connection (deprecated).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@469532 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-10-31 15:43:50 +00:00
parent 59b8fe3033
commit 9870ab3650
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scm/plugin.jelly
View File

@ -110,6 +110,7 @@
</j:if> </j:if>
<j:if test="${scmConnection == null}"> <j:if test="${scmConnection == null}">
<j:set var="scmMethod" value="${maven.scm.method}"/>
<j:if test="${scmMethod == 'cvs'}"> <j:if test="${scmMethod == 'cvs'}">
<j:set var="value" value="${maven.scm.cvs.root}" /> <j:set var="value" value="${maven.scm.cvs.root}" />
<j:if test="${!empty(value)}"> <j:if test="${!empty(value)}">
@ -238,11 +239,11 @@
</goal> </goal>
<!-- TODO: change prereqs to scm:find-connection only --> <goal name="scm:perform-release" prereqs="scm:find-connection,scm:check-deprecated-cvs-vars"
<goal name="scm:perform-release" prereqs="scm:parse-connection,scm:check-deprecated-cvs-vars"
description="Perform a release from SCM"> description="Perform a release from SCM">
<j:if test="${scmConnection == null}"> <j:if test="${scmConnection == null}">
<!-- TODO: remove these legacy methods --> <!-- TODO: remove these legacy methods -->
<j:set var="scmMethod" value="${maven.scm.method}"/>
<j:if test="${scmMethod == 'cvs'}"> <j:if test="${scmMethod == 'cvs'}">
<j:set var="cvsRoot" value="${maven.scm.cvs.root}" /> <j:set var="cvsRoot" value="${maven.scm.cvs.root}" />
<j:if test="${!empty(cvsRoot)}"> <j:if test="${!empty(cvsRoot)}">
@ -276,9 +277,8 @@
<attainGoal name="scm:bootstrap" /> <attainGoal name="scm:bootstrap" />
</goal> </goal>
<!-- TODO: change prereqs to scm:find-connection only -->
<goal name="scm:prepare-release" <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"> description="Prepare for a release in SCM">
<ant:echo>Verifying no modifications are present</ant:echo> <ant:echo>Verifying no modifications are present</ant:echo>
@ -362,7 +362,9 @@
DEPRECATED METHODS 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:choose>
<j:when test="${scmMethod == 'cvs'}"> <j:when test="${scmMethod == 'cvs'}">
<j:set var="cvsRoot" value="${maven.scm.cvs.root}"/> <j:set var="cvsRoot" value="${maven.scm.cvs.root}"/>
@ -389,6 +391,7 @@
<goal name="scm:checkout-project" <goal name="scm:checkout-project"
prereqs="scm:validate"> prereqs="scm:validate">
<ant:echo>DEPRECATED: please use scm:checkout</ant:echo> <ant:echo>DEPRECATED: please use scm:checkout</ant:echo>
<j:set var="scmMethod" value="${maven.scm.method}"/>
<j:choose> <j:choose>
<j:when test="${scmMethod == 'cvs'}"> <j:when test="${scmMethod == 'cvs'}">
<attainGoal name="scm:cvs-checkout-project"/> <attainGoal name="scm:cvs-checkout-project"/>
@ -399,9 +402,8 @@
</j:choose> </j:choose>
</goal> </goal>
<j:set var="scmMethod" value="${maven.scm.method}"/>
<goal name="scm:parse-connection" prereqs="scm:find-connection"> <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:if test="${scmConnection != null}">
<j:set var="delim" value=":"/> <j:set var="delim" value=":"/>
<j:if test="${scmConnection.length() gt 3}"> <j:if test="${scmConnection.length() gt 3}">
@ -523,6 +525,7 @@
<goal name="scm:update-project" prereqs="scm:validate"> <goal name="scm:update-project" prereqs="scm:validate">
<ant:echo>DEPRECATED: please use the scm:update goal instead</ant:echo> <ant:echo>DEPRECATED: please use the scm:update goal instead</ant:echo>
<j:set var="scmMethod" value="${maven.scm.method}"/>
<j:choose> <j:choose>
<j:when test="${scmMethod == 'cvs'}"> <j:when test="${scmMethod == 'cvs'}">
<attainGoal name="scm:cvs-update-project"/> <attainGoal name="scm:cvs-update-project"/>

1
scm/xdocs/changes.xml
View File

@ -24,6 +24,7 @@
</properties> </properties>
<body> <body>
<release version="1.6.1-SNAPSHOT" date="In SVN"> <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="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="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> <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>