From a9037c296f1bf5b87513bcbb425f83284b2bdf45 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sat, 31 Oct 2015 00:48:03 -0700 Subject: [PATCH] Fix lucene snapshot setup to automatically use lucene version ES uses Original commit: elastic/x-pack-elasticsearch@cb42014e1c7665036400f7c7a69b99c6868fbc2f --- build.gradle | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 8e8c663db19..f99ef39efb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.elasticsearch.gradle.ElasticsearchProperties + buildscript { repositories { mavenCentral() @@ -21,19 +23,20 @@ allprojects { subprojects { project.group = 'org.elasticsearch' - project.version = '3.0.0-SNAPSHOT' - project.ext { - luceneSnapshotRevision = '1710880' - } + project.version = ElasticsearchProperties.version + project.ext.luceneVersion = ElasticsearchProperties.luceneVersion repositories { mavenCentral() maven { name 'sonatype-snapshots' url 'http://oss.sonatype.org/content/repositories/snapshots/' } - maven { - name 'lucene-snapshots' - url "http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/${luceneSnapshotRevision}" + if (luceneVersion.contains('-snapshot')) { + String revision = (luceneVersion =~ /\d\.\d\.\d-snapshot-(\d+)/)[0][1] + maven { + name 'lucene-snapshots' + url "http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/${revision}" + } } }