Add lucene 10.0.0

- Update all the poms to use JavaSE-21 because lucene 10 requires that. - Update lucene 9.x to 9.12.1 eclipse-platform/eclipse.platform.releng.aggregator#2654
eclipse-orbit · Dec 13, 2024 · 4a4270e · 4a4270e
1 parent 619583c
commit 4a4270e
Show file tree

Hide file tree

Showing 13 changed files with 127 additions and 38 deletions.
diff --git a/maven-bnd/pom.xml b/maven-bnd/pom.xml
@@ -115,7 +115,7 @@
               <classifier>MavenBND</classifier>
             </artifact>
           </target>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <environments>
             <environment>
               <os>win32</os>

diff --git a/maven-bnd/promotion/pom.xml b/maven-bnd/promotion/pom.xml
@@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0
         <artifactId>tycho-eclipse-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <dependencies>
             <dependency>
               <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/maven-bnd/site-minimal/category.xml b/maven-bnd/site-minimal/category.xml
@@ -40,6 +40,8 @@
    <feature id="org.eclipse.orbit.maven.junit.source"/>
    <feature id="org.eclipse.orbit.maven.lucene"/>
    <feature id="org.eclipse.orbit.maven.lucene.source"/>
+   <feature id="org.eclipse.orbit.maven.lucene-10"/>
+   <feature id="org.eclipse.orbit.maven.lucene-10.source"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.2"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.2.source"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.x"/>

diff --git a/maven-bnd/site/category.xml b/maven-bnd/site/category.xml
@@ -40,6 +40,8 @@
    <feature id="org.eclipse.orbit.maven.junit.source"/>
    <feature id="org.eclipse.orbit.maven.lucene"/>
    <feature id="org.eclipse.orbit.maven.lucene.source"/>
+   <feature id="org.eclipse.orbit.maven.lucene-10"/>
+   <feature id="org.eclipse.orbit.maven.lucene-10.source"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.2"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.2.source"/>
    <feature id="org.eclipse.orbit.maven.org.antlr.3.x"/>

diff --git a/maven-bnd/tp/MavenBND.target b/maven-bnd/tp/MavenBND.target
@@ -59,7 +59,7 @@ Export-Package:         *;version="${version}";-noimport:=true
 <!-- _____________________________________________________ org.apache.lucene ___________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
-      <feature id="org.eclipse.orbit.maven.lucene" label="Orbit Maven BND org.apache.lucene" provider-name="Eclipse Orbit" version="4.35.0">
+      <feature id="org.eclipse.orbit.maven.lucene" label="Orbit Maven BND org.apache.lucene" provider-name="Eclipse Orbit" version="4.35.0.v20241213-1200">
         <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -77,59 +77,59 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-analysis-common</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-analysis-smartcn</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-core</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-misc</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-queries</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-queryparser</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-sandbox</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.lucene</groupId>
           <artifactId>lucene-facet</artifactId>
-          <version>9.12.0</version>
+          <version>9.12.1</version>
           <type>jar</type>
         </dependency>
       </dependencies>
       <instructions>
-<!-- SHA1 66780cdf91a3585be656a9ea8fd8cacefed100e9 -->
+<!-- SHA1 d7639c18f4b20cc05c8cc8581ed9ef290d87ea19 -->
 <![CDATA[
 Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
 version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
 Bundle-SymbolicName:    ${mvnGroupId}.${replacestring;${mvnArtifactId};lucene-}
-Bundle-Version:         ${version}.v20240929-0900
+Bundle-Version:         ${version}.v20241213-1200
 Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 Import-Package:         org.apache.lucene.*;version="${range;[==,+);${version}}",\
                         *
@@ -141,6 +141,92 @@ Export-Package:         *;version="${version}";-noimport:=true
     </location>
 
 
+<!-- _____________________________________________________ org.apache.lucene-10 ___________________________________________________________________________________________________-->
+
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+      <feature id="org.eclipse.orbit.maven.lucene-10" label="Orbit Maven BND org.apache.lucene 10" provider-name="Eclipse Orbit" version="4.35.0.v20241213-1200">
+        <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
+        <copyright>
+Copyright (c) 2024 Eclipse contributors and others.
+
+This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+which accompanies this distribution, and is available at
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+        </copyright>
+        <license url="https://www.eclipse.org/legal/epl-2.0/"/>
+      </feature>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-analysis-common</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-analysis-smartcn</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-core</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-misc</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-queries</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-queryparser</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-sandbox</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.lucene</groupId>
+          <artifactId>lucene-facet</artifactId>
+          <version>10.0.0</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+      <instructions>
+<!-- SHA1 eea1b4db7d77487fbb6aa352b80d74f87ff47280 -->
+<![CDATA[
+Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
+version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
+Bundle-SymbolicName:    ${mvnGroupId}.${replacestring;${mvnArtifactId};lucene-}
+Bundle-Version:         ${version}.v20241213-1200
+Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+Import-Package:         org.apache.lucene.*;version="${range;[==,+);${version}}",\
+                        jdk.incubator.*;resolution:=optional,\
+                        *
+Export-Package:         *;version="${version}";-noimport:=true
+-noextraheaders:        true
+-removeheaders:         Private-Package
+]]>
+      </instructions>
+    </location>
+
+
 <!-- _______________________________________________________ org.jruby _________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">

diff --git a/maven-jetty/pom.xml b/maven-jetty/pom.xml
@@ -69,7 +69,7 @@
               <classifier>MavenJetty</classifier>
             </artifact>
           </target>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <environments>
             <environment>
               <os>win32</os>

diff --git a/maven-jetty/promotion/pom.xml b/maven-jetty/promotion/pom.xml
@@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0
         <artifactId>tycho-eclipse-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <dependencies>
             <dependency>
               <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/maven-osgi/pom.xml b/maven-osgi/pom.xml
@@ -91,7 +91,7 @@
               <classifier>Maven</classifier>
             </artifact>
           </target>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <environments>
             <environment>
               <os>win32</os>

diff --git a/maven-osgi/promotion/pom.xml b/maven-osgi/promotion/pom.xml
@@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0
         <artifactId>tycho-eclipse-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <dependencies>
             <dependency>
               <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/maven-sign/pom.xml b/maven-sign/pom.xml
@@ -91,7 +91,7 @@
               <classifier>MavenSign</classifier>
             </artifact>
           </target>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <environments>
             <environment>
               <os>win32</os>

diff --git a/maven-sign/promotion/pom.xml b/maven-sign/promotion/pom.xml
@@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0
         <artifactId>tycho-eclipse-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-17</executionEnvironment>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <dependencies>
             <dependency>
               <artifactId>org.eclipse.justj.p2</artifactId>

diff --git a/orbit-aggregation/pom.xml b/orbit-aggregation/pom.xml
@@ -69,7 +69,7 @@
                 <applicationsArg>--action</applicationsArg>
                 <applicationsArg>${simrel.aggregator.build.type}</applicationsArg>
               </applicationsArgs>
-              <executionEnvironment>JavaSE-17</executionEnvironment>
+              <executionEnvironment>JavaSE-21</executionEnvironment>
               <jvmArgs>
                 <jvmArg>-Xms256M</jvmArg>
                 <jvmArg>-Xmx2048M</jvmArg>
@@ -171,7 +171,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/report/maven-bnd/merged-target/REPORT.md b/report/maven-bnd/merged-target/REPORT.md
@@ -1,15 +1,6 @@
 # Target Platform: [merged-target](https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-bnd/tp/MavenBND.target)
 
 ## Major Updates
- - [org.apache.lucene](https://repo1.maven.org/maven2/org/apache/lucene/)
-    - [lucene-analysis-common](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/10.0.0/)
-    - [lucene-analysis-smartcn](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/10.0.0/)
-    - [lucene-core](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/10.0.0/)
-    - [lucene-facet](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/10.0.0/)
-    - [lucene-misc](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/10.0.0/)
-    - [lucene-queries](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/10.0.0/)
-    - [lucene-queryparser](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/10.0.0/)
-    - [lucene-sandbox](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/9.12.0)** < [10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/10.0.0/)
  - [org.cyclonedx](https://repo1.maven.org/maven2/org/cyclonedx/)
     - [cyclonedx-core-java](https://repo1.maven.org/maven2/org/cyclonedx/cyclonedx-core-java/) **[8.0.3](https://repo1.maven.org/maven2/org/cyclonedx/cyclonedx-core-java/8.0.3)** < [10.0.0](https://repo1.maven.org/maven2/org/cyclonedx/cyclonedx-core-java/10.0.0/)
 
@@ -53,14 +44,22 @@
     - [httpcore5](https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5/) **[5.3.1](https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5/5.3.1)**
     - [httpcore5-h2](https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5-h2/) **[5.3.1](https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5-h2/5.3.1)**
  - [org.apache.lucene](https://repo1.maven.org/maven2/org/apache/lucene/)
-    - [lucene-analysis-common](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/9.12.0)**
-    - [lucene-analysis-smartcn](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/9.12.0)**
-    - [lucene-core](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/9.12.0)**
-    - [lucene-facet](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/9.12.0)**
-    - [lucene-misc](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/9.12.0)**
-    - [lucene-queries](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/9.12.0)**
-    - [lucene-queryparser](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/9.12.0)**
-    - [lucene-sandbox](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/) **[9.12.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/9.12.0)**
+    - [lucene-analysis-common](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/9.12.1)**
+    - [lucene-analysis-common](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-common/10.0.0)**
+    - [lucene-analysis-smartcn](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/9.12.1)**
+    - [lucene-analysis-smartcn](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-analysis-smartcn/10.0.0)**
+    - [lucene-core](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/9.12.1)**
+    - [lucene-core](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-core/10.0.0)**
+    - [lucene-facet](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/9.12.1)**
+    - [lucene-facet](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/10.0.0)**
+    - [lucene-misc](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/9.12.1)**
+    - [lucene-misc](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/10.0.0)**
+    - [lucene-queries](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/9.12.1)**
+    - [lucene-queries](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/10.0.0)**
+    - [lucene-queryparser](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/9.12.1)**
+    - [lucene-queryparser](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/10.0.0)**
+    - [lucene-sandbox](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/) **[9.12.1](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/9.12.1)**
+    - [lucene-sandbox](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/) **[10.0.0](https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/10.0.0)**
  - [org.apache.poi](https://repo1.maven.org/maven2/org/apache/poi/)
     - [poi](https://repo1.maven.org/maven2/org/apache/poi/poi/) **[5.3.0](https://repo1.maven.org/maven2/org/apache/poi/poi/5.3.0)**
     - [poi-ooxml](https://repo1.maven.org/maven2/org/apache/poi/poi-ooxml/) **[5.3.0](https://repo1.maven.org/maven2/org/apache/poi/poi-ooxml/5.3.0)**