Skip to content

Commit 280feff

Browse files
Updates all dependencies and changes build from 11/21 to 11/25
Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent a85b3c5 commit 280feff

File tree

27 files changed

+100
-114
lines changed

27 files changed

+100
-114
lines changed

.github/workflows/create_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
runs-on: ubuntu-24.04 # newest available distribution, aka noble
1515
steps:
1616
- name: Checkout Repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
with:
1919
# Prevent use of implicit GitHub Actions read-only token GITHUB_TOKEN. We don't deploy on
2020
# the tag MAJOR.MINOR.PATCH event, but we still need to deploy the maven-release-plugin master commit.
2121
token: ${{ secrets.GH_TOKEN }}
2222
- name: Setup java
23-
uses: actions/setup-java@v4
23+
uses: actions/setup-java@v5
2424
with:
2525
distribution: 'zulu' # zulu as it supports a wide version range
2626
java-version: '11' # earliest LTS and last that can compile the 1.6 release profile.
2727
- name: Cache local Maven repository
28-
uses: actions/cache@v4
28+
uses: actions/cache@v5
2929
with:
3030
path: ~/.m2/repository
3131
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ jobs:
2929
deploy_script: build-bin/deploy_bom
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
# Prevent use of implicit GitHub Actions read-only token GITHUB_TOKEN.
3535
# We push Javadocs to the gh-pages branch on commit.
3636
token: ${{ secrets.GH_TOKEN }}
3737
fetch-depth: 0 # build-bin/javadoc_to_gh_pages checks out gh-pages
3838
- name: Setup java
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
distribution: 'zulu' # zulu as it supports a wide version range
4242
java-version: '11' # earliest LTS and last that can compile the 1.6 release profile.
4343
- name: Cache local Maven repository
44-
uses: actions/cache@v4
44+
uses: actions/cache@v5
4545
with:
4646
path: ~/.m2/repository
4747
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/security.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
2929
steps:
3030
- name: Checkout Repository
31-
uses: actions/checkout@v4
32-
- uses: actions/cache@v4
31+
uses: actions/checkout@v6
32+
- uses: actions/cache@v5
3333
name: Cache Trivy Database
3434
with:
3535
path: .trivy
3636
key: ${{ runner.os }}-trivy
3737
restore-keys: ${{ runner.os }}-trivy
3838
- name: Run Trivy vulnerability and secret scanner
39-
uses: aquasecurity/trivy-action@master
39+
uses: aquasecurity/trivy-action@v0.35.0
4040
id: trivy
4141
with:
4242
scan-type: 'fs'

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626
- name: Setup java
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
distribution: 'zulu' # zulu as it supports a wide version range
3030
java-version: '11' # earliest LTS and last that can compile the 1.6 release profile.
3131
- name: Cache local Maven repository
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.m2/repository
3535
key: ${{ runner.os }}-jdk-11-maven-${{ hashFiles('**/pom.xml') }}
@@ -47,17 +47,17 @@ jobs:
4747
include:
4848
- java_version: 11 # Last that can compile brave to 1.6
4949
maven_args: -Prelease -Dgpg.skip -Dmaven.javadoc.skip=true
50-
- java_version: 21 # Most recent LTS
50+
- java_version: 25 # Most recent LTS
5151
steps:
5252
- name: Checkout Repository
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v6
5454
- name: Setup java
55-
uses: actions/setup-java@v4
55+
uses: actions/setup-java@v5
5656
with:
5757
distribution: 'zulu' # zulu as it supports a wide version range
5858
java-version: ${{ matrix.java_version }}
5959
- name: Cache local Maven repository
60-
uses: actions/cache@v4
60+
uses: actions/cache@v5
6161
with:
6262
path: ~/.m2/repository
6363
key: ${{ runner.os }}-jdk-${{ matrix.java_version }}-maven-${{ hashFiles('**/pom.xml') }}

.mvn/wrapper/maven-wrapper.jar

65 Bytes
Binary file not shown.
Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=bin
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
20-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip
4+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

instrumentation/benchmarks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<main.basedir>${project.basedir}/../..</main.basedir>
2020
<jmh.version>1.37</jmh.version>
2121
<!-- Note: versions above 2.2 move to jakarta package -->
22-
<undertow-servlet.version>2.2.31.Final</undertow-servlet.version>
22+
<undertow-servlet.version>2.2.39.Final</undertow-servlet.version>
2323
</properties>
2424

2525
<!-- All dependencies are marked test, because benchmarks are a form of test.

instrumentation/dubbo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<main.basedir>${project.basedir}/../..</main.basedir>
2323

24-
<dubbo.version>3.3.0-beta.2</dubbo.version>
24+
<dubbo.version>3.3.6</dubbo.version>
2525
<!-- add opens to avoid below in JRE 21:
2626
com.alibaba.com.caucho.hessian.io.JavaSerializer -->
2727
<maven-failsafe-plugin.argLine>

instrumentation/grpc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- disable mutability warning as TagContextBinaryMarshaller intentionally returns mixed -->
3131
<errorprone.args>-Xep:MixedMutabilityReturnType:OFF</errorprone.args>
3232

33-
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
33+
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
3434
</properties>
3535

3636
<dependencies>

instrumentation/httpclient5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<main.basedir>${project.basedir}/../..</main.basedir>
2525

2626
<!-- To obey the integration tests, we need to use the version >= 5.2 -->
27-
<httpclient5.version>5.4.1</httpclient5.version>
27+
<httpclient5.version>5.6</httpclient5.version>
2828
</properties>
2929

3030
<dependencies>

0 commit comments

Comments
 (0)