Switch stable branch back to HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
8fb31f914f
commit
b623fe0dda
166 files changed
+2110
-827
No files matched your search
+10
-6
@@ -2,6 +2,7 @@
|
||||
|
||||
<project
|
||||
xmlns:j="jelly:core"
|
||||
xmlns:maven="jelly:maven"
|
||||
xmlns:ant="jelly:ant">
|
||||
|
||||
<!-- ================================================================== -->
|
||||
@@ -30,24 +31,26 @@
|
||||
<ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
|
||||
</ant:condition>
|
||||
|
||||
<maven:make-relative-path var="relativeSrcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
|
||||
<j:choose>
|
||||
|
||||
<j:when test="${maven.jdiff.new.current}">
|
||||
<ant:property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
|
||||
<ant:property name="maven.jdiff.new.src" value="${relativeSrcDir}"/>
|
||||
</j:when>
|
||||
|
||||
<j:otherwise>
|
||||
<ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>
|
||||
<ant:mkdir dir="${maven.jdiff.new.dir}"/>
|
||||
|
||||
<maven:make-relative-path var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
|
||||
<ant:cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
|
||||
dest="${maven.jdiff.new.dir}"
|
||||
tag="${maven.jdiff.new.tag}"
|
||||
/>
|
||||
<ant:property name="maven.jdiff.new.src"
|
||||
value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
|
||||
value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
|
||||
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
@@ -55,7 +58,7 @@
|
||||
<j:choose>
|
||||
|
||||
<j:when test="${maven.jdiff.old.current}">
|
||||
<ant:property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
|
||||
<ant:property name="maven.jdiff.old.src" value="${relativeSrcDir}"/>
|
||||
</j:when>
|
||||
|
||||
<j:otherwise>
|
||||
@@ -63,15 +66,16 @@
|
||||
value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>
|
||||
<ant:mkdir dir="${maven.jdiff.old.dir}"/>
|
||||
|
||||
<maven:make-relative-path var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
|
||||
<ant:cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
|
||||
dest="${maven.jdiff.old.dir}"
|
||||
tag="${maven.jdiff.old.tag}"
|
||||
/>
|
||||
|
||||
<ant:property name="maven.jdiff.old.src"
|
||||
value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
|
||||
value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
|
||||
|
||||
Reference in new issue
Block a user