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.

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

updates docker and library dependencies to the latest version #235

Merged
merged 5 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# We don't scan documentation-only commits.
on: # yamllint disable-line rule:truthy
workflow_dispatch: # trigger ad-hoc runs of this action

Check warning on line 6 in .github/workflows/security.yml

View workflow job for this annotation

GitHub Actions / lint

6:22 [comments] too few spaces before comment
push: # non-tagged pushes to master
branches:
- master
Expand All @@ -24,7 +24,7 @@
jobs:
security:
name: security
runs-on: ubuntu-24.04 # newest available distribution, aka numbat
runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish
# skip commits made by the release plugin
if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
steps:
Expand All @@ -39,9 +39,6 @@
- name: Run Trivy vulnerability and secret scanner
uses: aquasecurity/trivy-action@master
id: trivy
env: # See https://github.com/aquasecurity/trivy/discussions/7668
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db
with:
scan-type: 'fs'
scan-ref: '.' # scan the entire repository
Expand Down
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
wrapperVersion=3.3.2
distributionType=bin
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
15 changes: 14 additions & 1 deletion benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,26 @@

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
<jmh.version>1.27</jmh.version>
<jmh.version>1.37</jmh.version>

<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<!-- Avoid CVEs in armeria deps -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
4 changes: 2 additions & 2 deletions build-bin/docker-compose-zipkin-gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ volumes:
gcp-service-account:
services:
extract-service-account:
image: ghcr.io/openzipkin/alpine:3.19.1
image: ghcr.io/openzipkin/alpine:3.21.2
volumes:
- gcp-service-account:/credentials:rw
command: -c 'echo $GOOGLE_APPLICATION_CREDENTIALS_BASE64 | base64 -d > /credentials/service-account-key.json'
environment:
- GOOGLE_APPLICATION_CREDENTIALS_BASE64
show-service-account:
image: ghcr.io/openzipkin/alpine:3.19.1
image: ghcr.io/openzipkin/alpine:3.21.2
volumes:
- gcp-service-account:/credentials:ro
# Show that the file exists as a sanity check in logs.
Expand Down
2 changes: 1 addition & 1 deletion build-bin/maven/maven_unjar
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fi

if ! test -f ${artifact_id}.jar && [ ${is_release} = "true" ]; then
mvn_get="mvn -q --batch-mode -Denforcer.fail=false \
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:get \
org.apache.maven.plugins:maven-dependency-plugin:3.8.1:get \
-Dtransitive=false -DgroupId=${group_id} -DartifactId=${artifact_id} -Dversion=${version}"

if [ -n "${classifier}" ]; then
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#

# zipkin version should match zipkin.version in /pom.xml
ARG zipkin_version=3.4.2
ARG zipkin_version=3.5.0

# java_version is used during the installation process to build or download the module jar.
#
# 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=21.0.5_p11
ARG java_version=21.0.6_p7

# 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
13 changes: 13 additions & 0 deletions module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@
<maven.compiler.release>17</maven.compiler.release>
</properties>

<!-- Avoid CVEs in armeria deps -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
Loading
Loading