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
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ plugins {
id 'org.sonarqube' version '6.2.0.5505'
}

// Enable dependency locking for SBOM generation (Trivy scans gradle.lockfile)
// Run `./gradlew dependencies --write-locks` to generate/update lockfiles
allprojects {
dependencyLocking {
lockAllConfigurations()
}
}

sonarqube {
properties {
property "sonar.projectKey", "$System.env.SONAR_PROJECT_KEY"
Expand Down
272 changes: 272 additions & 0 deletions gradle.lockfile

Large diffs are not rendered by default.

722 changes: 722 additions & 0 deletions gradle/verification-metadata.xml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ javaPlatform {
dependencies {
api platform('com.fasterxml.jackson:jackson-bom:2.18.2')
api platform('io.grpc:grpc-bom:1.70.0')
api platform('io.netty:netty-bom:4.2.7.Final')
api platform('io.netty:netty-bom:4.2.8.Final')
api platform('io.opentelemetry:opentelemetry-bom:1.47.0')
api platform('io.prometheus:prometheus-metrics-bom:1.3.5')
api platform('io.vertx:vertx-stack-depchain:4.5.13')
api platform('org.apache.logging.log4j:log4j-bom:2.24.3')
api platform('io.vertx:vertx-stack-depchain:4.5.22')
api platform('org.apache.logging.log4j:log4j-bom:2.25.3')
api platform('org.assertj:assertj-bom:3.27.3')
api platform('org.immutables:bom:2.10.1')
api platform('org.junit:junit-bom:5.11.4')
Expand Down
5 changes: 5 additions & 0 deletions testfuzz/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
org.jacoco:org.jacoco.agent:0.8.11=jacocoAgent
empty=
7 changes: 7 additions & 0 deletions util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ jar {
}
}

tasks.withType(JavaCompile).configureEach {
options.compilerArgs += [
'-Alog4j.graalvm.groupId=org.hyperledger.besu',
'-Alog4j.graalvm.artifactId=besu-util'
]
}

dependencies {
api 'org.slf4j:slf4j-api'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,23 @@ public Builder() {
}

/**
* Set the string to match in the stack trace
* Set the string to match in the stack trace.
*
* @param text the match string
* @return this builder
*/
public StackTraceMatchFilter.Builder setMatchString(final String text) {
return setText(text);
}

/**
* Set the text to match in the stack trace. A public setter is required by newer versions of
* Log4j.
*
* @param text the match string
* @return this builder
*/
public StackTraceMatchFilter.Builder setText(final String text) {
this.text = text;
return this;
}
Expand Down