You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/12/04 01:57:40 UTC
svn commit: r1547663 - in /lucene/dev/branches/branch_4x: ./
extra-targets.xml lucene/ lucene/common-build.xml lucene/ivy-settings.xml
Author: uschindler
Date: Wed Dec 4 00:57:39 2013
New Revision: 1547663
URL: http://svn.apache.org/r1547663
Log:
Merged revision(s) 1547661 from lucene/dev/trunk:
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)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/extra-targets.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/extra-targets.xml?rev=1547663&r1=1547662&r2=1547663&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/extra-targets.xml (original)
+++ lucene/dev/branches/branch_4x/extra-targets.xml Wed Dec 4 00:57:39 2013
@@ -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"/>
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1547663&r1=1547662&r2=1547663&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Wed Dec 4 00:57:39 2013
@@ -1366,7 +1366,7 @@ ${tests-output}/junit4-*.suites - pe
]]></fail>
<echo>Code coverage with Atlassian Clover enabled.</echo>
- <ivy:cachepath organisation="com.cenqua.clover" module="clover" revision="3.1.12.1"
+ <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}"/>
@@ -2202,7 +2202,7 @@ ${ant.project.name}.test.dependencies=${
<!-- 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"
@@ -2260,7 +2260,7 @@ ${ant.project.name}.test.dependencies=${
<!-- 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>
Modified: lucene/dev/branches/branch_4x/lucene/ivy-settings.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-settings.xml?rev=1547663&r1=1547662&r2=1547663&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-settings.xml Wed Dec 4 00:57:39 2013
@@ -33,6 +33,9 @@
<resolvers>
<ibiblio name="sonatype-releases" root="http://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
<ibiblio name="maven.restlet.org" root="http://maven.restlet.org" 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" />
@@ -52,6 +55,7 @@
<resolver ref="main"/>
<resolver ref="sonatype-releases" />
<resolver ref="maven.restlet.org" />
+ <resolver ref="svnkit-releases" />
<resolver ref="working-chinese-mirror" />
</chain>
</resolvers>