Skip to content
Closed
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
10 changes: 0 additions & 10 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,6 @@
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
],
},
{
customType: 'regex',
datasourceTemplate: 'npm',
managerFilePatterns: [
'.github/workflows/**',
],
matchStrings: [
'npm install (?<depName>[^@\\s]+)@(?<currentValue>[^\\s]+)',
],
},
{
customType: 'regex',
datasourceTemplate: 'java-version',
Expand Down
27 changes: 27 additions & 0 deletions .github/scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .github/scripts/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"//": "Dependencies for GitHub Actions workflows that use actions/github-script",
"name": "github-scripts",
"version": "1.0.0",
"private": true,
"dependencies": {
"yaml": "2.8.1"
}
}
4 changes: 2 additions & 2 deletions .github/workflows/assign-issue-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

- name: Install yaml
run: npm install [email protected]
- name: Install yaml dependency used below
run: npm install .github/scripts

- name: Parse component label and assign owners
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-spotless-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
echo "exists=true" >> $GITHUB_OUTPUT
fi
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
if: steps.unzip-patch.outputs.exists == 'true'
id: otelbot-token
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Use CLA approved bot
run: .github/scripts/use-cla-approved-bot.sh

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: otelbot-token
with:
app-id: ${{ vars.OTELBOT_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ossf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
persist-credentials: false

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: create-token
with:
# analyzing classic branch protections requires a token with admin read permissions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Use CLA approved bot
run: .github/scripts/use-cla-approved-bot.sh

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: otelbot-token
with:
app-id: ${{ vars.OTELBOT_APP_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Use CLA approved bot
run: .github/scripts/use-cla-approved-bot.sh

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: otelbot-token
with:
app-id: ${{ vars.OTELBOT_APP_ID }}
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- name: Use CLA approved bot
run: .github/scripts/use-cla-approved-bot.sh

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: otelbot-token
with:
app-id: ${{ vars.OTELBOT_APP_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
java-version: 17

- name: Set up Gradle
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3

- name: Update apidiff baseline
env:
Expand All @@ -237,7 +237,7 @@ jobs:
- name: Use CLA approved bot
run: .github/scripts/use-cla-approved-bot.sh

- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
id: otelbot-token
with:
app-id: ${{ vars.OTELBOT_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ testing {
implementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3"))
implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.8-jre"))
implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.2"))
implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.3"))

compileOnly("com.google.auto.value:auto-value-annotations")
compileOnly("com.google.errorprone:error_prone_annotations")
Expand Down
4 changes: 2 additions & 2 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dependencies {

api("com.google.code.findbugs:annotations:3.0.1u2")
api("com.google.code.findbugs:jsr305:3.0.2")
api("com.uber.nullaway:nullaway:0.12.9")
api("org.assertj:assertj-core:3.27.4")
api("com.uber.nullaway:nullaway:0.12.10")
api("org.assertj:assertj-core:3.27.5")
api("org.awaitility:awaitility:4.3.0")
api("org.bouncycastle:bcpkix-jdk15on:1.70")
api("org.junit-pioneer:junit-pioneer:1.9.1")
Expand Down
2 changes: 1 addition & 1 deletion gcp-auth-extension/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")

// Only dependencies added to `implementation` configuration will be picked up by Shadow plugin
implementation("com.google.auth:google-auth-library-oauth2-http:1.39.0")
implementation("com.google.auth:google-auth-library-oauth2-http:1.39.1")

// Test dependencies
testCompileOnly("com.google.auto.service:auto-service-annotations")
Expand Down
2 changes: 1 addition & 1 deletion ibm-mq-metrics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
implementation("org.slf4j:slf4j-simple:2.0.17")
testImplementation("com.google.guava:guava")
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
integrationTestImplementation("org.assertj:assertj-core:3.27.4")
integrationTestImplementation("org.assertj:assertj-core:3.27.5")
integrationTestImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4")
integrationTestImplementation("io.opentelemetry:opentelemetry-sdk-testing")
integrationTestImplementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.5</version>
<version>3.5.6</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.opentelemetry.contrib.maven.test</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.5</version>
<version>3.5.6</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.opentelemetry.contrib.maven.test</groupId>
Expand Down
Loading