From 926fca204666b57d16bf19c38d9182787719583c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 26 Jan 2022 15:42:16 -0500
Subject: [PATCH 1/5] Add Java 17 to the CI matrix

---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73c35f57a..4ec27099e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,16 +11,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "default" }
-          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375" }
-          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" }
+          - { name: "default", javaVersion: 8 }
+          - { name: "default", javaVersion: 17 }
+          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
+          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: ${{matrix.javaVersion}}
       - name: Configure Docker
         env:
           DOCKER_VERSION: ${{matrix.dockerVersion}}

From c572ce30a636c820baaa8e6af99bb769c1f07b2a Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 26 Jan 2022 15:43:31 -0500
Subject: [PATCH 2/5] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ec27099e..109b7cffb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         include:
           - { name: "default", javaVersion: 8 }
-          - { name: "default", javaVersion: 17 }
+          - { name: "default", javaVersion: 16 }
           - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
           - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
 

From 44243f200997adc3da110ec9b7655c7b99e034b1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 26 Jan 2022 15:45:33 -0500
Subject: [PATCH 3/5] Update Lombok

---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 92b46a613..1016da4ec 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.18</version>
+			<version>1.18.22</version>
 			<scope>provided</scope>
 		</dependency>
 

From a27c3a33c68490d44c871f42a48e73cabd314950 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 26 Jan 2022 15:50:27 -0500
Subject: [PATCH 4/5] update japicmp

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4a036a8e3..070fc2e74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.14.3</version>
+					<version>0.15.4</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From 5b0c4a57e63dee4d36d2dbbf7119213177aea6e2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 27 Jan 2022 14:03:17 -0500
Subject: [PATCH 5/5] Update Lombok, use Java 17

---
 .github/workflows/ci.yml | 2 +-
 docker-java/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 109b7cffb..4ec27099e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         include:
           - { name: "default", javaVersion: 8 }
-          - { name: "default", javaVersion: 16 }
+          - { name: "default", javaVersion: 17 }
           - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
           - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b9db85b9c..453851ce1 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -137,7 +137,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.18</version>
+			<version>1.18.22</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>