Skip to content

Commit e47290b

Browse files
aaron-steinfeldaaron-steinfeld
authored
refactor: add kafka bom (#63)
1 parent f58941e commit e47290b

File tree

8 files changed

+44
-51
lines changed

8 files changed

+44
-51
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id("org.hypertrace.repository-plugin") version "0.4.1"
66
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
77
id("org.hypertrace.avro-plugin") version "0.4.0" apply false
8-
id("org.hypertrace.publish-plugin") version "1.0.4" apply false
8+
id("org.hypertrace.publish-plugin") version "1.0.5" apply false
99
id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false
1010
id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
1111
id("org.owasp.dependencycheck") version "8.2.1"

‎kafka-bom/build.gradle.kts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
plugins {
2+
`java-platform`
3+
id("org.hypertrace.publish-plugin")
4+
}
5+
6+
7+
var kafkaVersion = "7.2.1"
8+
var kafkaCcsVersion = "$kafkaVersion-ccs"
9+
10+
dependencies {
11+
constraints {
12+
api("com.fasterxml.jackson.core:jackson-databind:2.15.2")
13+
api("org.xerial.snappy:snappy-java:1.1.10.1") {
14+
because("[https://nvd.nist.gov/vuln/detail/CVE-2023-34455] in 'org.apache.kafka:kafka-clients:*'")
15+
}
16+
17+
api("io.confluent:kafka-streams-avro-serde:$kafkaVersion")
18+
api("io.confluent:kafka-protobuf-serializer:$kafkaVersion")
19+
api("org.apache.kafka:kafka-clients:$kafkaCcsVersion")
20+
api("org.apache.kafka:kafka-streams:$kafkaCcsVersion")
21+
api("org.apache.kafka:kafka-streams-test-utils:$kafkaCcsVersion")
22+
api("org.apache.avro:avro:1.11.1")
23+
}
24+
}

‎kafka-streams-framework/build.gradle.kts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,24 @@ tasks.test {
1111
}
1212

1313
dependencies {
14-
constraints {
15-
implementation("org.xerial.snappy:snappy-java:1.1.10.1") {
16-
because("[https://nvd.nist.gov/vuln/detail/CVE-2023-34455] in 'org.apache.kafka:kafka-clients:*' > 'org.xerial.snappy:snappy-java:1.1.8.2'")
17-
}
18-
}
1914
annotationProcessor("org.projectlombok:lombok:1.18.26")
2015
compileOnly("org.projectlombok:lombok:1.18.26")
2116

2217
api(project(":kafka-streams-serdes"))
23-
api("org.apache.kafka:kafka-streams:7.2.1-ccs")
24-
api("io.confluent:kafka-streams-avro-serde:7.2.1")
18+
api(platform(project(":kafka-bom")))
19+
api("org.apache.kafka:kafka-streams")
20+
api("io.confluent:kafka-streams-avro-serde")
2521
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.0")
2622

27-
implementation("org.apache.avro:avro:1.11.1")
28-
implementation("org.apache.kafka:kafka-clients:7.2.1-ccs")
23+
implementation("org.apache.avro:avro")
24+
implementation("org.apache.kafka:kafka-clients")
2925
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.52")
3026
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.52")
3127
implementation("org.apache.commons:commons-lang3:3.12.0")
3228

3329
testCompileOnly("org.projectlombok:lombok:1.18.26")
3430
testAnnotationProcessor("org.projectlombok:lombok:1.18.26")
35-
testImplementation("org.apache.kafka:kafka-streams-test-utils:7.2.1-ccs")
31+
testImplementation("org.apache.kafka:kafka-streams-test-utils")
3632
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3733
testImplementation("org.junit-pioneer:junit-pioneer:2.0.0")
3834
testImplementation("org.mockito:mockito-core:5.2.0")

‎kafka-streams-partitioners/avro-partitioners/build.gradle.kts‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@ tasks.test {
1111
}
1212

1313
dependencies {
14-
constraints {
15-
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
16-
17-
implementation("org.xerial.snappy:snappy-java:1.1.10.1") {
18-
because("[https://nvd.nist.gov/vuln/detail/CVE-2023-34455] in 'org.apache.kafka:kafka-clients:*' > 'org.xerial.snappy:snappy-java:1.1.8.2'")
19-
}
20-
}
14+
api(platform(project(":kafka-bom")))
2115

2216
annotationProcessor("org.projectlombok:lombok:1.18.24")
2317
compileOnly("org.projectlombok:lombok:1.18.24")
2418

2519
implementation("com.google.guava:guava:32.0.1-jre")
26-
implementation("org.apache.avro:avro:1.11.1")
20+
implementation("org.apache.avro:avro")
2721
implementation("com.typesafe:config:1.4.2")
28-
implementation("org.apache.kafka:kafka-clients:7.2.1-ccs")
29-
implementation("org.apache.kafka:kafka-streams:7.2.1-ccs")
22+
implementation("org.apache.kafka:kafka-clients")
23+
implementation("org.apache.kafka:kafka-streams")
3024
implementation("org.slf4j:slf4j-api:1.7.36")
3125

3226
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")

‎kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,13 @@ tasks.test {
1010
}
1111

1212
dependencies {
13-
constraints {
14-
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
15-
16-
implementation("org.xerial.snappy:snappy-java:1.1.10.1") {
17-
because("[https://nvd.nist.gov/vuln/detail/CVE-2023-34455] in 'org.apache.kafka:kafka-clients:*' > 'org.xerial.snappy:snappy-java:1.1.8.2'")
18-
}
19-
}
20-
2113
annotationProcessor("org.projectlombok:lombok:1.18.24")
2214
compileOnly("org.projectlombok:lombok:1.18.24")
2315

24-
api("com.typesafe:config:1.4.2")
25-
api("org.apache.kafka:kafka-streams:7.2.1-ccs")
16+
api(platform(project(":kafka-bom")))
17+
api("org.apache.kafka:kafka-streams")
2618
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.0")
19+
api("com.typesafe:config:1.4.2")
2720
implementation("com.google.guava:guava:32.0.1-jre")
2821
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.12.0")
2922
implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46")

‎kafka-streams-serdes/build.gradle.kts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,10 @@ tasks.test {
1111
}
1212

1313
dependencies {
14-
constraints {
15-
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
14+
api(platform(project(":kafka-bom")))
1615

17-
implementation("org.xerial.snappy:snappy-java:1.1.10.1") {
18-
because("[https://nvd.nist.gov/vuln/detail/CVE-2023-34455] in 'org.apache.kafka:kafka-clients:*' > 'org.xerial.snappy:snappy-java:1.1.8.2'")
19-
}
20-
}
21-
22-
api("org.apache.kafka:kafka-clients:7.2.1-ccs")
23-
api("org.apache.avro:avro:1.11.1")
16+
api("org.apache.kafka:kafka-clients")
17+
api("org.apache.avro:avro")
2418

2519
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
2620
}

‎owasp-suppressions.xml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
33
<suppress>
44
<notes><![CDATA[
5-
This is a false alert.
6-
Hypertrace grpc packages are falsely identified as old versions of open source grpc packages.
5+
Any hypertrace core dep
76
]]></notes>
8-
<packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\.grpcutils/grpc-client-utils@.*$</packageUrl>
9-
<cpe>cpe:/a:grpc:grpc</cpe>
10-
</suppress>
11-
<suppress>
12-
<notes><![CDATA[
13-
This is a false alert.
14-
Hypertrace grpc packages are falsely identified as old versions of open source grpc packages.
15-
]]></notes>
16-
<packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\.grpcutils/grpc-context-utils@.*$</packageUrl>
7+
<packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\..*@.*$</packageUrl>
178
<cpe>cpe:/a:grpc:grpc</cpe>
189
</suppress>
1910
<suppress>

‎settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ include(":kafka-streams-framework")
1616
include(":kafka-streams-serdes")
1717
include(":kafka-streams-partitioners:avro-partitioners")
1818
include(":kafka-streams-partitioners:weighted-group-partitioner")
19+
include(":kafka-bom")

0 commit comments

Comments
 (0)