Skip to content

Commit bc815e4

Browse files
dizzzzdizzzz
authored
Merge pull request eXist-db#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

-24
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

+3-3
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

+2-3
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

+3-7
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

+3-3
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

+3-3
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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations/Jetty_Server.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations/Local_Jetty_Server.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BUILD.md

+1-1
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

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![Coverage Status](https://coveralls.io/repos/github/eXist-db/exist/badge.svg?branch=develop)](https://coveralls.io/github/eXist-db/exist?branch=develop)
1111
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/ae1c8a7eb1164e919b0ac3c8588560c6)](https://www.codacy.com/gh/eXist-db/exist/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=eXist-db/exist&amp;utm_campaign=Badge_Grade)
1212
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=eXist-db_exist&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=eXist-db_exist)
13-
[![Java 8](https://img.shields.io/badge/java-8-blue.svg)](https://adoptopenjdk.net/)
13+
[![Java 17](https://img.shields.io/badge/java-17-blue.svg)](https://adoptopenjdk.net/)
1414
[![License](https://img.shields.io/badge/license-LGPL%202.1-blue.svg)](https://www.gnu.org/licenses/lgpl-2.1.html)
1515
[![Download](https://img.shields.io/github/v/release/eXist-db/exist.svg)](https://github.com/eXist-db/exist/releases/)
1616
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.exist-db/exist/badge.svg)](https://search.maven.org/search?q=g:org.exist-db)

‎exist-ant/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.code.findbugs</groupId>
7474
<artifactId>jsr305</artifactId>
75+
<scope>test</scope>
7576
</dependency>
7677

7778
<dependency>

‎exist-core/pom.xml

+44-9
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<artifactId>jing</artifactId>
117117
<version>20220510</version>
118118
<exclusions>
119-
<exclusion> <!-- conflicts with xerces 2.12.2 dependency on xml-apis version 1.4.01 -->
119+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
120120
<groupId>xml-apis</groupId>
121121
<artifactId>xml-apis</artifactId>
122122
</exclusion>
@@ -272,6 +272,12 @@
272272
<artifactId>xercesImpl</artifactId>
273273
<version>2.12.2</version>
274274
<classifier>xml-schema-1.1</classifier>
275+
<exclusions>
276+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
277+
<groupId>xml-apis</groupId>
278+
<artifactId>xml-apis</artifactId>
279+
</exclusion>
280+
</exclusions>
275281
</dependency>
276282

277283
<dependency>
@@ -287,14 +293,16 @@
287293
</exclusions>
288294
</dependency>
289295

290-
<dependency>
291-
<groupId>xml-apis</groupId>
292-
<artifactId>xml-apis</artifactId>
293-
</dependency>
294296
<dependency>
295297
<groupId>org.apache.ws.commons.util</groupId>
296298
<artifactId>ws-commons-util</artifactId>
297299
<version>1.0.2</version>
300+
<exclusions>
301+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
302+
<groupId>xml-apis</groupId>
303+
<artifactId>xml-apis</artifactId>
304+
</exclusion>
305+
</exclusions>
298306
</dependency>
299307

300308
<!-- xml-resolver is needed at runtime because xercesImpl declares this as optional,
@@ -310,6 +318,12 @@
310318
<groupId>org.xmlresolver</groupId>
311319
<artifactId>xmlresolver</artifactId>
312320
<version>${xmlresolver.version}</version>
321+
<exclusions>
322+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
323+
<groupId>xml-apis</groupId>
324+
<artifactId>xml-apis</artifactId>
325+
</exclusion>
326+
</exclusions>
313327
</dependency>
314328

315329
<dependency>
@@ -318,6 +332,12 @@
318332
<version>${xmlresolver.version}</version>
319333
<classifier>data</classifier>
320334
<scope>runtime</scope>
335+
<exclusions>
336+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
337+
<groupId>xml-apis</groupId>
338+
<artifactId>xml-apis</artifactId>
339+
</exclusion>
340+
</exclusions>
321341
</dependency>
322342

323343
<!-- xpath2 and java-cup are needed at runtime because xercesImpl declares this as optional,
@@ -338,7 +358,13 @@
338358
<dependency>
339359
<groupId>xalan</groupId>
340360
<artifactId>xalan</artifactId>
341-
<version>2.7.2</version> <!-- needed an compile time for various dependencies -->
361+
<version>2.7.2</version> <!-- needed at compile time for various dependencies -->
362+
<exclusions>
363+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
364+
<groupId>xml-apis</groupId>
365+
<artifactId>xml-apis</artifactId>
366+
</exclusion>
367+
</exclusions>
342368
</dependency>
343369

344370
<dependency>
@@ -363,7 +389,7 @@
363389
<groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
364390
<artifactId>xmlrpc-common</artifactId>
365391
<exclusions>
366-
<exclusion> <!-- conflicts with xerces 2.12.0 dependency on xml-apis version 1.4.01 -->
392+
<exclusion> <!-- conflicts with Java 17's javax.xml module -->
367393
<artifactId>xml-apis</artifactId>
368394
<groupId>xml-apis</groupId>
369395
</exclusion>
@@ -403,11 +429,13 @@
403429
<groupId>org.eclipse.jetty</groupId>
404430
<artifactId>jetty-http</artifactId>
405431
<version>${jetty.version}</version>
432+
<!-- NOTE: needed for both scopes: <scope>runtime</scope><scope>test</scope> -->
406433
</dependency>
407434
<dependency>
408435
<groupId>org.eclipse.jetty</groupId>
409436
<artifactId>jetty-security</artifactId>
410437
<version>${jetty.version}</version>
438+
<scope>runtime</scope>
411439
</dependency>
412440
<dependency>
413441
<groupId>org.eclipse.jetty</groupId>
@@ -521,6 +549,7 @@
521549
<dependency>
522550
<groupId>org.xmlunit</groupId>
523551
<artifactId>xmlunit-matchers</artifactId>
552+
<scope>test</scope>
524553
</dependency>
525554
<dependency>
526555
<groupId>org.xmlunit</groupId>
@@ -933,6 +962,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
933962
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
934963
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jcl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
935964
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
965+
<ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jul:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
936966

937967
<ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime:jar:${jaxb.impl.version}</ignoredUnusedDeclaredDependency>
938968
<ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi:jar:2.4.0</ignoredUnusedDeclaredDependency>
@@ -945,8 +975,13 @@ The BaseX Team. The original license statement is also included below.]]></pream
945975
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-deploy:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
946976
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-jmx:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
947977
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-annotations:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
978+
<ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-security:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
948979
<ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>
949980
</ignoredUnusedDeclaredDependencies>
981+
982+
<ignoredNonTestScopedDependencies>
983+
<ignoredNonTestScopedDependency>org.eclipse.jetty:jetty-http:jar:${jetty.version}</ignoredNonTestScopedDependency>
984+
</ignoredNonTestScopedDependencies>
950985
</configuration>
951986
</execution>
952987
</executions>
@@ -987,9 +1022,9 @@ The BaseX Team. The original license statement is also included below.]]></pream
9871022
</plugin>
9881023

9891024
<plugin>
990-
<groupId>com.nickwongdev</groupId>
1025+
<groupId>dev.aspectj</groupId>
9911026
<artifactId>aspectj-maven-plugin</artifactId>
992-
<version>1.12.6</version>
1027+
<version>1.13.1</version>
9931028
<dependencies>
9941029
<dependency>
9951030
<groupId>org.aspectj</groupId>

‎exist-core/src/main/java/org/exist/dom/persistent/SymbolTable.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
* The global SymbolTable singleton can be retrieved from {@link org.exist.storage.BrokerPool#getSymbols()}.
5353
* It is saved into the database file "symbols.dbx".
5454
*
55-
* @author <a href="mailto:[email protected]">wolf</a>
56-
* @author Adam Retter
55+
* @author <a href="mailto:[email protected]">Wolfgang Meier</a>
56+
* @author <a href="mailto:[email protected]">Adam Retter</a>
5757
*/
5858
public class SymbolTable implements BrokerPoolService, Closeable {
5959

@@ -438,8 +438,8 @@ public void close() throws IOException {
438438
/**
439439
* Represents a distinct collection of symbols
440440
*
441-
* @author <a href="mailto:adam@exist-db.org">wolf
442-
* @author Adam Retter</a>
441+
* @author <a href="mailto:wolfgang@exist-db.org">Wolfgang Meier</a>
442+
* @author <a href="mailto:[email protected]">Adam Retter</a>
443443
*/
444444
protected class SymbolCollection {
445445

0 commit comments

Comments
 (0)