Skip to content

Commit 56e76ef

Browse files
hmottestadm-alreeni
hmottestad
authored and
m-alreeni
committed
GH-5643 upgrade to java 25
1 parent 9ab13e2 commit 56e76ef

210 files changed

Lines changed: 2950 additions & 1883 deletions

File tree

Some content is hidden

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

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up JDK
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: 21
21+
java-version: 25
2222
distribution: 'temurin'
2323
cache: maven
2424

‎.github/workflows/dash-license.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up JDK
1717
uses: actions/setup-java@v4
1818
with:
19-
java-version: 21
19+
java-version: 25
2020
distribution: 'temurin'
2121
cache: maven
2222
- name: Clean install

‎.github/workflows/develop-status.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
jdk: [ 21, 25 ]
14+
jdk: [ 25 ]
1515

1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Register JVM thread dump on cancel
1919
uses: ./.github/actions/thread-dump-post
2020
- name: Set up JDK
21-
uses: actions/setup-java@v1
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: ${{ matrix.jdk }}
24+
distribution: 'temurin'
2425
- name: Cache local Maven repository
2526
uses: actions/cache@v4
2627
with:

‎.github/workflows/main-status.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
jdk: [ 21, 25 ]
14+
jdk: [ 25 ]
1515

1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Register JVM thread dump on cancel
1919
uses: ./.github/actions/thread-dump-post
2020
- name: Set up JDK
21-
uses: actions/setup-java@v1
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: ${{ matrix.jdk }}
24+
distribution: 'temurin'
2425
- name: Cache local Maven repository
2526
uses: actions/cache@v4
2627
with:

‎.github/workflows/pr-verify.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up JDK
2222
uses: actions/setup-java@v4
2323
with:
24-
java-version: 21
24+
java-version: 25
2525
distribution: 'temurin'
2626
cache: maven
2727
- name: Check formatting
@@ -41,7 +41,7 @@ jobs:
4141
- name: Set up JDK
4242
uses: actions/setup-java@v4
4343
with:
44-
java-version: 21
44+
java-version: 25
4545
distribution: 'temurin'
4646
cache: maven
4747
- name: Compile (mvn clean install)
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: true
5656
matrix:
57-
jdk: [ 21, 25 ]
57+
jdk: [ 25 ]
5858
steps:
5959
- uses: actions/checkout@v4
6060
- name: Register JVM thread dump on cancel
@@ -86,7 +86,7 @@ jobs:
8686
- name: Set up JDK
8787
uses: actions/setup-java@v4
8888
with:
89-
java-version: 21
89+
java-version: 25
9090
distribution: 'temurin'
9191
cache: maven
9292
- name: Build
@@ -109,7 +109,7 @@ jobs:
109109
- name: Set up JDK
110110
uses: actions/setup-java@v4
111111
with:
112-
java-version: 21
112+
java-version: 25
113113
distribution: 'temurin'
114114
cache: maven
115115
- name: Build
@@ -132,7 +132,7 @@ jobs:
132132
- name: Set up JDK
133133
uses: actions/setup-java@v4
134134
with:
135-
java-version: 21
135+
java-version: 25
136136
distribution: 'temurin'
137137
cache: maven
138138
- name: Run install
@@ -151,7 +151,7 @@ jobs:
151151
- name: Set up JDK
152152
uses: actions/setup-java@v4
153153
with:
154-
java-version: 21
154+
java-version: 25
155155
distribution: 'temurin'
156156
cache: maven
157157
- name: Install dependencies

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ e2e/test-results
5555
.m2_repo/
5656
.serena/
5757
.vscode
58-
/rdf4j-upgrade-elasticsearch-lucene-and-solr/
5958
/.codex/environments/environment.toml

‎compliance/elasticsearch/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<dependency>
5757
<groupId>org.hamcrest</groupId>
5858
<artifactId>hamcrest-library</artifactId>
59-
<version>2.1</version>
6059
<scope>test</scope>
6160
</dependency>
6261
<dependency>

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/AbstractElasticsearchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void tearDownCluster() {
9090

9191
private static DockerImageName dockerImageName() {
9292
String esVersion = System.getProperty("elasticsearch.docker.version",
93-
System.getProperty("elasticsearch.version", "9.2.1"));
93+
System.getProperty("elasticsearch.version", "9.2.4"));
9494

9595
return DockerImageName
9696
.parse("docker.elastic.co/elasticsearch/elasticsearch:" + esVersion)

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchIndexTest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,20 @@ public void initializeAppliesHttpCredentials() throws Exception {
159159
"Authorization header should be propagated to the HTTP client");
160160
}
161161

162+
@Test
163+
@SuppressWarnings("unchecked")
164+
public void getMappingsReturnsFieldProperties() throws Exception {
165+
Map<String, Object> mappings = index.getMappings();
166+
assertFalse(mappings.isEmpty(), "Index mappings should not be empty");
167+
assertTrue(mappings.containsKey("properties"), "Index mappings should expose field properties");
168+
169+
Map<String, Object> properties = (Map<String, Object>) mappings.get("properties");
170+
assertNotNull(properties);
171+
assertTrue(properties.containsKey(SearchFields.URI_FIELD_NAME));
172+
assertTrue(properties.containsKey(SearchFields.TEXT_FIELD_NAME));
173+
assertTrue(properties.containsKey(SearchFields.CONTEXT_FIELD_NAME));
174+
}
175+
162176
@Test
163177
public void testAddStatement() throws IOException {
164178
String predicate1Field = ElasticsearchIndex.toPropertyFieldName(SearchFields.getPropertyField(predicate1));

‎compliance/repository/pom.xml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,28 @@
2424
<groupId>org.eclipse.jetty</groupId>
2525
<artifactId>jetty-server</artifactId>
2626
<scope>test</scope>
27+
<exclusions>
28+
<exclusion>
29+
<groupId>org.eclipse.jetty.toolchain</groupId>
30+
<artifactId>jetty-ee11-jakarta-servlet-api</artifactId>
31+
</exclusion>
32+
</exclusions>
2733
</dependency>
2834
<dependency>
29-
<groupId>org.eclipse.jetty</groupId>
30-
<artifactId>jetty-webapp</artifactId>
35+
<groupId>org.eclipse.jetty.ee11</groupId>
36+
<artifactId>jetty-ee11-webapp</artifactId>
37+
<scope>test</scope>
38+
<exclusions>
39+
<exclusion>
40+
<groupId>org.eclipse.jetty.toolchain</groupId>
41+
<artifactId>jetty-ee11-jakarta-servlet-api</artifactId>
42+
</exclusion>
43+
</exclusions>
44+
</dependency>
45+
<dependency>
46+
<groupId>jakarta.servlet</groupId>
47+
<artifactId>jakarta.servlet-api</artifactId>
48+
<version>${servlet.version}</version>
3149
<scope>test</scope>
3250
</dependency>
3351
<dependency>

0 commit comments

Comments
 (0)