Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
40 changes: 40 additions & 0 deletions .fossa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
version: 3

targets:
only:
- type: gradle
exclude:
# these modules are not published and so consumers will not be exposed to them
- type: gradle
path: ./
target: ':api:testing-internal'
- type: gradle
path: ./
target: ':exporters:otlp:testing-internal'
- type: gradle
path: ./
target: ':integration-tests'
- type: gradle
path: ./
target: ':integration-tests:graal'
- type: gradle
path: ./
target: ':integration-tests:graal-incubating'
- type: gradle
path: ./
target: ':integration-tests:otlp'
- type: gradle
path: ./
target: ':integration-tests:tracecontext'
- type: gradle
path: ./
target: ':perf-harness'
- type: gradle
path: ./
target: ':testing-internal'

experimental:
gradle:
configurations-only:
# consumer will only be exposed to these dependencies
- runtimeClasspath
19 changes: 19 additions & 0 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: FOSSA

on:
push:
branches:
- main

permissions:
contents: read

jobs:
fossa:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
with:
api-key: ${{secrets.FOSSA_API_KEY}}
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ testing {
dependencies {
implementation(project(project.path))

implementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))

implementation(project(":testing-internal"))

compileOnly("com.google.auto.value:auto-value-annotations")
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
implementation("com.google.errorprone:error_prone_core")
compileOnly("com.google.errorprone:error_prone_core")

testImplementation("com.google.errorprone:error_prone_test_helpers")
}
Expand Down
15 changes: 13 additions & 2 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions

val DEPENDENCY_BOMS = listOf(
// for some reason boms show up as runtime dependencies in license and vulnerability scans
// even if they are only used by test dependencies, so not using junit bom here
// (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged
// by FOSSA for containing EPL-licensed)

"com.fasterxml.jackson:jackson-bom:2.18.2",
"com.google.guava:guava-bom:33.4.0-jre",
"com.google.protobuf:protobuf-bom:4.29.3",
"com.linecorp.armeria:armeria-bom:1.31.3",
"com.squareup.okhttp3:okhttp-bom:4.12.0",
"com.squareup.okio:okio-bom:3.10.2", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.70.0",
"io.netty:netty-bom:4.1.117.Final",
"io.zipkin.brave:brave-bom:6.0.3",
"io.zipkin.reporter2:zipkin-reporter-bom:3.4.3",
"org.assertj:assertj-bom:3.27.3",
"org.junit:junit-bom:5.11.4",
"org.testcontainers:testcontainers-bom:1.20.4",
"org.snakeyaml:snakeyaml-engine:2.9"
)
Expand All @@ -33,8 +36,16 @@ val slf4jVersion = "2.0.16"
val opencensusVersion = "0.31.1"
val prometheusClientVersion = "0.16.0"
val prometheusServerVersion = "1.3.5"
val armeriaVersion = "1.31.3"


val DEPENDENCIES = listOf(
"org.junit.jupiter:junit-jupiter-api:5.11.4",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we follow the armeria pattern and explicitly add dependency versions here for each of the junit components we use? I.e.:

"org.junit.jupiter:junit-jupiter-api:${junitVersion}",
"org.junit.jupiter:junit-jupiter-params:${junitVersion}",
"org.junit.jupiter:junit-jupiter-pioneer:${junitVersion}",

If we can, we should try to retain the pattern of establishing all dependency versions here and not letting the junit dependency version leak into otel-java-conventions.gradle.kts.

"com.linecorp.armeria:armeria:${armeriaVersion}",
"com.linecorp.armeria:armeria-grpc:${armeriaVersion}",
"com.linecorp.armeria:armeria-grpc-protocol:${armeriaVersion}",
"com.linecorp.armeria:armeria-junit5:${armeriaVersion}",

"com.google.auto.value:auto-value:${autoValueVersion}",
"com.google.auto.value:auto-value-annotations:${autoValueVersion}",
"com.google.errorprone:error_prone_annotations:${errorProneVersion}",
Expand Down
Loading