Skip to content

Commit 35550b0

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents d74fe56 + 81974e2 commit 35550b0

File tree

43 files changed

+306
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+306
-143
lines changed
File renamed without changes.

.github/renovate.json5

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
],
8686
enabled: false,
8787
matchPackageNames: [
88-
'org.mockito:{/,}**',
88+
'org.mockito:**',
8989
],
9090
},
9191
{
@@ -123,25 +123,33 @@
123123
matchCurrentVersion: '3.5.0',
124124
enabled: false,
125125
matchPackageNames: [
126-
'org.apache.maven:{/,}**',
126+
'org.apache.maven:**',
127127
],
128128
},
129129
{
130130
groupName: 'spotless packages',
131131
matchPackageNames: [
132-
'com.diffplug.spotless{/,}**',
132+
'com.diffplug.spotless',
133+
'com.diffplug.spotless:**',
133134
],
134135
},
135136
{
136137
groupName: 'hipparchus packages',
137138
matchPackageNames: [
138-
'org.hipparchus{/,}**',
139+
'org.hipparchus:**',
139140
],
140141
},
141142
{
142143
groupName: 'errorprone packages',
143144
matchPackageNames: [
144-
'com.google.errorprone{/,}**',
145+
'com.google.errorprone:**',
146+
],
147+
},
148+
{
149+
groupName: 'jackson packages',
150+
matchPackageNames: [
151+
'com.fasterxml.jackson:**',
152+
'com.fasterxml.jackson.core:**',
145153
],
146154
},
147155
{
@@ -151,7 +159,7 @@
151159
],
152160
enabled: false,
153161
matchPackageNames: [
154-
'org.openjdk.jmc{/,}**',
162+
'org.openjdk.jmc:**',
155163
],
156164
},
157165
{
@@ -162,7 +170,7 @@
162170
matchCurrentVersion: '5.0.0',
163171
enabled: false,
164172
matchPackageNames: [
165-
'jakarta.servlet:{/,}**',
173+
'jakarta.servlet:**',
166174
],
167175
},
168176
{
@@ -175,7 +183,7 @@
175183
],
176184
enabled: false,
177185
matchPackageNames: [
178-
'org.springframework.boot{/,}**',
186+
'org.springframework.boot:**',
179187
],
180188
},
181189
],
@@ -190,6 +198,16 @@
190198
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
191199
],
192200
},
201+
{
202+
customType: 'regex',
203+
datasourceTemplate: 'npm',
204+
managerFilePatterns: [
205+
'.github/workflows/**',
206+
],
207+
matchStrings: [
208+
'npm install (?<depName>[^@\\s]+)@(?<currentValue>[^\\s]+)',
209+
],
210+
},
193211
{
194212
customType: 'regex',
195213
datasourceTemplate: 'java-version',

.github/scripts/dependencies.Dockerfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/scripts/link-check.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/assign-issue-owners.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- name: Checkout repository
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

22-
- name: Install js-yaml
23-
run: npm install js-yaml
22+
- name: Install yaml
23+
run: npm install yaml@2.8.1
2424

2525
- name: Parse component label and assign owners
26-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
26+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
2727
with:
2828
script: |
2929
const fs = require('fs');
30-
const yaml = require('js-yaml');
30+
const { parse } = require('yaml');
3131
3232
// Extract component name from label
3333
const labelName = context.payload.label.name;
@@ -42,7 +42,7 @@ jobs:
4242
4343
// Read and parse component_owners.yml
4444
const yamlContent = fs.readFileSync('.github/component_owners.yml', 'utf8');
45-
const data = yaml.load(yamlContent);
45+
const data = parse(yamlContent);
4646
4747
if (!data || !data.components) {
4848
core.setFailed('Invalid component_owners.yml structure');

.github/workflows/assign-reviewers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
pull-requests: write # for assigning reviewers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: open-telemetry/assign-reviewers-action@2f4f06ccc561740d5094d9ca5e66dc2392d13e8f # main
21+
- uses: dyladan/component-owners@58bd86e9814d23f1525d0a970682cead459fa783 # v0.1.0
2222
with:
2323
config-file: .github/component_owners.yml
24+
assign-owners: false

.github/workflows/auto-spotless-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version: 17
2626

2727
- name: Set up gradle
28-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
28+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
2929
with:
3030
cache-read-only: true
3131

.github/workflows/build-common.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525

2626
- name: Set up JDK for running Gradle
27-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
27+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2828
with:
2929
distribution: temurin
3030
java-version: 17
3131

3232
- name: Set up Gradle
33-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
33+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3434
with:
3535
cache-read-only: ${{ inputs.cache-read-only }}
3636

@@ -49,7 +49,7 @@ jobs:
4949
java-version: 17
5050

5151
- name: Set up Gradle
52-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
52+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5353
with:
5454
cache-read-only: ${{ inputs.cache-read-only }}
5555

@@ -89,7 +89,7 @@ jobs:
8989
java-version: 17
9090

9191
- name: Set up Gradle
92-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
92+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
9393
with:
9494
cache-read-only: ${{ inputs.cache-read-only }}
9595

@@ -118,7 +118,7 @@ jobs:
118118
java-version: 17
119119

120120
- name: Set up Gradle
121-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
121+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
122122
with:
123123
cache-read-only: ${{ inputs.cache-read-only }}
124124

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
java-version: 17
3434

3535
- name: Set up gradle
36-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
36+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3737

3838
- name: Build and publish snapshots
3939
run: ./gradlew assemble publishToSonatype

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747

4848
- name: Set up gradle
4949
if: matrix.language == 'java'
50-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
50+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
53+
uses: github/codeql-action/init@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
5454
with:
5555
languages: ${{ matrix.language }}
5656
# using "linked" helps to keep up with the latest Kotlin support
@@ -65,6 +65,6 @@ jobs:
6565
run: ./gradlew assemble --no-build-cache --no-daemon
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
68+
uses: github/codeql-action/analyze@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.30.2
6969
with:
7070
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)