From dcb80b4bb8eca8ae45cfcb46624210d934bd2501 Mon Sep 17 00:00:00 2001
From: Lance Linder <lance@tetrate.io>
Date: Fri, 19 Aug 2022 14:05:32 -0500
Subject: [PATCH] Upgrade to latest Java base container, update Armeria and
 Spring deps

---
 docker/Dockerfile                                      |  2 +-
 pom.xml                                                | 10 +++++-----
 .../elasticsearch/ITElasticsearchHealthCheck.java      |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1246f2a6ae4..7acb0718301 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,7 +17,7 @@
 # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
 # This is defined in many places because Docker has no "env" script functionality unless you use
 # docker-compose: When updating, update everywhere.
-ARG java_version=15.0.7_p4
+ARG java_version=15.0.8_p4
 
 # We copy files from the context into a scratch container first to avoid a problem where docker and
 # docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
diff --git a/pom.xml b/pom.xml
index b833258d455..849151d13ec 100755
--- a/pom.xml
+++ b/pom.xml
@@ -51,22 +51,22 @@
 
     <!-- This allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>1.13.4</armeria.version>
+    <armeria.version>1.17.2</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.70.Final</netty.version>
+    <netty.version>4.1.78.Final</netty.version>
 
     <!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
     <jackson.version>2.13.2.1</jackson.version>
 
     <java-driver.version>4.11.3</java-driver.version>
-    <micrometer.version>1.6.12</micrometer.version>
+    <micrometer.version>1.9.3</micrometer.version>
 
     <!-- Used for Generated annotations -->
     <javax-annotation-api.version>1.3.1</javax-annotation-api.version>
 
     <!-- update together -->
     <spring-boot.version>2.5.14</spring-boot.version>
-    <spring.version>5.3.20</spring.version>
+    <spring.version>5.3.22</spring.version>
 
     <!-- MySQL connector is GPL, even if it has an OSS exception.
          https://www.mysql.com/about/legal/licensing/foss-exception/
@@ -874,4 +874,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ITElasticsearchHealthCheck.java b/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ITElasticsearchHealthCheck.java
index 0a0eacd7070..27462589e65 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ITElasticsearchHealthCheck.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ITElasticsearchHealthCheck.java
@@ -14,6 +14,7 @@
 package zipkin2.server.internal.elasticsearch;
 
 import com.linecorp.armeria.client.endpoint.EmptyEndpointGroupException;
+import com.linecorp.armeria.client.endpoint.EndpointSelectionTimeoutException;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.server.healthcheck.HealthCheckService;
 import com.linecorp.armeria.server.healthcheck.SettableHealthChecker;
@@ -132,7 +133,7 @@ private void initWithHosts(String hosts) {
       CheckResult result = storage.check();
       assertThat(result.ok()).isFalse();
       assertThat(result.error())
-        .isInstanceOf(EmptyEndpointGroupException.class);
+        .isInstanceOf(EndpointSelectionTimeoutException.class);
     }
   }