From 2719466e96eb27f7d87425138a355755a10eb103 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 26 Sep 2022 12:29:02 +0100 Subject: [PATCH] [refactor] Update build for Java 17 --- .github/dependabot.yml | 24 ------- .github/workflows/ci-deploy.yml | 6 +- .github/workflows/ci-docs.yml | 5 +- .github/workflows/ci-test.yml | 8 +-- .github/workflows/ci-xqts.yml | 6 +- .github/workflows/sonarcloud.yml | 6 +- .idea/runConfigurations/Java_Admin_Client.xml | 2 +- .idea/runConfigurations/Jetty_Server.xml | 2 +- .../runConfigurations/Local_Jetty_Server.xml | 2 +- BUILD.md | 2 +- README.md | 2 +- exist-core/pom.xml | 44 +++++++++--- .../internal/HttpSessionAuthentication.java | 71 ------------------- .../src/main/resources-filtered/Dockerfile | 29 ++++---- .../main/resources-filtered/Dockerfile-DEBUG | 6 +- .../src/main/resources-filtered/README.md | 2 +- exist-parent/pom.xml | 8 +-- 17 files changed, 73 insertions(+), 152 deletions(-) delete mode 100644 exist-core/src/main/java/org/exist/security/internal/HttpSessionAuthentication.java diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a072bff0d98..aa9a2f9f2cc 100644 --- a/.github/dependabot.yml +++ b/.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 diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index 51f6aa49537..59769185422 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.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 diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index e7897c6ee94..8c04c6cbf9b 100644 --- a/.github/workflows/ci-docs.yml +++ b/.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' }} \ No newline at end of file diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index fc83c813bcb..a4bf5befad0 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -9,15 +9,12 @@ jobs: 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 }} @@ -25,7 +22,6 @@ jobs: - 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: diff --git a/.github/workflows/ci-xqts.yml b/.github/workflows/ci-xqts.yml index b071d077baf..5998723370f 100644 --- a/.github/workflows/ci-xqts.yml +++ b/.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 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index f0ad2ecbe89..305fcff11ce 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.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: diff --git a/.idea/runConfigurations/Java_Admin_Client.xml b/.idea/runConfigurations/Java_Admin_Client.xml index 9c4c81b9c44..5c7e17dfbb6 100644 --- a/.idea/runConfigurations/Java_Admin_Client.xml +++ b/.idea/runConfigurations/Java_Admin_Client.xml @@ -1,6 +1,6 @@ -