Skip to content

Commit f9d6e03

Browse files
authored
Merge branch 'main' into ftorres/utf-8
2 parents 8f04695 + ff23461 commit f9d6e03

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1616
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
1717
with:
18-
version: v2025.8.7
19-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
18+
version: v2025.8.12
19+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
2020
- name: Run acceptance tests
2121
run: mise run acceptance-test

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
persist-credentials: false
1515
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
1616
with:
17-
version: v2025.8.7
18-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
17+
version: v2025.8.12
18+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
1919
- name: Cache local Maven repository
2020
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
2121
with:

.github/workflows/github-pages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
fetch-depth: 0
4040
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
4141
with:
42-
version: v2025.8.7
43-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
42+
version: v2025.8.12
43+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
4444
cache: "false"
4545
- name: Setup Pages
4646
id: pages

.github/workflows/lint-rest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
1717
with:
18-
version: v2025.8.7
19-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
18+
version: v2025.8.12
19+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
2020
- name: Lint
2121
run: mise run lint-rest

.github/workflows/native-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1616
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
1717
with:
18-
version: v2025.8.7
19-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
18+
version: v2025.8.12
19+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
2020
env:
2121
MISE_ENV: native
2222
- name: Run native tests

.github/workflows/test-release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
persist-credentials: false
1919
- uses: jdx/mise-action@c37c93293d6b742fc901e1406b8f764f6fb19dac # v2.4.4
2020
with:
21-
version: v2025.8.7
22-
sha256: 665ab5b4401a052ecd248aa0788da337b2dc1b5cd15bf982882397b1ca5e0a5a
21+
version: v2025.8.12
22+
sha256: a1c71340a2c1865fa4fe85e1d3691b111cd4bf86d56366979247bf2a595777d6
2323
- name: Cache local Maven repository
2424
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
2525
with:

examples/example-exemplars-tail-sampling/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
- -jar
3737
- /example-greeting-service.jar
3838
collector:
39-
image: otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b
39+
image: otel/opentelemetry-collector-contrib:0.132.4@sha256:bcb6d6d0e56645a75cbce0b7aeb3cf7c304299788bc573080b0351eddc786c9b
4040
network_mode: host
4141
volumes:
4242
- ./config/otelcol-config.yaml:/config.yaml

examples/example-exporter-opentelemetry/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
#- -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
1414
- /example-exporter-opentelemetry.jar
1515
collector:
16-
image: otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b
16+
image: otel/opentelemetry-collector-contrib:0.132.4@sha256:bcb6d6d0e56645a75cbce0b7aeb3cf7c304299788bc573080b0351eddc786c9b
1717
network_mode: host
1818
volumes:
1919
- ./config/otelcol-config.yaml:/config.yaml

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</plugin>
124124
<plugin>
125125
<artifactId>maven-javadoc-plugin</artifactId>
126-
<version>3.11.2</version>
126+
<version>3.11.3</version>
127127
</plugin>
128128
<plugin>
129129
<artifactId>maven-enforcer-plugin</artifactId>

0 commit comments

Comments
 (0)