Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
with:
languages: java

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

- name: Cache local Maven repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-smoke-tests-fake-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
# cache local patch outputs
- name: Cache local Maven repository
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/e2e-tests-app-with-java-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

# cache local patch outputs
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down Expand Up @@ -112,9 +112,9 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down Expand Up @@ -143,9 +143,9 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-tests-with-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

# cache local patch outputs
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
path: aws-otel-java-instrumentation

- name: Set up JDK 11
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'zulu'
java-version: '11'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin
# vaadin 14 tests fail with node 18
- name: Set up Node
Expand Down Expand Up @@ -57,9 +57,9 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

# cache local patch outputs
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 23
distribution: 'temurin'
Expand Down Expand Up @@ -232,9 +232,9 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- name: Build Application Signals Lambda Layer
working-directory: lambda-layer
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-upstream-snapshot-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'

# cache local patch outputs
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 23
distribution: 'temurin'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/owasp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
fetch-depth: 0

- name: Set up Java for dependency scan
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'

- name: Configure AWS credentials for dependency scan
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/patch-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ jobs:
with:
ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin
# vaadin 14 tests fail with node 18
- name: Set up Node
Expand Down Expand Up @@ -56,9 +56,9 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
./gradlew build -p exporters/aws-distro-opentelemetry-xray-udp-span-exporter

- name: Set up Java version for tests
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 23
distribution: temurin
Expand All @@ -109,9 +109,9 @@ jobs:
arguments: contractTests -PlocalDocker=true -i

- name: Set up Java version for image build
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

- name: Get current version
Expand Down Expand Up @@ -168,9 +168,9 @@ jobs:
uses: actions/checkout@v5

- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: temurin

- name: Build layer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ jobs:
- name: Checkout Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v5

- uses: actions/setup-java@v4
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: 17
java-version-file: .java-version
distribution: 'temurin'

- name: Build layers
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-udp-exporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
uses: actions/checkout@v5

- name: Set up Java
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: '17'
java-version-file: .java-version
distribution: 'temurin'
cache: 'gradle'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/udp-exporter-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
uses: actions/checkout@v5

- name: Set up Java
uses: actions/setup-java@v4
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
java-version: '17'
java-version-file: .java-version
distribution: 'temurin'
cache: 'gradle'

Expand Down
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
21
Loading