Skip to content

Commit

Permalink
HSEARCH-5160 Change the artifacts names to lucene-next
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta committed Dec 13, 2024
1 parent 361b938 commit 34dde10
Show file tree
Hide file tree
Showing 544 changed files with 115 additions and 117 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,8 @@ stage('Non-default environments') {
-pl !integrationtest/java/modules/orm-lucene \
-pl !integrationtest/java/modules/orm-elasticsearch \
-pl !integrationtest/java/modules/orm-outbox-polling-elasticsearch \
-pl !lucene10/documentation \
-pl !lucene10/integrationtest/java/modules/orm-lucene \
-pl !lucene-next/documentation \
-pl !lucene-next/integrationtest/java/modules/orm-lucene \
'''
String mavenDockerArgs = ""
def startedContainers = false
Expand Down
2 changes: 1 addition & 1 deletion bom/public/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
public class MavenProjectUtils {

public static final String HIBERNATE_SEARCH_PARENT_PUBLIC = "hibernate-search-parent-public";
public static final String HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10 = "hibernate-search-parent-public-lucene10";
public static final String HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE_NEXT = "hibernate-search-parent-public-lucene-next";
public static final String HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST = "hibernate-search-parent-integrationtest";
public static final String HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE10 = "hibernate-search-parent-integrationtest-lucene10";
public static final String HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE_NEXT = "hibernate-search-parent-integrationtest-lucene-next";
public static final String HIBERNATE_SEARCH_PARENT_RELOCATION = "hibernate-search-parent-relocation";
public static final String DEPLOY_SKIP = "deploy.skip";

private MavenProjectUtils() {
}

public static boolean isAnyParentPublicParent(MavenProject project) {
return !HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10.equals( project.getArtifactId() )
return !HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE_NEXT.equals( project.getArtifactId() )
&& project.hasParent()
&& ( HIBERNATE_SEARCH_PARENT_PUBLIC.equals( project.getParent().getArtifactId() )
|| HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10.equals( project.getParent().getArtifactId() )
|| HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE_NEXT.equals( project.getParent().getArtifactId() )
|| isAnyParentPublicParent( project.getParent() ) );
}

Expand All @@ -35,7 +35,7 @@ public static boolean isAnyParentRelocationParent(MavenProject project) {
public static boolean isAnyParentIntegrationTestParent(MavenProject project) {
return project.hasParent()
&& ( HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST.equals( project.getParent().getArtifactId() )
|| HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE10.equals( project.getParent().getArtifactId() )
|| HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE_NEXT.equals( project.getParent().getArtifactId() )
|| isAnyParentIntegrationTestParent( project.getParent() ) );
}

Expand Down
4 changes: 2 additions & 2 deletions build/jqassistant/rules/rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
AND (
artifact.name =~ ".*-integrationtest-.*"
OR artifact.name = "hibernate-search-documentation"
OR artifact.name = "hibernate-search-documentation-lucene10"
OR artifact.name = "hibernate-search-documentation-lucene-next"
)
SET
artifact:IntegrationTest
Expand All @@ -273,7 +273,7 @@
artifact.moduleSpecificKeyword =
CASE artifact.name
WHEN 'hibernate-search-backend-lucene' THEN 'Lucene'
WHEN 'hibernate-search-backend-lucene10' THEN 'Lucene'
WHEN 'hibernate-search-backend-lucene-next' THEN 'Lucene'
WHEN 'hibernate-search-backend-elasticsearch' THEN 'Elasticsearch'
WHEN 'hibernate-search-backend-elasticsearch-aws' THEN 'ElasticsearchAws'
WHEN 'hibernate-search-mapper-pojo-base' THEN 'Pojo'
Expand Down
22 changes: 11 additions & 11 deletions build/parents/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<javadoc.org.apache.lucene.queryparser.url>https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/queryparser/</javadoc.org.apache.lucene.queryparser.url>

<version.com.carrotsearch.hppc>0.10.0</version.com.carrotsearch.hppc>
<version.org.apache.lucene10>10.0.0</version.org.apache.lucene10>
<version.org.apache.lucene.next>10.0.0</version.org.apache.lucene.next>

<!-- >>> Elasticsearch -->
<!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
Expand Down Expand Up @@ -314,7 +314,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -584,7 +584,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-util-internal-integrationtest-backend-lucene10</artifactId>
<artifactId>hibernate-search-util-internal-integrationtest-backend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -725,42 +725,42 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-backend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-backend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-showcase-library-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-showcase-library-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-documentation-lucene10</artifactId>
<artifactId>hibernate-search-documentation-lucene-next</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
18 changes: 9 additions & 9 deletions build/reports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down Expand Up @@ -152,27 +152,27 @@
<!-- All Lucene 10 things: -->
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-backend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-backend-lucene-next</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene-next</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene-next</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene-next</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-documentation-lucene10</artifactId>
<artifactId>hibernate-search-documentation-lucene-next</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -303,7 +303,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-showcase-library-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-showcase-library-lucene-next</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -347,12 +347,12 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-next</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-lucene10</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-next</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions distribution/src/main/assembly/dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>dist/backend/lucene10</outputDirectory>
<outputDirectory>dist/backend/lucene-next</outputDirectory>
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.hibernate.search:hibernate-search-backend-lucene10</include>
<include>org.hibernate.search:hibernate-search-backend-lucene-next</include>
</includes>
</dependencySet>
<dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
<jakartaPersistenceVersion>${parsed-version.jakarta.persistence.majorVersion}.${parsed-version.jakarta.persistence.minorVersion}</jakartaPersistenceVersion>
<jandexPluginVersion>${version.jandex.plugin}</jandexPluginVersion>
<luceneVersion>${version.org.apache.lucene}</luceneVersion>
<lucene10Version>${version.org.apache.lucene10}</lucene10Version>
<luceneNextVersion>${version.org.apache.lucene.next}</luceneNextVersion>
<luceneUrl>https://lucene.apache.org</luceneUrl>
<luceneJavadocUrl>${javadoc.org.apache.lucene.core.url}</luceneJavadocUrl>
<luceneAnalysisCommonJavadocUrl>${javadoc.org.apache.lucene.analysis.common.url}</luceneAnalysisCommonJavadocUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
|
|Apache Lucene (for the <<backend-lucene,Lucene backend>>)
|{luceneVersion}
|Or Lucene {lucene10Version} when using JDK 21+ and <<other-integrations-lucene10,different Maven artifacts>>.
|Or Lucene {luceneNextVersion} when using JDK 21+ and <<other-integrations-lucene-next,different Maven artifacts>>.
|Elasticsearch server (for the <<backend-elasticsearch,Elasticsearch backend>>)
|{elasticsearchCompatibleVersions}
|Most of older minor versions (e.g. {elasticsearchOtherPotentiallyCompatibleVersions}) are not given priority for bugfixes and new features.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ to find versions of Hibernate Search compatible with these older versions of Hib

Use <<other-integrations-jakarta,Hibernate ORM 7>> instead.

[[other-integrations-lucene10]]
[[other-integrations-lucene-next]]
== Lucene 10

include::../components/_incubating-warning.adoc[]
Expand All @@ -43,22 +43,22 @@ The default, stable one, that works with JDK 17+ and uses Lucene {luceneVersion}
</dependency>
----

And an incubating one based on Lucene {lucene10Version}, that requires JDK 21+:
And an incubating one based on Lucene {luceneNextVersion}, that requires JDK 21+:

[source, XML, subs="+attributes"]
----
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>
</dependency>
----

[NOTE]
====
`hibernate-search-backend-lucene10` is tested against the same test suite as `hibernate-search-backend-lucene`
`hibernate-search-backend-lucene-next` is tested against the same test suite as `hibernate-search-backend-lucene`
and currently provides the same search capabilities. The main difference is the Lucene version backing it.
While Hibernate Search {hibernateSearchVersionShort} still <<compatibility-dependencies,targets>> JDK 17,
Lucene 10 is leveraging new Java APIs, particularly to work with memory, that are available starting with JDK 21.
Lucene, starting with version 10, is leveraging new Java APIs, particularly to work with memory, that are available starting with JDK 21.
For users running their applications on JDK 21+ and wanting to get the latest Lucene improvements, it would be beneficial to
use this new backend.
====
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-parent-public-lucene10</artifactId>
<artifactId>hibernate-search-parent-public-lucene-next</artifactId>
<version>8.0.0-SNAPSHOT</version>
<relativePath>../../build/parents/public</relativePath>
</parent>
<artifactId>hibernate-search-backend-lucene10</artifactId>
<artifactId>hibernate-search-backend-lucene-next</artifactId>

<name>Hibernate Search Backend - Lucene 10</name>
<description>Hibernate Search Backend relying on embedded instances of Lucene (v10)</description>
Expand Down
Loading

0 comments on commit 34dde10

Please sign in to comment.