Skip to content

Commit 5b4b541

Browse files
hmottestadhmottestad
committed
Merge branch 'develop' into curcuit-breakers-against-oom
# Conflicts: # tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/GraphQueryResultView.java # tools/server-spring/src/main/java/org/eclipse/rdf4j/http/server/repository/TupleQueryResultView.java # tools/workbench/src/test/java/org/eclipse/rdf4j/workbench/util/QueryEvaluatorTest.java
2 parents 27d775e + c6de073 commit 5b4b541

556 files changed

Lines changed: 13101 additions & 10930 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/build11.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: succed job 'build (11)'
2+
3+
on: pull_request
4+
5+
jobs:
6+
build:
7+
strategy:
8+
fail-fast: true
9+
matrix:
10+
jdk: [ 11 ]
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Always Succeed
14+
run: true

‎.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: 11
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: [11, 17]
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: [11, 17]
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: 11
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: 11
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: [ 11, 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: 11
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: 11
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: 11
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: 11
154+
java-version: 25
155155
distribution: 'temurin'
156156
cache: maven
157157
- name: Install dependencies

‎assembly-descriptors/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
66
<artifactId>rdf4j</artifactId>
7-
<version>5.3.2-SNAPSHOT</version>
7+
<version>6.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-assembly-descriptors</artifactId>
1010
<name>RDF4J: Assembly Descriptors</name>

‎assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
66
<artifactId>rdf4j</artifactId>
7-
<version>5.3.2-SNAPSHOT</version>
7+
<version>6.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-assembly</artifactId>
1010
<packaging>pom</packaging>

‎bom/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
66
<artifactId>rdf4j</artifactId>
7-
<version>5.3.2-SNAPSHOT</version>
7+
<version>6.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-bom</artifactId>
1010
<packaging>pom</packaging>
@@ -233,11 +233,6 @@
233233
<artifactId>rdf4j-sail-elasticsearch</artifactId>
234234
<version>${project.version}</version>
235235
</dependency>
236-
<dependency>
237-
<groupId>org.eclipse.rdf4j</groupId>
238-
<artifactId>rdf4j-sail-solr</artifactId>
239-
<version>${project.version}</version>
240-
</dependency>
241236
<dependency>
242237
<groupId>org.eclipse.rdf4j</groupId>
243238
<artifactId>rdf4j-sail-inferencer</artifactId>

‎compliance/elasticsearch/pom.xml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.eclipse.rdf4j</groupId>
66
<artifactId>rdf4j-compliance</artifactId>
7-
<version>5.3.2-SNAPSHOT</version>
7+
<version>6.0.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>rdf4j-elasticsearch-compliance</artifactId>
1010
<name>RDF4J: Elasticsearch Sail Tests</name>
@@ -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>
@@ -82,24 +81,9 @@
8281
<scope>test</scope>
8382
</dependency>
8483
<dependency>
85-
<groupId>org.elasticsearch.client</groupId>
86-
<artifactId>transport</artifactId>
87-
<version>${elasticsearch.version}</version>
84+
<groupId>co.elastic.clients</groupId>
85+
<artifactId>elasticsearch-java</artifactId>
8886
<scope>test</scope>
89-
<exclusions>
90-
<exclusion>
91-
<groupId>commons-logging</groupId>
92-
<artifactId>commons-logging</artifactId>
93-
</exclusion>
94-
<exclusion>
95-
<groupId>com.vividsolutions</groupId>
96-
<artifactId>jts</artifactId>
97-
</exclusion>
98-
<exclusion>
99-
<groupId>org.elasticsearch</groupId>
100-
<artifactId>jna</artifactId>
101-
</exclusion>
102-
</exclusions>
10387
</dependency>
10488
<dependency>
10589
<groupId>org.testcontainers</groupId>

0 commit comments

Comments
 (0)