Update some ANT plugins:

- make SVN version configurable: As svnkit 1.8 does not support svn 1.7 WCs and vice versa, if you use an 1.8 WC, you have to manually pass -Dsvnkit.version=1.8.0 (unless I find a better solution...)
- Update Groovy
- Update Pegdown
- LUCENE-5243: Update Clover to released version 3.2.0 (no more snapshot)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547661 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2013-12-04 00:54:08 +00:00
parent 7bf6ee0a92
commit de81d96cc0
3 changed files with 10 additions and 8 deletions

View File

@ -91,11 +91,13 @@
<target name="-check-after-regeneration" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
<svn-checker failonmodifications="true"/>
</target>
<property name="svnkit.version" value="1.7.8"/>
<macrodef xmlns:ivy="antlib:org.apache.ivy.ant" name="svn-checker">
<attribute name="failonmodifications" default="true"/> <!-- false if file modifications are allowed -->
<sequential>
<ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.8"
<ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="${svnkit.version}"
inline="true" conf="default" transitive="true" pathid="svnkit.classpath"/>
<local name="svn.checkprops.failed"/>
<local name="svn.unversioned.failed"/>

View File

@ -1363,7 +1363,7 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites
]]></fail>
<echo>Code coverage with Atlassian Clover enabled.</echo>
<ivy:cachepath organisation="com.cenqua.clover" module="clover" revision="3.2.0-SNAPSHOT"
<ivy:cachepath organisation="com.cenqua.clover" module="clover" revision="3.2.0"
inline="true" conf="master" pathid="clover.classpath"/>
<taskdef resource="cloverlib.xml" classpathref="clover.classpath" />
<mkdir dir="${clover.db.dir}"/>
@ -2200,7 +2200,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<!-- GROOVY scripting engine for ANT tasks -->
<target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
<ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.1.5"
<ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.2.1"
inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
<taskdef name="groovy"
classname="org.codehaus.groovy.ant.Groovy"
@ -2258,7 +2258,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<!-- PEGDOWN macro: Before using depend on the target "resolve-pegdown,resolve-groovy" -->
<target name="resolve-pegdown" unless="pegdown.loaded" depends="ivy-availability-check,ivy-configure">
<ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.4.0"
<ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.4.1"
inline="true" conf="default" transitive="true" pathid="pegdown.classpath"/>
<property name="pegdown.loaded" value="true"/>
</target>

View File

@ -35,13 +35,13 @@
<ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" />
<ibiblio name="cloudera" root="https://repository.cloudera.com/artifactory/repo" m2compatible="true" />
<ibiblio name="releases.cloudera.com" root="https://repository.cloudera.com/content/repositories/releases" m2compatible="true" />
<!-- needed only for newer svnkit releases, e.g. 1.8.x -->
<ibiblio name="svnkit-releases" root="http://maven.tmatesoft.com/content/repositories/releases" m2compatible="true" />
<!-- you might need to tweak this from china so it works -->
<ibiblio name="working-chinese-mirror" root="http://uk.maven.org/maven2" m2compatible="true" />
<!-- temporary to try Clover 3.2.0 snapshots, see https://issues.apache.org/jira/browse/LUCENE-5243, https://jira.atlassian.com/browse/CLOV-1368 -->
<ibiblio name="atlassian-clover-snapshots" root="https://maven.atlassian.com/content/repositories/atlassian-public-snapshot" m2compatible="true" />
<!--
<filesystem name="local-maven-2" m2compatible="true" local="true">
<artifact
@ -59,7 +59,7 @@
<resolver ref="releases.cloudera.com"/>
<resolver ref="sonatype-releases" />
<resolver ref="maven.restlet.org" />
<resolver ref="atlassian-clover-snapshots" />
<resolver ref="svnkit-releases" />
<resolver ref="working-chinese-mirror" />
</chain>
</resolvers>