You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/30 04:34:38 UTC
svn commit: r226466 - in /maven/maven-1/plugins/trunk/jdiff: plugin.jelly
xdocs/changes.xml
Author: brett
Date: Fri Jul 29 19:34:25 2005
New Revision: 226466
URL: http://svn.apache.org/viewcvs?rev=226466&view=rev
Log:
PR: MPJDIFF-6
Submitted by: Phil Steitz
Reviewed by: Brett Porter
Support other SCMs through the SCM plugin (v1.5 required)
Applied with modifications to verify the correct SCM plugin is installed
Modified:
maven/maven-1/plugins/trunk/jdiff/plugin.jelly
maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jdiff/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/plugin.jelly?rev=226466&r1=226465&r2=226466&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jdiff/plugin.jelly Fri Jul 29 19:34:25 2005
@@ -22,8 +22,22 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:doc="doc"
+ xmlns:scm="scm"
xmlns:ant="jelly:ant">
+ <j:if test="${bootstrapping == null}">
+ <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
+ <maven:get plugin="maven-scm-plugin" property="plugin" var="scmPlugin" />
+ <j:if test="${scmPlugin.currentVersion.compareTo('1.5') lt 0}">
+ <ant:fail>
+ Must have SCM plugin v1.5 installed to use this version of the jdiff plugin.
+ Try: maven plugin:download -DgroupId=maven -DartifactId=maven-scm-plugin -Dversion=1.5
+ You can find the latest version of the SCM plugin on the Maven Download page at
+ http://maven.apache.org/start/download.html
+ </ant:fail>
+ </j:if>
+ </j:if>
+
<goal name="maven-jdiff-plugin:register">
<j:if test="${context.getVariable('maven.mode.online') == null}">
<j:set var="maven.mode.online" value="true" />
@@ -71,6 +85,9 @@
<ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
</ant:condition>
+ <j:set var="scmConnection" value="${pom.repository.connection}"/>
+ <j:set var="scmMethod" value="${scmConnection.substring(4,7)}"/>
+
<maven:makeRelativePath var="relativeSrcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
<j:choose>
@@ -80,17 +97,18 @@
<j:otherwise>
<ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>
- <ant:mkdir dir="${maven.jdiff.new.dir}"/>
-
- <ant:cvs
- cvsRoot="${pom.repository.cvsRoot}"
- package="${pom.repository.cvsModule}"
- dest="${maven.jdiff.new.dir}"
- tag="${maven.jdiff.new.tag}"
- />
+ <ant:mkdir dir="${maven.jdiff.new.dir}"/>
+ <scm:checkout
+ var="checkoutBean"
+ url="${scmConnection}"
+ tag="${maven.jdiff.new.tag}"
+ tagBase="${maven.scm.svn.tagBase}"
+ workingDirectory="${maven.jdiff.new.dir}"
+ username="${maven.scm.username}"
+ password="${maven.scm.password}"
+ />
<ant:property name="maven.jdiff.new.src"
- value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
-
+ value="${maven.jdiff.new.dir}/${relativeSrcDir}"/>
</j:otherwise>
</j:choose>
@@ -103,17 +121,18 @@
<j:otherwise>
<ant:property name="maven.jdiff.old.dir"
value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>
- <ant:mkdir dir="${maven.jdiff.old.dir}"/>
-
- <ant:cvs
- cvsRoot="${pom.repository.cvsRoot}"
- package="${pom.repository.cvsModule}"
- dest="${maven.jdiff.old.dir}"
- tag="${maven.jdiff.old.tag}"
- />
-
+ <ant:mkdir dir="${maven.jdiff.old.dir}"/>
+ <scm:checkout
+ var="checkoutBean"
+ url="${scmConnection}"
+ tag="${maven.jdiff.old.tag}"
+ tagBase="${maven.scm.svn.tagBase}"
+ workingDirectory="${maven.jdiff.old.dir}"
+ username="${maven.scm.username}"
+ password="${maven.scm.password}"
+ />
<ant:property name="maven.jdiff.old.src"
- value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
+ value="${maven.jdiff.old.dir}/${relativeSrcDir}"/>
</j:otherwise>
</j:choose>
Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml?rev=226466&r1=226465&r2=226466&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml Fri Jul 29 19:34:25 2005
@@ -25,7 +25,8 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.4.1" date="in CVS">
+ <release version="1.4.1-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update" due-to="Phil Steitz" issue="MPJDIFF-6">Utilise SCM plugin to support multiple SCMs (tested with CVS and Subversion)</action>
<action dev="dion" type="add">Add basic homepage.</action>
</release>
<release version="1.4" date="2004-06-18">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org