# HG changeset patch
# User kcr
# Date 1535488644 25200
# Tue Aug 28 13:37:24 2018 -0700
# Node ID 411bd91f4a0f1ef59bc4492d4869ff5efb830977
# Parent ca32fdb7f066453f17c39cf827064453bf45030e
8209652: Ensemble: Update version of Lucene to 7.4.0
Reviewed-by:
diff --git a/apps/samples/.classpath b/apps/samples/.classpath
--- a/apps/samples/.classpath
+++ b/apps/samples/.classpath
@@ -12,9 +12,9 @@
diff --git a/apps/samples/Ensemble8/nbproject/project.properties b/apps/samples/Ensemble8/nbproject/project.properties --- a/apps/samples/Ensemble8/nbproject/project.properties +++ b/apps/samples/Ensemble8/nbproject/project.properties @@ -31,17 +31,18 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.lucene-core-7.1.0.jar=lib/lucene-core-7.1.0.jar -file.reference.lucene-grouping-7.1.0.jar=lib/lucene-grouping-7.1.0.jar -file.reference.lucene-queryparser-7.1.0.jar=lib/lucene-queryparser-7.1.0.jar +lucene.version=7.4.0 +file.reference.lucene-core.jar=lib/lucene-core-${lucene.version}.jar +file.reference.lucene-grouping.jar=lib/lucene-grouping-${lucene.version}.jar +file.reference.lucene-queryparser.jar=lib/lucene-queryparser-${lucene.version}.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=true jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.lucene-core-7.1.0.jar}:\ - ${file.reference.lucene-grouping-7.1.0.jar}:\ - ${file.reference.lucene-queryparser-7.1.0.jar} + ${file.reference.lucene-core.jar}:\ + ${file.reference.lucene-grouping.jar}:\ + ${file.reference.lucene-queryparser.jar} # Space-separated list of extra javac options compile.patch=@../../../build/compile.args javac.compilerargs=${compile.patch} diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -3947,18 +3947,19 @@ // The apps build is Ant based, we will exec ant from gradle. // Download the Lucene libraries needed for the Ensemble8 app + def luceneVersion = "7.4.0" getConfigurations().create("lucene"); dependencies { - lucene group: "org.apache.lucene", name: "lucene-core", version: "7.1.0" - lucene group: "org.apache.lucene", name: "lucene-grouping", version: "7.1.0" - lucene group: "org.apache.lucene", name: "lucene-queryparser", version: "7.1.0" + lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion + lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion + lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion } // Copy Lucene libraries into the Ensemble8/lib directory File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib"); - def libNames = [ "lucene-core-7.1.0.jar", - "lucene-grouping-7.1.0.jar", - "lucene-queryparser-7.1.0.jar" ] + def libNames = [ "lucene-core-${luceneVersion}.jar", + "lucene-grouping-${luceneVersion}.jar", + "lucene-queryparser-${luceneVersion}.jar" ] task getLucene(type: Copy) {