changeset 11048:e1d1bb48b99a

8209652: Ensemble: Update version of Lucene to 7.4.0 Reviewed-by: prr
author kcr
date Wed, 29 Aug 2018 08:07:36 -0700
parents f32d1b47193f
children 30c0d3317713 0ff77c365fe9
files apps/samples/.classpath apps/samples/Ensemble8/build.gradle apps/samples/Ensemble8/build.xml apps/samples/Ensemble8/legal/lucene.md apps/samples/Ensemble8/nbproject/project.properties build.gradle
diffstat 6 files changed, 27 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/apps/samples/.classpath	Wed Aug 29 05:20:33 2018 -0700
+++ b/apps/samples/.classpath	Wed Aug 29 08:07:36 2018 -0700
@@ -12,9 +12,9 @@
     <classpathentry kind="src" path="Ensemble8/src/compiletime/java"/>
     <classpathentry kind="src" path="Ensemble8/src/generated/java"/>
     <classpathentry kind="src" path="Ensemble8/src/generated/resources"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-core-7.1.0.jar"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-grouping-7.1.0.jar"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-queryparser-7.1.0.jar"/>
+    <classpathentry kind="lib" path="Ensemble8/lib/lucene-core-7.4.0.jar"/>
+    <classpathentry kind="lib" path="Ensemble8/lib/lucene-grouping-7.4.0.jar"/>
+    <classpathentry kind="lib" path="Ensemble8/lib/lucene-queryparser-7.4.0.jar"/>
     <classpathentry kind="src" path="MandelbrotSet/src"/>
     <classpathentry kind="src" path="Modena/src/main/java"/>
     <classpathentry kind="src" path="Modena/src/main/resources"/>
--- a/apps/samples/Ensemble8/build.gradle	Wed Aug 29 05:20:33 2018 -0700
+++ b/apps/samples/Ensemble8/build.gradle	Wed Aug 29 08:07:36 2018 -0700
@@ -4,9 +4,9 @@
 def mainClassName = "ensemble.EnsembleApp"
 
 def FileCollection apachecp = files(
-   "./lib/lucene-core-7.1.0.jar",
-   "./lib/lucene-grouping-7.1.0.jar",
-   "./lib/lucene-queryparser-7.1.0.jar")
+   "./lib/lucene-core-7.4.0.jar",
+   "./lib/lucene-grouping-7.4.0.jar",
+   "./lib/lucene-queryparser-7.4.0.jar")
 
 sourceSets {
     main {
--- a/apps/samples/Ensemble8/build.xml	Wed Aug 29 05:20:33 2018 -0700
+++ b/apps/samples/Ensemble8/build.xml	Wed Aug 29 08:07:36 2018 -0700
@@ -128,30 +128,30 @@
         <zip destfile="${dist.jar}" update="true">
             <!-- Rename license and notice file -->
             <mappedresources>
-                <zipfileset src="${file.reference.lucene-core-7.1.0.jar}">
+                <zipfileset src="${file.reference.lucene-core.jar}">
                     <include name="META-INF/LICENSE.txt"/>
                 </zipfileset>
                 <globmapper from="*/LICENSE.txt" to="*/LUCENE_LICENSE.TXT" />
             </mappedresources>
             <mappedresources>
-                <zipfileset src="${file.reference.lucene-core-7.1.0.jar}">
+                <zipfileset src="${file.reference.lucene-core.jar}">
                     <include name="META-INF/NOTICE.txt"/>
                 </zipfileset>
                 <globmapper from="*/NOTICE.txt" to="*/LUCENE_NOTICE.TXT" />
             </mappedresources>
 
             <!-- Include the core SPI services -->
-            <zipfileset src="${file.reference.lucene-core-7.1.0.jar}">
+            <zipfileset src="${file.reference.lucene-core.jar}">
                 <include name="META-INF/services/**"/>
             </zipfileset>
 
-            <zipfileset src="${file.reference.lucene-core-7.1.0.jar}">
+            <zipfileset src="${file.reference.lucene-core.jar}">
                 <exclude name="META-INF/**"/>
             </zipfileset>
-            <zipfileset src="${file.reference.lucene-grouping-7.1.0.jar}">
+            <zipfileset src="${file.reference.lucene-grouping.jar}">
                 <exclude name="META-INF/**"/>
             </zipfileset>
-            <zipfileset src="${file.reference.lucene-queryparser-7.1.0.jar}">
+            <zipfileset src="${file.reference.lucene-queryparser.jar}">
                 <exclude name="META-INF/**"/>
             </zipfileset>
         </zip>
--- a/apps/samples/Ensemble8/legal/lucene.md	Wed Aug 29 05:20:33 2018 -0700
+++ b/apps/samples/Ensemble8/legal/lucene.md	Wed Aug 29 08:07:36 2018 -0700
@@ -1,4 +1,4 @@
-## Apache Lucene v7.1.0
+## Apache Lucene v7.4.0
 
 ### Apache 2.0 License
 <pre>
--- a/apps/samples/Ensemble8/nbproject/project.properties	Wed Aug 29 05:20:33 2018 -0700
+++ b/apps/samples/Ensemble8/nbproject/project.properties	Wed Aug 29 08:07:36 2018 -0700
@@ -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} 
--- a/build.gradle	Wed Aug 29 05:20:33 2018 -0700
+++ b/build.gradle	Wed Aug 29 08:07:36 2018 -0700
@@ -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) {