Skip to content

Commit eedf7b0

Browse files
authored
Merge branch 'main' into dependabot/gradle/org.testcontainers-postgresql-1.21.3
2 parents 0b17fab + 0a87c6c commit eedf7b0

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/application-signals-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
role-to-assume: arn:aws:iam::${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ACCOUNT_ID }}:role/${{ secrets.APPLICATION_SIGNALS_E2E_TEST_ROLE_NAME }}
3232
aws-region: us-east-1
3333

34-
- uses: actions/download-artifact@v4
34+
- uses: actions/download-artifact@v5
3535
with:
3636
name: aws-opentelemetry-agent.jar
3737

.github/workflows/release-lambda.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
echo BUCKET_NAME=java-lambda-layer-${{ github.run_id }}-${{ matrix.aws_region }} | tee --append $GITHUB_ENV
9999
100100
- name: download layer.zip
101-
uses: actions/download-artifact@v4
101+
uses: actions/download-artifact@v5
102102
with:
103103
name: aws-opentelemetry-java-layer.zip
104104

@@ -157,7 +157,7 @@ jobs:
157157
uses: actions/checkout@v4
158158
- uses: hashicorp/setup-terraform@v2
159159
- name: download layerARNs
160-
uses: actions/download-artifact@v4
160+
uses: actions/download-artifact@v5
161161
with:
162162
pattern: ${{ env.LAYER_NAME }}-*
163163
path: ${{ env.LAYER_NAME }}
@@ -206,7 +206,7 @@ jobs:
206206
echo "}" >> ../layer_cdk
207207
cat ../layer_cdk
208208
- name: download layer.zip
209-
uses: actions/download-artifact@v4
209+
uses: actions/download-artifact@v5
210210
with:
211211
name: layer.zip
212212
- name: Get commit hash

.github/workflows/release-udp-exporter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v4
3030

3131
- name: Set up Java
32-
uses: actions/setup-java@v3
32+
uses: actions/setup-java@v4
3333
with:
3434
java-version: '17'
3535
distribution: 'temurin'

.github/workflows/udp-exporter-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717

1818
- name: Set up Java
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: '17'
2222
distribution: 'temurin'

appsignals-tests/images/http-servers/tomcat/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ application {
3131
}
3232

3333
dependencies {
34-
implementation("org.apache.tomcat.embed:tomcat-embed-core:10.1.10")
34+
implementation("org.apache.tomcat.embed:tomcat-embed-core:11.0.6")
3535
implementation("io.opentelemetry:opentelemetry-api")
3636
}
3737

0 commit comments

Comments
 (0)