diff --git a/.github/workflows/jdk-compat.yml b/.github/workflows/jdk-compat.yml index 5b1f7fbcf..6c808c7d2 100644 --- a/.github/workflows/jdk-compat.yml +++ b/.github/workflows/jdk-compat.yml @@ -2,7 +2,7 @@ name: jdk-compat on: push: - branches: [ develop ] + branches: [ develop, jdk17 ] jobs: build: diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 1ccbb3194..64d12f261 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -2,9 +2,9 @@ name: maven-build on: push: - branches: [ master, develop, java11 ] + branches: [ master, develop, jdk17 ] pull_request: - branches: [ master, develop ] + branches: [ master, develop, jdk17 ] jobs: build: @@ -13,11 +13,11 @@ jobs: steps: - name: git checkout uses: actions/checkout@v4 - - name: set up jdk 11 + - name: set up jdk 17 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17 - name: cache maven packages uses: actions/cache@v3 with: diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index e91ff9f72..dad7f48be 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -15,11 +15,11 @@ jobs: steps: - name: git checkout uses: actions/checkout@v4 - - name: set up jdk 11 + - name: set up jdk 17 uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17 server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD diff --git a/karate-docker/karate-chrome/Dockerfile b/karate-docker/karate-chrome/Dockerfile index a41eab619..fa1df2c39 100644 --- a/karate-docker/karate-chrome/Dockerfile +++ b/karate-docker/karate-chrome/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3-jdk-11 +FROM maven:3-jdk-17 LABEL maintainer="Peter Thomas" LABEL url="https://github.com/karatelabs/karate/tree/master/karate-docker/karate-chrome"