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

Routine dependency updates #223

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Routine dependency updates #223

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
6 changes: 3 additions & 3 deletions build-bin/docker/docker_test_image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ docker_container=${3:-sut}
# First try to run the intended containers.
health_rc=0
if test -f "${docker_compose_file}"; then
docker-compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
docker compose -f "${docker_compose_file}" up --remove-orphans -d --quiet-pull || health_rc=1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, seems like Github is phasing out compose v1 in favor of compose v2

else
docker run --name ${docker_container} -d ${DOCKER_IMAGE} || health_rc=1
fi
Expand All @@ -36,7 +36,7 @@ if [ "${health_rc}" = "1" ] || ! build-bin/docker/docker_block_on_health ${docke

# Log any containers output to console before we remove them.
if test -f "${docker_compose_file}"; then
docker-compose -f "${docker_compose_file}" logs
docker compose -f "${docker_compose_file}" logs
else
docker logs ${docker_container} || true
fi
Expand All @@ -45,7 +45,7 @@ fi

# Clean up any containers, so that we can run this again without conflict.
if test -f "${docker_compose_file}"; then
docker-compose -f "${docker_compose_file}" down
docker compose -f "${docker_compose_file}" down
else
docker kill ${docker_container} && docker rm ${docker_container}
fi
Expand Down
32 changes: 16 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
<!-- matching armeria/grpc/zipkin -->
<zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
<!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
<zipkin.version>3.4.0</zipkin.version>
<zipkin.version>3.4.1</zipkin.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<spring-boot.version>3.3.0</spring-boot.version>
<jackson.version>2.17.1</jackson.version>
<spring-boot.version>3.3.3</spring-boot.version>
<jackson.version>2.17.2</jackson.version>
<!-- This allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
<armeria.version>1.28.4</armeria.version>
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
<netty.version>4.1.110.Final</netty.version>
<netty.version>4.1.113.Final</netty.version>
<log4j.version>2.23.1</log4j.version>

<!-- This allows you to test feature branches with jitpack -->
Expand All @@ -92,14 +92,14 @@
<okhttp.version>4.12.0</okhttp.version>

<assertj.version>3.25.3</assertj.version>
<awaitility.version>4.2.1</awaitility.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<mockito.version>5.12.0</mockito.version>
<awaitility.version>4.2.2</awaitility.version>
<junit-jupiter.version>5.11.0</junit-jupiter.version>
<mockito.version>5.13.0</mockito.version>

<!-- override to set exclusions per-project -->
<errorprone.args />
<errorprone.version>2.27.1</errorprone.version>
<auto-value.version>1.10.4</auto-value.version>
<errorprone.version>2.30.0</errorprone.version>
<auto-value.version>1.11.0</auto-value.version>

<license.skip>${skipTests}</license.skip>

Expand All @@ -108,22 +108,22 @@

<go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
<license-maven-plugin.version>4.3</license-maven-plugin.version>
<license-maven-plugin.version>4.5</license-maven-plugin.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<!-- Use same version as https://github.com/openzipkin/docker-java -->
<maven-help-plugin.version>3.4.0</maven-help-plugin.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
</properties>

Expand Down Expand Up @@ -175,7 +175,7 @@

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Loading