From 4a4270e5f93aaf8c153f43be9a127e73c01cf536 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Fri, 13 Dec 2024 12:50:02 +0100 Subject: [PATCH] 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 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2654 --- maven-bnd/pom.xml | 2 +- maven-bnd/promotion/pom.xml | 2 +- maven-bnd/site-minimal/category.xml | 2 + maven-bnd/site/category.xml | 2 + maven-bnd/tp/MavenBND.target | 108 ++++++++++++++++++++--- maven-jetty/pom.xml | 2 +- maven-jetty/promotion/pom.xml | 2 +- maven-osgi/pom.xml | 2 +- maven-osgi/promotion/pom.xml | 2 +- maven-sign/pom.xml | 2 +- maven-sign/promotion/pom.xml | 2 +- orbit-aggregation/pom.xml | 4 +- report/maven-bnd/merged-target/REPORT.md | 33 ++++--- 13 files changed, 127 insertions(+), 38 deletions(-) diff --git a/maven-bnd/pom.xml b/maven-bnd/pom.xml index f9193771..b542883f 100644 --- a/maven-bnd/pom.xml +++ b/maven-bnd/pom.xml @@ -115,7 +115,7 @@ MavenBND - JavaSE-17 + JavaSE-21 win32 diff --git a/maven-bnd/promotion/pom.xml b/maven-bnd/promotion/pom.xml index 4ab002d0..0a0feb3a 100644 --- a/maven-bnd/promotion/pom.xml +++ b/maven-bnd/promotion/pom.xml @@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0 tycho-eclipse-plugin ${tycho-version} - JavaSE-17 + JavaSE-21 org.eclipse.justj.p2 diff --git a/maven-bnd/site-minimal/category.xml b/maven-bnd/site-minimal/category.xml index 70a774cd..d2c94126 100644 --- a/maven-bnd/site-minimal/category.xml +++ b/maven-bnd/site-minimal/category.xml @@ -40,6 +40,8 @@ + + diff --git a/maven-bnd/site/category.xml b/maven-bnd/site/category.xml index bfa99047..9af7051d 100644 --- a/maven-bnd/site/category.xml +++ b/maven-bnd/site/category.xml @@ -40,6 +40,8 @@ + + diff --git a/maven-bnd/tp/MavenBND.target b/maven-bnd/tp/MavenBND.target index 9f664c2d..334d546e 100644 --- a/maven-bnd/tp/MavenBND.target +++ b/maven-bnd/tp/MavenBND.target @@ -59,7 +59,7 @@ Export-Package: *;version="${version}";-noimport:=true - + This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts. Copyright (c) 2024 Eclipse contributors and others. @@ -77,59 +77,59 @@ SPDX-License-Identifier: EPL-2.0 org.apache.lucene lucene-analysis-common - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-analysis-smartcn - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-core - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-misc - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-queries - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-queryparser - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-sandbox - 9.12.0 + 9.12.1 jar org.apache.lucene lucene-facet - 9.12.0 + 9.12.1 jar - + + + + + + This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts. + +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 + + + + + + org.apache.lucene + lucene-analysis-common + 10.0.0 + jar + + + org.apache.lucene + lucene-analysis-smartcn + 10.0.0 + jar + + + org.apache.lucene + lucene-core + 10.0.0 + jar + + + org.apache.lucene + lucene-misc + 10.0.0 + jar + + + org.apache.lucene + lucene-queries + 10.0.0 + jar + + + org.apache.lucene + lucene-queryparser + 10.0.0 + jar + + + org.apache.lucene + lucene-sandbox + 10.0.0 + jar + + + org.apache.lucene + lucene-facet + 10.0.0 + jar + + + + + + + + + diff --git a/maven-jetty/pom.xml b/maven-jetty/pom.xml index 886215e0..38358a1a 100644 --- a/maven-jetty/pom.xml +++ b/maven-jetty/pom.xml @@ -69,7 +69,7 @@ MavenJetty - JavaSE-17 + JavaSE-21 win32 diff --git a/maven-jetty/promotion/pom.xml b/maven-jetty/promotion/pom.xml index f8678316..f03478ae 100644 --- a/maven-jetty/promotion/pom.xml +++ b/maven-jetty/promotion/pom.xml @@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0 tycho-eclipse-plugin ${tycho-version} - JavaSE-17 + JavaSE-21 org.eclipse.justj.p2 diff --git a/maven-osgi/pom.xml b/maven-osgi/pom.xml index a4f8fc49..57026d21 100644 --- a/maven-osgi/pom.xml +++ b/maven-osgi/pom.xml @@ -91,7 +91,7 @@ Maven - JavaSE-17 + JavaSE-21 win32 diff --git a/maven-osgi/promotion/pom.xml b/maven-osgi/promotion/pom.xml index df575258..4063ded5 100644 --- a/maven-osgi/promotion/pom.xml +++ b/maven-osgi/promotion/pom.xml @@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0 tycho-eclipse-plugin ${tycho-version} - JavaSE-17 + JavaSE-21 org.eclipse.justj.p2 diff --git a/maven-sign/pom.xml b/maven-sign/pom.xml index ded97686..306b9856 100644 --- a/maven-sign/pom.xml +++ b/maven-sign/pom.xml @@ -91,7 +91,7 @@ MavenSign - JavaSE-17 + JavaSE-21 win32 diff --git a/maven-sign/promotion/pom.xml b/maven-sign/promotion/pom.xml index ca76dcd5..1cc6a973 100644 --- a/maven-sign/promotion/pom.xml +++ b/maven-sign/promotion/pom.xml @@ -32,7 +32,7 @@ SPDX-License-Identifier: EPL-2.0 tycho-eclipse-plugin ${tycho-version} - JavaSE-17 + JavaSE-21 org.eclipse.justj.p2 diff --git a/orbit-aggregation/pom.xml b/orbit-aggregation/pom.xml index a1418a5f..a5765710 100644 --- a/orbit-aggregation/pom.xml +++ b/orbit-aggregation/pom.xml @@ -69,7 +69,7 @@ --action ${simrel.aggregator.build.type} - JavaSE-17 + JavaSE-21 -Xms256M -Xmx2048M @@ -171,7 +171,7 @@ eclipse-run - JavaSE-17 + JavaSE-21 org.eclipse.justj.p2 diff --git a/report/maven-bnd/merged-target/REPORT.md b/report/maven-bnd/merged-target/REPORT.md index 92be0c5f..02f67fbc 100644 --- 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)**