Skip to content

Commit

Permalink
prep for jdk 17 bump #2390
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrthomas committed Sep 22, 2023
1 parent 51ae32d commit 1a106f0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jdk-compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: jdk-compat

on:
push:
branches: [ develop ]
branches: [ develop, jdk17 ]

jobs:
build:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion karate-docker/karate-chrome/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 1a106f0

Please sign in to comment.