diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2011-07-15 09:53:29 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2011-07-15 09:53:29 +0000 |
| commit | e1c118efaf84826c3492060f79be25a0b9a78661 (patch) | |
| tree | b55a93430d42050cf1c056884eabf142718ff95e | |
| parent | caff22f1ce5ab41b0c62d5b313bd50fed7548886 (diff) | |
| download | scala-e1c118efaf84826c3492060f79be25a0b9a78661.tar.gz scala-e1c118efaf84826c3492060f79be25a0b9a78661.tar.bz2 scala-e1c118efaf84826c3492060f79be25a0b9a78661.zip | |
Merged revisions 24385 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24385 | Joshua.Suereth | 2011-03-05 17:26:51 +0100 (Sat, 05 Mar 2011) | 1 line
Upgraded to latest maven-ant-tasks jar
........
| -rw-r--r-- | lib/ant/maven-ant-tasks-2.0.9.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 2 | ||||
| -rw-r--r-- | src/build/pack.xml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/ant/maven-ant-tasks-2.0.9.jar.desired.sha1 b/lib/ant/maven-ant-tasks-2.0.9.jar.desired.sha1 deleted file mode 100644 index 9274ad0519..0000000000 --- a/lib/ant/maven-ant-tasks-2.0.9.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -b539e357a1413e53ae429e4607310db7851257d3 ?maven-ant-tasks-2.0.9.jar diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index b1d75f171d..2d6cffe71f 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -28,7 +28,7 @@ <target name="init.maven" depends="init.properties"> <!-- Add our maven ant tasks --> - <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.9.jar" /> + <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" /> <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> <!-- simplify fixing pom versions --> <macrodef name="make-pom"> diff --git a/src/build/pack.xml b/src/build/pack.xml index d75e36c337..6e7c5b03ee 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -242,7 +242,7 @@ MAIN DISTRIBUTION SBAZ <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win"> <copy todir="${dists.dir}/maven/${version.number}" - file="${lib-ant.dir}/maven-ant-tasks-2.0.9.jar"/> + file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar"/> <copy tofile="${dists.dir}/maven/${version.number}/build.xml" file="${src.dir}/build/maven/maven-deploy.xml"/> <!-- export properties for use when deploying --> |