Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest Java base container, update Armeria and Spring deps #3472

Merged
merged 1 commit into from
Aug 23, 2022
Merged

Upgrade to latest Java base container, update Armeria and Spring deps #3472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -874,4 +874,4 @@
</build>
</profile>
</profiles>
</project>
</project>
3 changes: 2 additions & 1 deletion ...erver/src/test/java/zipkin2/server/internal/elasticsearch/ITElasticsearchHealthCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down