Accommodate lucene 10.x

- Use searcher.storedFields().document(docId) instead of deprecated searcher.doc(docID). - Use Java 21. eclipse-platform/eclipse.platform.releng.aggregator#2654
merks · Dec 16, 2024 · 6cfea9d · 6cfea9d
1 parent 554fc88
commit 6cfea9d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
 
   tools {
     maven 'apache-maven-latest'
-    jdk 'temurin-jdk17-latest'
+    jdk 'temurin-jdk21-latest'
   }
 
   environment {

diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.results.feature"
       label="%featureName"
-      version="1.15.1.qualifier"
+      version="1.16.0.qualifier"
       provider-name="%providerName">
 
    <description>

diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.results.feature</artifactId>
-  <version>1.15.1-SNAPSHOT</version>
+  <version>1.16.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.result; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.result.ResultsViewPlugin
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.apache.lucene.analysis-common;bundle-version="[9.5.0,10.0.0)",
- org.apache.lucene.analysis-smartcn;bundle-version="[9.5.0,10.0.0)",
- org.apache.lucene.core;bundle-version="[9.5.0,10.0.0)",
- org.apache.lucene.queryparser;bundle-version="[9.5.0,10.0.0)",
+ org.apache.lucene.analysis-common;bundle-version="[9.5.0,11.0.0)",
+ org.apache.lucene.analysis-smartcn;bundle-version="[9.5.0,11.0.0)",
+ org.apache.lucene.core;bundle-version="[9.5.0,11.0.0)",
+ org.apache.lucene.queryparser;bundle-version="[9.5.0,11.0.0)",
  org.eclipse.datatools.connectivity
 Import-Package: com.ibm.icu.text,
  com.ibm.icu.util

diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.result</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/...lt/src/org/eclipse/datatools/sqltools/result/internal/index/ResultHistoryLuceneIndex.java b/...lt/src/org/eclipse/datatools/sqltools/result/internal/index/ResultHistoryLuceneIndex.java
@@ -227,7 +227,7 @@ public IResultInstance[] search(String expression)
                 for(int i=0;i<count;i++)
                 {
 		            int docID = hits.scoreDocs[i].doc;
-                    Document doc = searcher.doc(docID);
+                    Document doc = searcher.storedFields().document(docID);
                     instances[i] = (IResultInstance)_id2result.get(doc.getField(FIELD_IDENTIFIER).stringValue());
                 }
                 reader.close();

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <properties>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-datatools/datatools.git</tycho.scmUrl>
-    <tycho-version>4.0.8</tycho-version>
+    <tycho-version>4.0.10</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
 
     <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>
@@ -24,7 +24,7 @@
 
     <!-- baseline check URLs: skip with -DskipBaselineComparison=true and/or -Dtycho.baseline=disable -->
     <skipBaselineComparison>false</skipBaselineComparison>
-    <lastStableRepository>https://download.eclipse.org/datatools/updates/1.14.300-SNAPSHOT/repository</lastStableRepository>
+    <lastStableRepository>https://download.eclipse.org/datatools/updates/release/1.16.2</lastStableRepository>
 
     <eclipse.repo>https://download.eclipse.org/releases/latest</eclipse.repo>
     <justj.tools.repo>https://download.eclipse.org/justj/tools/updates/nightly/latest</justj.tools.repo>

diff --git a/promotion/pom.xml b/promotion/pom.xml
@@ -33,7 +33,7 @@
                   <goal>eclipse-run</goal>
                 </goals>
                 <configuration>
-                  <executionEnvironment>JavaSE-17</executionEnvironment>
+                  <executionEnvironment>JavaSE-21</executionEnvironment>
                   <dependencies>
                     <dependency>
                       <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/releng/DataTools.setup b/releng/DataTools.setup
@@ -124,9 +124,8 @@
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-17"
-      location="${jre.location-17}"
-      name="JRE for JavaSE-17">
+      version="JavaSE-21"
+      location="${jre.location-21}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -464,7 +463,7 @@
     <setupTask
         xsi:type="setup:StringSubstitutionTask"
         name="maven.build.java.home"
-        value="${jre.location-17}">
+        value="${jre.location-21}">
       <description>The location used to specify JAVA_HOME in the External Tools Configurations.</description>
     </setupTask>
     <setupTask