Merge pull request eXist-db#4574 from evolvedbinary/feature/java-17

Upgrade to Java 17

.github/dependabot.yml

@@ -7,9 +7,6 @@ updates:
     time: "03:00"
   open-pull-requests-limit: 10
   ignore:
-  - dependency-name: com.github.ben-manes.caffeine:caffeine
-    versions:
-    - ">= 3.a, < 4"
   - dependency-name: org.apache.lucene:lucene-analyzers-common
     versions:
     - ">= 8.a, < 9"
@@ -28,31 +25,10 @@ updates:
   - dependency-name: org.apache.lucene:lucene-queryparser
     versions:
     - ">= 8.a, < 9"
-  - dependency-name: org.aspectj:aspectjrt
-    versions:
-    - "> 1.9.4, < 1.10"
-  - dependency-name: org.aspectj:aspectjtools
-    versions:
-    - "> 1.9.4, < 1.10"
-  - dependency-name: net.sf.saxon:Saxon-HE
-    versions:
-    > "9"
-  - dependency-name: org.hsqldb:hsqldb
-    versions:
-    - 2.6.0
   - dependency-name: com.ibm.icu:icu4j
     versions:
     - "69.1"
-  - dependency-name: com.sun.mail:jakarta.mail
-    versions:
-    - 2.0.1
-  - dependency-name: com.sun.activation:jakarta.activation
-    versions:
-    - 2.0.1
   - dependency-name: com.mycila:license-maven-plugin
     versions:
     - "4.0"
     - 4.0.rc2
-  - dependency-name: org.owasp:dependency-check-maven
-    versions:
-    - 6.1.3

.github/workflows/ci-deploy.yml

@@ -10,11 +10,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: '17'
       - name: Make buildkit default
         uses: docker/setup-buildx-action@v1
         id: buildx

.github/workflows/ci-docs.yml

@@ -8,14 +8,14 @@ jobs:
     name: ${{ matrix.jdk }} Javadocs 
     strategy:
       matrix: 
-        jdk: ['8','11', '16']
+        jdk: ['17']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
             fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ matrix.jdk }}
@@ -27,5 +27,4 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Maven Javadoc
         run: mvn -V -B -q -T 2C javadoc:javadoc
-        continue-on-error: ${{ matrix.jdk != '8' }}
 

.github/workflows/ci-test.yml

@@ -4,28 +4,24 @@ jobs:
   test:
     name: (JDK ${{ matrix.jdk }} / ${{ matrix.os }}) Test
     env:
-      MAVEN_OPTS: -XX:+IgnoreUnrecognizedVMOptions --illegal-access=debug -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./
+      MAVEN_OPTS: -XX:StartFlightRecording=maxsize=5g,disk=true,dumponexit=true,settings=default,filename=./
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        jdk: ['8', '11']
-        include:
-          - os: ubuntu-latest
-            jdk: '16'
+        jdk: ['17']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: ${{ matrix.jdk }}
           cache: 'maven'
       - name: Maven Test
         timeout-minutes: 60
         run: mvn -V -B -DtrimStackTrace=false clean verify
-        continue-on-error: ${{ matrix.jdk == '16' }}
       - name: Maven Code Coverage
         if: ${{ github.ref == 'refs/heads/develop' && matrix.jdk == '8' && matrix.os == 'ubuntu-latest' }}
         env:

.github/workflows/ci-xqts.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: '17'
           cache: 'maven'
       - name: Maven XQTS Build
         run: mvn -V -B clean package -DskipTests -Ddependency-check.skip=true --projects exist-xqts --also-make

.github/workflows/sonarcloud.yml

@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v2
         with:

BUILD.md

@@ -1,7 +1,7 @@
 Building eXist-db from Source
 --------------------------
 
-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).
+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).
 
 To build eXist-db:
 

README.md

@@ -10,7 +10,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/eXist-db/exist/badge.svg?branch=develop)](https://coveralls.io/github/eXist-db/exist?branch=develop)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/ae1c8a7eb1164e919b0ac3c8588560c6)](https://www.codacy.com/gh/eXist-db/exist/dashboard?utm_source=github.com&utm_medium=referral&utm_content=eXist-db/exist&utm_campaign=Badge_Grade)
 [![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)
-[![Java 8](https://img.shields.io/badge/java-8-blue.svg)](https://adoptopenjdk.net/)
+[![Java 17](https://img.shields.io/badge/java-17-blue.svg)](https://adoptopenjdk.net/)
 [![License](https://img.shields.io/badge/license-LGPL%202.1-blue.svg)](https://www.gnu.org/licenses/lgpl-2.1.html)
 [![Download](https://img.shields.io/github/v/release/eXist-db/exist.svg)](https://github.com/eXist-db/exist/releases/)
 [![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

@@ -72,6 +72,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

exist-core/pom.xml

@@ -116,7 +116,7 @@
             <artifactId>jing</artifactId>
             <version>20220510</version>
             <exclusions>
-                <exclusion> <!-- conflicts with xerces 2.12.2 dependency on xml-apis version 1.4.01 -->
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
                 </exclusion>
@@ -272,6 +272,12 @@
             <artifactId>xercesImpl</artifactId>
             <version>2.12.2</version>
             <classifier>xml-schema-1.1</classifier>
+            <exclusions>
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -287,14 +293,16 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.util</groupId>
             <artifactId>ws-commons-util</artifactId>
             <version>1.0.2</version>
+            <exclusions>
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- xml-resolver is needed at runtime because xercesImpl declares this as optional,
@@ -310,6 +318,12 @@
             <groupId>org.xmlresolver</groupId>
             <artifactId>xmlresolver</artifactId>
             <version>${xmlresolver.version}</version>
+            <exclusions>
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -318,6 +332,12 @@
             <version>${xmlresolver.version}</version>
             <classifier>data</classifier>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- xpath2 and java-cup are needed at runtime because xercesImpl declares this as optional,
@@ -338,7 +358,13 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.2</version> <!-- needed an compile time for various dependencies -->
+            <version>2.7.2</version> <!-- needed at compile time for various dependencies -->
+            <exclusions>
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -363,7 +389,7 @@
             <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
             <artifactId>xmlrpc-common</artifactId>
             <exclusions>
-                <exclusion> <!-- conflicts with xerces 2.12.0 dependency on xml-apis version 1.4.01 -->
+                <exclusion> <!-- conflicts with Java 17's javax.xml module -->
                     <artifactId>xml-apis</artifactId>
                     <groupId>xml-apis</groupId>
                 </exclusion>
@@ -403,11 +429,13 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
             <version>${jetty.version}</version>
+            <!-- NOTE: needed for both scopes: <scope>runtime</scope><scope>test</scope> -->
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
             <version>${jetty.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -521,6 +549,7 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-matchers</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
@@ -933,6 +962,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jcl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jul:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
 
                                 <ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime:jar:${jaxb.impl.version}</ignoredUnusedDeclaredDependency>
                                 <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
                                 <ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-deploy:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-jmx:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-annotations:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-security:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
+
+                            <ignoredNonTestScopedDependencies>
+                                <ignoredNonTestScopedDependency>org.eclipse.jetty:jetty-http:jar:${jetty.version}</ignoredNonTestScopedDependency>
+                            </ignoredNonTestScopedDependencies>
                         </configuration>
                     </execution>
                 </executions>
@@ -987,9 +1022,9 @@ The BaseX Team. The original license statement is also included below.]]></pream
             </plugin>
 
             <plugin>
-                <groupId>com.nickwongdev</groupId>
+                <groupId>dev.aspectj</groupId>
                 <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.12.6</version>
+                <version>1.13.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.aspectj</groupId>

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

@@ -52,8 +52,8 @@
  * The global SymbolTable singleton can be retrieved from {@link org.exist.storage.BrokerPool#getSymbols()}.
  * It is saved into the database file "symbols.dbx".
  *
- * @author <a href="mailto:[email protected]">wolf</a>
- * @author Adam Retter
+ * @author <a href="mailto:[email protected]">Wolfgang Meier</a>
+ * @author <a href="mailto:[email protected]">Adam Retter</a>
  */
 public class SymbolTable implements BrokerPoolService, Closeable {
 
@@ -438,8 +438,8 @@ public void close() throws IOException {
     /**
      * Represents a distinct collection of symbols
      *
-     * @author <a href="mailto:adam@exist-db.org">wolf
-     * @author Adam Retter</a>
+     * @author <a href="mailto:wolfgang@exist-db.org">Wolfgang Meier</a>
+     * @author <a href="mailto:[email protected]">Adam Retter</a>
      */
     protected class SymbolCollection {