Skip to content

Commit ac79cbf

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5160 Move all Lucene 10 stuff to a subdirectory
1 parent 0b05c38 commit ac79cbf

File tree

541 files changed

+2134
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+2134
-132
lines changed

‎Jenkinsfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,8 @@ stage('Non-default environments') {
550550
-pl !integrationtest/java/modules/orm-lucene \
551551
-pl !integrationtest/java/modules/orm-elasticsearch \
552552
-pl !integrationtest/java/modules/orm-outbox-polling-elasticsearch \
553+
-pl !lucene10/documentation \
554+
-pl !lucene10/integrationtest/java/modules/orm-lucene \
553555
'''
554556
String mavenDockerArgs = ""
555557
def startedContainers = false

‎build/enforcer/src/main/java/org/hibernate/search/build/enforcer/MavenProjectUtils.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@
99
public class MavenProjectUtils {
1010

1111
public static final String HIBERNATE_SEARCH_PARENT_PUBLIC = "hibernate-search-parent-public";
12+
public static final String HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10 = "hibernate-search-parent-public-lucene10";
1213
public static final String HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST = "hibernate-search-parent-integrationtest";
14+
public static final String HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE10 = "hibernate-search-parent-integrationtest-lucene10";
1315
public static final String HIBERNATE_SEARCH_PARENT_RELOCATION = "hibernate-search-parent-relocation";
1416
public static final String DEPLOY_SKIP = "deploy.skip";
1517

1618
private MavenProjectUtils() {
1719
}
1820

1921
public static boolean isAnyParentPublicParent(MavenProject project) {
20-
return project.hasParent()
22+
return !HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10.equals( project.getArtifactId() )
23+
&& project.hasParent()
2124
&& ( HIBERNATE_SEARCH_PARENT_PUBLIC.equals( project.getParent().getArtifactId() )
25+
|| HIBERNATE_SEARCH_PARENT_PUBLIC_LUCENE10.equals( project.getParent().getArtifactId() )
2226
|| isAnyParentPublicParent( project.getParent() ) );
2327
}
2428

@@ -31,6 +35,7 @@ public static boolean isAnyParentRelocationParent(MavenProject project) {
3135
public static boolean isAnyParentIntegrationTestParent(MavenProject project) {
3236
return project.hasParent()
3337
&& ( HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST.equals( project.getParent().getArtifactId() )
38+
|| HIBERNATE_SEARCH_PARENT_INTEGRATION_TEST_LUCENE10.equals( project.getParent().getArtifactId() )
3439
|| isAnyParentIntegrationTestParent( project.getParent() ) );
3540
}
3641

‎build/jqassistant/rules/rules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@
251251
AND (
252252
artifact.name =~ ".*-integrationtest-.*"
253253
OR artifact.name = "hibernate-search-documentation"
254+
OR artifact.name = "hibernate-search-documentation-lucene10"
254255
)
255256
SET
256257
artifact:IntegrationTest

‎build/parents/build/pom.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<javadoc.org.apache.lucene.queryparser.url>https://lucene.apache.org/core/${javadoc.org.apache.lucene.tag}/queryparser/</javadoc.org.apache.lucene.queryparser.url>
4545

4646
<version.com.carrotsearch.hppc>0.10.0</version.com.carrotsearch.hppc>
47+
<version.org.apache.lucene10>10.0.0</version.org.apache.lucene10>
4748

4849
<!-- >>> Elasticsearch -->
4950
<!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
@@ -722,6 +723,46 @@
722723
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene</artifactId>
723724
<version>${project.version}</version>
724725
</dependency>
726+
<dependency>
727+
<groupId>org.hibernate.search</groupId>
728+
<artifactId>hibernate-search-integrationtest-backend-lucene10</artifactId>
729+
<version>${project.version}</version>
730+
</dependency>
731+
<dependency>
732+
<groupId>org.hibernate.search</groupId>
733+
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene10</artifactId>
734+
<version>${project.version}</version>
735+
</dependency>
736+
<dependency>
737+
<groupId>org.hibernate.search</groupId>
738+
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene10</artifactId>
739+
<version>${project.version}</version>
740+
</dependency>
741+
<dependency>
742+
<groupId>org.hibernate.search</groupId>
743+
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene10</artifactId>
744+
<version>${project.version}</version>
745+
</dependency>
746+
<dependency>
747+
<groupId>org.hibernate.search</groupId>
748+
<artifactId>hibernate-search-integrationtest-showcase-library-lucene10</artifactId>
749+
<version>${project.version}</version>
750+
</dependency>
751+
<dependency>
752+
<groupId>org.hibernate.search</groupId>
753+
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-lucene10</artifactId>
754+
<version>${project.version}</version>
755+
</dependency>
756+
<dependency>
757+
<groupId>org.hibernate.search</groupId>
758+
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-lucene10</artifactId>
759+
<version>${project.version}</version>
760+
</dependency>
761+
<dependency>
762+
<groupId>org.hibernate.search</groupId>
763+
<artifactId>hibernate-search-documentation-lucene10</artifactId>
764+
<version>${project.version}</version>
765+
</dependency>
725766

726767
<!-- Test -->
727768
<dependency>

‎build/reports/pom.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,32 @@
149149
<artifactId>hibernate-search-documentation</artifactId>
150150
<scope>test</scope>
151151
</dependency>
152+
<!-- All Lucene 10 things: -->
153+
<dependency>
154+
<groupId>org.hibernate.search</groupId>
155+
<artifactId>hibernate-search-integrationtest-backend-lucene10</artifactId>
156+
<scope>test</scope>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.hibernate.search</groupId>
160+
<artifactId>hibernate-search-integrationtest-mapper-pojo-standalone-realbackend-lucene10</artifactId>
161+
<scope>test</scope>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.hibernate.search</groupId>
165+
<artifactId>hibernate-search-integrationtest-mapper-orm-realbackend-lucene10</artifactId>
166+
<scope>test</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.hibernate.search</groupId>
170+
<artifactId>hibernate-search-integrationtest-mapper-orm-jakarta-batch-lucene10</artifactId>
171+
<scope>test</scope>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.hibernate.search</groupId>
175+
<artifactId>hibernate-search-documentation-lucene10</artifactId>
176+
<scope>test</scope>
177+
</dependency>
152178
</dependencies>
153179

154180
<build>
@@ -275,6 +301,11 @@
275301
<artifactId>hibernate-search-integrationtest-spring-repackaged-application</artifactId>
276302
<scope>test</scope>
277303
</dependency>
304+
<dependency>
305+
<groupId>org.hibernate.search</groupId>
306+
<artifactId>hibernate-search-integrationtest-showcase-library-lucene10</artifactId>
307+
<scope>test</scope>
308+
</dependency>
278309
</dependencies>
279310
</profile>
280311

@@ -314,6 +345,16 @@
314345
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene</artifactId>
315346
<scope>test</scope>
316347
</dependency>
348+
<dependency>
349+
<groupId>org.hibernate.search</groupId>
350+
<artifactId>hibernate-search-integrationtest-java-modules-orm-lucene-lucene10</artifactId>
351+
<scope>test</scope>
352+
</dependency>
353+
<dependency>
354+
<groupId>org.hibernate.search</groupId>
355+
<artifactId>hibernate-search-integrationtest-java-modules-pojo-standalone-lucene-lucene10</artifactId>
356+
<scope>test</scope>
357+
</dependency>
317358
</dependencies>
318359
</profile>
319360
</profiles>

‎documentation/src/test/java/org/hibernate/search/documentation/search/query/LuceneQueryDslIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.hibernate.search.documentation.testsupport.DocumentationSetupHelper;
1717
import org.hibernate.search.mapper.orm.Search;
1818
import org.hibernate.search.mapper.orm.session.SearchSession;
19+
import org.hibernate.search.util.impl.integrationtest.backend.lucene.TotalHitsUtils;
1920

2021
import org.junit.jupiter.api.BeforeEach;
2122
import org.junit.jupiter.api.Test;
@@ -99,7 +100,7 @@ void lowLevel() {
99100
assertThat( sort.getSort()[0].getType() ).isEqualTo( SortField.Type.CUSTOM );
100101

101102
assertThat( topDocs ).isNotNull();
102-
assertThat( topDocs.totalHits.value ).isEqualTo( 2L );
103+
assertThat( TotalHitsUtils.value( topDocs.totalHits ) ).isEqualTo( 2L );
103104
assertThat( topDocs.scoreDocs ).hasSize( 2 );
104105
} );
105106
}

‎lucene10/ant-copy-sources.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
SPDX-License-Identifier: Apache-2.0
4+
Copyright Red Hat Inc. and Hibernate Authors
5+
-->
6+
<project>
7+
<target name="copy">
8+
<!-- https://ant.apache.org/manual/Tasks/copy.html -->
9+
<copy todir="${transform.output.root.path}" failonerror="false" overwrite="true">
10+
<fileset dir="${transform.original.path}/src/"/>
11+
</copy>
12+
</target>
13+
</project>

‎backend/lucene10/pom.xml renamed to ‎lucene10/backend/lucene/pom.xml

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>org.hibernate.search</groupId>
8-
<artifactId>hibernate-search-parent-public</artifactId>
8+
<artifactId>hibernate-search-parent-public-lucene10</artifactId>
99
<version>8.0.0-SNAPSHOT</version>
1010
<relativePath>../../build/parents/public</relativePath>
1111
</parent>
@@ -19,51 +19,9 @@
1919
<deploy.skip>false</deploy.skip>
2020
<java.module.name>org.hibernate.search.backend.lucene</java.module.name>
2121

22-
<version.org.apache.lucene>10.0.0</version.org.apache.lucene>
2322
<java-version.main.release>21</java-version.main.release>
2423
</properties>
2524

26-
<dependencyManagement>
27-
<dependencies>
28-
<!-- Lucene backend -->
29-
<dependency>
30-
<groupId>org.apache.lucene</groupId>
31-
<artifactId>lucene-core</artifactId>
32-
<version>${version.org.apache.lucene}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.apache.lucene</groupId>
36-
<artifactId>lucene-analysis-common</artifactId>
37-
<version>${version.org.apache.lucene}</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.apache.lucene</groupId>
41-
<artifactId>lucene-queryparser</artifactId>
42-
<version>${version.org.apache.lucene}</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.apache.lucene</groupId>
46-
<artifactId>lucene-join</artifactId>
47-
<version>${version.org.apache.lucene}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.apache.lucene</groupId>
51-
<artifactId>lucene-facet</artifactId>
52-
<version>${version.org.apache.lucene}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.apache.lucene</groupId>
56-
<artifactId>lucene-highlighter</artifactId>
57-
<version>${version.org.apache.lucene}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>com.carrotsearch</groupId>
61-
<artifactId>hppc</artifactId>
62-
<version>${version.com.carrotsearch.hppc}</version>
63-
</dependency>
64-
</dependencies>
65-
</dependencyManagement>
66-
6725
<dependencies>
6826
<dependency>
6927
<groupId>org.hibernate.search</groupId>

‎backend/lucene10/src/main/java/org/hibernate/search/backend/lucene/LuceneBackend.java renamed to ‎lucene10/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneBackend.java

File renamed without changes.

‎backend/lucene10/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java renamed to ‎lucene10/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java

File renamed without changes.

0 commit comments

Comments
 (0)