You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/08/22 00:12:22 UTC
svn commit: r1697060 - in /lucene/dev/trunk/lucene: build.xml
common-build.xml ivy-settings.xml tools/custom-tasks.xml
tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
Author: markrmiller
Date: Fri Aug 21 22:12:22 2015
New Revision: 1697060
URL: http://svn.apache.org/r1697060
Log:
LUCENE-6743: Allow Ivy lockStrategy to be overridden by system property.
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/ivy-settings.xml
lucene/dev/trunk/lucene/tools/custom-tasks.xml
lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1697060&r1=1697059&r2=1697060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Aug 21 22:12:22 2015
@@ -98,6 +98,7 @@
centralized.versions.file="${common.dir}/ivy-versions.properties"
ivy.settings.file="${common.dir}/ivy-settings.xml"
ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
+ ivy.lock-strategy="${ivy.lock-strategy}"
common.build.dir="${common.build.dir}"
ignore.conflicts.file="${common.dir}/ivy-ignore-conflicts.properties"/>
</target>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1697060&r1=1697059&r2=1697060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Aug 21 22:12:22 2015
@@ -85,6 +85,7 @@
<!-- Running ant targets in parralel may require this set to false because ivy:retrieve tasks may race with resolve -->
<property name="ivy.sync" value="true"/>
<property name="ivy.resolution-cache.dir" location="${common.build.dir}/ivy-resolution-cache"/>
+ <property name="ivy.lock-strategy" value="artifact-lock"/>
<property name="junit.jar" value="junit-4.10.jar"/>
<property name="junit-location.jar" location="${common.dir}/test-framework/lib/${junit.jar}"/>
Modified: lucene/dev/trunk/lucene/ivy-settings.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-settings.xml?rev=1697060&r1=1697059&r2=1697060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-settings.xml (original)
+++ lucene/dev/trunk/lucene/ivy-settings.xml Fri Aug 21 22:12:22 2015
@@ -28,7 +28,7 @@
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
- <caches lockStrategy="artifact-lock" resolutionCacheDir="${ivy.resolution-cache.dir}" />
+ <caches lockStrategy="${ivy.lock-strategy}" resolutionCacheDir="${ivy.resolution-cache.dir}" />
<resolvers>
<ibiblio name="sonatype-releases" root="https://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
Modified: lucene/dev/trunk/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/custom-tasks.xml?rev=1697060&r1=1697059&r2=1697060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/trunk/lucene/tools/custom-tasks.xml Fri Aug 21 22:12:22 2015
@@ -90,6 +90,7 @@
<attribute name="centralized.versions.file"/>
<attribute name="ivy.settings.file"/>
<attribute name="ivy.resolution-cache.dir"/>
+ <attribute name="ivy.lock-strategy"/>
<attribute name="common.build.dir"/>
<attribute name="ignore.conflicts.file"/>
<sequential>
@@ -102,6 +103,7 @@
<libversions centralizedVersionsFile="@{centralized.versions.file}"
ivySettingsFile="@{ivy.settings.file}"
ivyResolutionCacheDir="@{ivy.resolution-cache.dir}"
+ ivyLockStrategy="@{ivy.lock-strategy}"
commonBuildDir="@{common.build.dir}"
ignoreConflictsFile="@{ignore.conflicts.file}">
<fileset dir="@{dir}">
Modified: lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java?rev=1697060&r1=1697059&r2=1697060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java (original)
+++ lucene/dev/trunk/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java Fri Aug 21 22:12:22 2015
@@ -127,6 +127,11 @@ public class LibVersionsCheckTask extend
private File ivyResolutionCacheDir;
/**
+ * Artifact lock strategy that Ivy should use.
+ */
+ private String ivyLockStrategy;
+
+ /**
* A logging level associated with verbose logging.
*/
private int verboseLevel = Project.MSG_VERBOSE;
@@ -183,6 +188,10 @@ public class LibVersionsCheckTask extend
public void setIvyResolutionCacheDir(File dir) {
ivyResolutionCacheDir = dir;
}
+
+ public void setIvyLockStrategy(String strategy) {
+ this.ivyLockStrategy = strategy;
+ }
public void setCommonBuildDir(File file) {
commonBuildDir = file;
@@ -683,6 +692,7 @@ public class LibVersionsCheckTask extend
ivySettings.setVariable("common.build.dir", commonBuildDir.getAbsolutePath());
ivySettings.setVariable("ivy.exclude.types", "source|javadoc");
ivySettings.setVariable("ivy.resolution-cache.dir", ivyResolutionCacheDir.getAbsolutePath());
+ ivySettings.setVariable("ivy.lock-strategy", ivyLockStrategy);
ivySettings.setBaseDir(commonBuildDir);
ivySettings.setDefaultConflictManager(new NoConflictManager());
ivy = Ivy.newInstance(ivySettings);