ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r960992 - in /ant/ivy/core/trunk: ./ build-release.xml src/example/build-a-ivy-repository/build.xml src/example/multi-project/build.xml
Date Tue, 06 Jul 2010 19:39:28 GMT
Author: maartenc
Date: Tue Jul  6 19:39:28 2010
New Revision: 960992

URL: http://svn.apache.org/viewvc?rev=960992&view=rev
Log:
Merged changes made in 2.2.x branch back to trunk.

Modified:
    ant/ivy/core/trunk/   (props changed)
    ant/ivy/core/trunk/build-release.xml
    ant/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml
    ant/ivy/core/trunk/src/example/multi-project/build.xml

Propchange: ant/ivy/core/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  6 19:39:28 2010
@@ -1,4 +1,5 @@
 /ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
 /ant/ivy/core/branches/2.0.0-rc2:707459-708717
 /ant/ivy/core/branches/2.0.x:696803-698317
+/ant/ivy/core/branches/2.2.x:958424-958757
 /ant/ivy/core/trunk:695737,696014-696031,696442

Modified: ant/ivy/core/trunk/build-release.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=960992&r1=960991&r2=960992&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Tue Jul  6 19:39:28 2010
@@ -445,6 +445,7 @@
 	    <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report.dir}/rat-report.txt">
 	      <fileset dir="${basedir}">
 	      	<exclude name=".classpath" />
+	      	<exclude name=".ivy2/**/*" />
 	        <exclude name="build/**/*" />
 	      	<exclude name="**/*.sha1" />
             <exclude name="**/*.md5" />
@@ -472,6 +473,6 @@
 	<target name="snapshot" 
 			depends="prepare-snapshot, snapshot-src, snapshot-bin, snapshot-maven2, snapshot-checksums"

 			description="used for nightly and integration builds"/>
-	<target name="release" depends="release-version, rat, snapshot" description="make a new
release of Ivy"/>
+	<target name="release" depends="release-version, /localivy, clean-ivy-home, clean, clean-lib,
rat, snapshot" description="make a new release of Ivy"/>
 
 </project>

Modified: ant/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml?rev=960992&r1=960991&r2=960992&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml (original)
+++ ant/ivy/core/trunk/src/example/build-a-ivy-repository/build.xml Tue Jul  6 19:39:28 2010
@@ -43,7 +43,7 @@
     	      We will not fail as long as ivy home lib dir exists (it may be empty) and
     	      ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
     	<path id="ivy.lib.path">
-    	    <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+    		<pathelement location="${ivy.jar.file}"/>
     	</path>
     	<taskdef resource="org/apache/ivy/ant/antlib.xml"
     	          uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>

Modified: ant/ivy/core/trunk/src/example/multi-project/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/multi-project/build.xml?rev=960992&r1=960991&r2=960992&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/example/multi-project/build.xml (original)
+++ ant/ivy/core/trunk/src/example/multi-project/build.xml Tue Jul  6 19:39:28 2010
@@ -38,7 +38,7 @@
     	      We will not fail as long as ivy home lib dir exists (it may be empty) and
     	      ivy is in at least one of ant's lib dir or the ivy home lib dir. -->
     	<path id="ivy.lib.path">
-    	    <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+    		<pathelement location="${ivy.jar.file}"/>
     	</path>
     	<taskdef resource="org/apache/ivy/ant/antlib.xml"
     	          uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>



Mime
View raw message