Skip to content

Commit bc815e4

Browse files
authored
Merge pull request #4574 from evolvedbinary/feature/java-17
Upgrade to Java 17
2 parents 5552302 + a272ffd commit bc815e4

File tree

41 files changed

+200
-246
lines changed

Some content is hidden

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

41 files changed

+200
-246
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ updates:
77
time: "03:00"
88
open-pull-requests-limit: 10
99
ignore:
10-
- dependency-name: com.github.ben-manes.caffeine:caffeine
11-
versions:
12-
- ">= 3.a, < 4"
1310
- dependency-name: org.apache.lucene:lucene-analyzers-common
1411
versions:
1512
- ">= 8.a, < 9"
@@ -28,31 +25,10 @@ updates:
2825
- dependency-name: org.apache.lucene:lucene-queryparser
2926
versions:
3027
- ">= 8.a, < 9"
31-
- dependency-name: org.aspectj:aspectjrt
32-
versions:
33-
- "> 1.9.4, < 1.10"
34-
- dependency-name: org.aspectj:aspectjtools
35-
versions:
36-
- "> 1.9.4, < 1.10"
37-
- dependency-name: net.sf.saxon:Saxon-HE
38-
versions:
39-
> "9"
40-
- dependency-name: org.hsqldb:hsqldb
41-
versions:
42-
- 2.6.0
4328
- dependency-name: com.ibm.icu:icu4j
4429
versions:
4530
- "69.1"
46-
- dependency-name: com.sun.mail:jakarta.mail
47-
versions:
48-
- 2.0.1
49-
- dependency-name: com.sun.activation:jakarta.activation
50-
versions:
51-
- 2.0.1
5231
- dependency-name: com.mycila:license-maven-plugin
5332
versions:
5433
- "4.0"
5534
- 4.0.rc2
56-
- dependency-name: org.owasp:dependency-check-maven
57-
versions:
58-
- 6.1.3

.github/workflows/ci-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
- uses: actions/checkout@v2
1111
with:
1212
fetch-depth: 1
13-
- name: Set up JDK 8
14-
uses: actions/setup-java@v2
13+
- name: Set up JDK 17
14+
uses: actions/setup-java@v3
1515
with:
1616
distribution: temurin
17-
java-version: '8'
17+
java-version: '17'
1818
- name: Make buildkit default
1919
uses: docker/setup-buildx-action@v1
2020
id: buildx

.github/workflows/ci-docs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
name: ${{ matrix.jdk }} Javadocs
99
strategy:
1010
matrix:
11-
jdk: ['8','11', '16']
11+
jdk: ['17']
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
1515
with:
1616
fetch-depth: 0
1717
- name: Set up JDK
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v3
1919
with:
2020
distribution: temurin
2121
java-version: ${{ matrix.jdk }}
@@ -27,5 +27,4 @@ jobs:
2727
restore-keys: ${{ runner.os }}-m2
2828
- name: Maven Javadoc
2929
run: mvn -V -B -q -T 2C javadoc:javadoc
30-
continue-on-error: ${{ matrix.jdk != '8' }}
3130

.github/workflows/ci-test.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,24 @@ jobs:
44
test:
55
name: (JDK ${{ matrix.jdk }} / ${{ matrix.os }}) Test
66
env:
7-
MAVEN_OPTS: -XX:+IgnoreUnrecognizedVMOptions --illegal-access=debug -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./
7+
MAVEN_OPTS: -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./
88
strategy:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest, windows-latest, macOS-latest]
12-
jdk: ['8', '11']
13-
include:
14-
- os: ubuntu-latest
15-
jdk: '16'
12+
jdk: ['17']
1613
runs-on: ${{ matrix.os }}
1714
steps:
1815
- uses: actions/checkout@v2
1916
- name: Set up JDK ${{ matrix.jdk }}
20-
uses: actions/setup-java@v2
17+
uses: actions/setup-java@v3
2118
with:
2219
distribution: temurin
2320
java-version: ${{ matrix.jdk }}
2421
cache: 'maven'
2522
- name: Maven Test
2623
timeout-minutes: 60
2724
run: mvn -V -B -DtrimStackTrace=false clean verify
28-
continue-on-error: ${{ matrix.jdk == '16' }}
2925
- name: Maven Code Coverage
3026
if: ${{ github.ref == 'refs/heads/develop' && matrix.jdk == '8' && matrix.os == 'ubuntu-latest' }}
3127
env:

.github/workflows/ci-xqts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Set up JDK 8
13-
uses: actions/setup-java@v2
12+
- name: Set up JDK 17
13+
uses: actions/setup-java@v3
1414
with:
1515
distribution: temurin
16-
java-version: '8'
16+
java-version: '17'
1717
cache: 'maven'
1818
- name: Maven XQTS Build
1919
run: mvn -V -B clean package -DskipTests -Ddependency-check.skip=true --projects exist-xqts --also-make

.github/workflows/sonarcloud.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- uses: actions/checkout@v2
1515
with:
1616
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v2
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v3
1919
with:
2020
distribution: temurin
21-
java-version: 11
21+
java-version: 17
2222
- name: Cache SonarCloud packages
2323
uses: actions/cache@v2
2424
with:

.idea/runConfigurations/Java_Admin_Client.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Jetty_Server.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Local_Jetty_Server.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BUILD.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Building eXist-db from Source
22
--------------------------
33

4-
eXist-db itself is written in Java 8. The build system is [Apache Maven](http://maven.apache.org/). If you're not familiar with Git, we recommend [this excellent online interactive tutorial](http://try.github.io).
4+
eXist-db itself is written in Java 17. The build system is [Apache Maven](http://maven.apache.org/). If you're not familiar with Git, we recommend [this excellent online interactive tutorial](http://try.github.io).
55

66
To build eXist-db:
77

0 commit comments

Comments
 (0)