Skip to content

Commit 4c53c03

Browse files
committed
Merge remote-tracking branch 'upstream/main' into rulesets
2 parents 982c59d + 3e1d953 commit 4c53c03

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.clomonitor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
exemptions:
22
- check: artifacthub_badge
33
reason: "Artifact Hub doesn't support Java packages"
4+
- check: signed_releases
5+
reason: "Maven central releases are signed and there are no GitHub release artifacts"

.github/renovate.json5

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
],
88
"packageRules": [
99
{
10-
// this is to reduce the number of renovate PRs by consolidating them into a weekly batch
11-
"matchManagers": ["github-actions"],
10+
// this is to reduce the number of renovate PRs
11+
"matchManagers": [
12+
"github-actions",
13+
"dockerfile"
14+
],
1215
"extends": ["schedule:weekly"],
13-
"groupName": "github actions",
16+
"groupName": "weekly update"
1417
},
1518
{
1619
"matchPackageNames": [

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- 23
3636
# Collect coverage on latest LTS
3737
include:
38-
- os: ubuntu-20.04
38+
- os: ubuntu-latest
3939
test-java-version: 21
4040
coverage: true
4141
jmh-based-tests: true

dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val DEPENDENCY_BOMS = listOf(
1919
"com.squareup.okhttp3:okhttp-bom:4.12.0",
2020
"com.squareup.okio:okio-bom:3.10.2", // applies to transitive dependencies of okhttp
2121
"io.grpc:grpc-bom:1.70.0",
22-
"io.netty:netty-bom:4.1.117.Final",
22+
"io.netty:netty-bom:4.1.118.Final",
2323
"io.zipkin.brave:brave-bom:6.0.3",
2424
"io.zipkin.reporter2:zipkin-reporter-bom:3.4.3",
2525
"org.assertj:assertj-bom:3.27.3",
@@ -73,11 +73,11 @@ val DEPENDENCIES = listOf(
7373
"io.prometheus:simpleclient_httpserver:${prometheusClientVersion}",
7474
"javax.annotation:javax.annotation-api:1.3.2",
7575
"com.github.stefanbirkner:system-rules:1.19.0",
76-
"com.google.api.grpc:proto-google-common-protos:2.51.0",
76+
"com.google.api.grpc:proto-google-common-protos:2.52.0",
7777
"com.google.code.findbugs:jsr305:3.0.2",
7878
"com.google.guava:guava-beta-checker:1.0",
7979
"com.sun.net.httpserver:http:20070405",
80-
"com.tngtech.archunit:archunit-junit5:1.3.0",
80+
"com.tngtech.archunit:archunit-junit5:1.4.0",
8181
"com.uber.nullaway:nullaway:0.12.3",
8282
"edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+
8383
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.7",

integration-tests/tracecontext/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3@sha256:589ed6659c0e4aac182f309131cd35e85452d21072570b1f6abc45b7687093a3 AS build
1+
FROM python:3.13.2@sha256:589ed6659c0e4aac182f309131cd35e85452d21072570b1f6abc45b7687093a3 AS build
22

33
# Main branch SHA as of April-1-2021
44
ARG TRACECONTEXT_GIT_TAG="dcd3ad9b7d6ac36f70ff3739874b73c11b0302a1"
@@ -11,7 +11,7 @@ RUN unzip trace-context.zip
1111
RUN rm trace-context.zip
1212
RUN mv trace-context-${TRACECONTEXT_GIT_TAG}/test /tracecontext-testsuite
1313

14-
FROM python:3-slim@sha256:ae9f9ac89467077ed1efefb6d9042132d28134ba201b2820227d46c9effd3174
14+
FROM python:3.13.2-slim@sha256:ae9f9ac89467077ed1efefb6d9042132d28134ba201b2820227d46c9effd3174
1515

1616
RUN pip install aiohttp
1717

0 commit comments

Comments
 (0)