Skip to content

Commit d202642

Browse files
skjindal93skjindal93
committed
chore: migrate to toml dependencies
1 parent 55de008 commit d202642

File tree

8 files changed

+127
-62
lines changed

8 files changed

+127
-62
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
[versions]
2+
hypertrace-grpcUtils = "0.9.0"
3+
4+
guice = "5.1.0"
5+
grpc = "1.48.0"
6+
jetty = "9.4.48.v20220622"
7+
micrometer = "1.9.5"
8+
dropwizardMetrics = "4.2.10"
9+
prometheus = "0.12.0"
10+
mockito = "4.8.1"
11+
12+
[libraries]
13+
hypertrace-grpc-client-utils = { module = "org.hypertrace.core.grpcutils:grpc-client-utils", version.ref = "hypertrace-grpcUtils"}
14+
hypertrace-grpc-server-utils = { module = "org.hypertrace.core.grpcutils:grpc-server-utils", version.ref = "hypertrace-grpcUtils"}
15+
16+
grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
17+
grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" }
18+
grpc-services = { module = "io.grpc:grpc-services", version.ref = "grpc" }
19+
20+
google-guice = { module = "com.google.inject:guice", version.ref = "guice" }
21+
google-guice-servlet = { module = "com.google.inject.extensions:guice-servlet", version.ref = "guice" }
22+
jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }
23+
jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "jetty" }
24+
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
25+
jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "jetty" }
26+
javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
27+
dropwizard-metrics-core = {module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizardMetrics" }
28+
dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizardMetrics" }
29+
dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizardMetrics" }
30+
prometheus-dropwizard = { module = "io.prometheus:simpleclient_dropwizard", version.ref = "prometheus" }
31+
prometheus-servlet = { module = "io.prometheus:simpleclient_servlet", version.ref = "prometheus" }
32+
prometheus-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus" }
33+
34+
micrometer-core = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" }
35+
micrometer-registry-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer" }
36+
micrometer-jvm-extras = { module = "io.github.mweirauch:micrometer-jvm-extras", version = "0.2.2" }
37+
38+
awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" }
39+
google-guava = { module = "com.google.guava:guava", version = "31.1-jre" }
40+
typesafe-config = { module = "com.typesafe:config", version = "1.4.2" }
41+
lombok = { module = "org.projectlombok:lombok", version = "1.18.22" }
42+
slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.32" }
43+
apache-log4j-slf4jImpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.17.1" }
44+
apache-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" }
45+
46+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.8.2" }
47+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
48+
mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
49+
50+
[bundles]
51+
mockito = ["mockito-core", "mockito-junit"]

‎integrationtest-service-framework/build.gradle.kts‎

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

1212
dependencies {
13-
implementation(project(":platform-service-framework"))
13+
implementation(projects.platformServiceFramework)
1414

1515
// Configuration
16-
implementation("com.typesafe:config:1.4.2")
16+
implementation(libs.typesafe.config)
1717
// Logging
18-
implementation("org.slf4j:slf4j-api:1.7.36")
19-
implementation("org.awaitility:awaitility:4.0.3")
18+
implementation(libs.slf4j.api)
19+
implementation(libs.awaitility)
2020
}

‎owasp-suppressions.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3+
<suppress>
4+
<notes><![CDATA[
5+
file name: grpc-client-rx-utils-0.7.6.jar
6+
]]></notes>
7+
<packageUrl regex="true">^pkg:maven/org\.hypertrace\.core\.grpcutils/grpc\-client\-rx\-utils@.*$</packageUrl>
8+
<cpe>cpe:/a:grpc:grpc</cpe>
9+
</suppress>
10+
</suppressions>

‎platform-grpc-service-framework/build.gradle.kts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ plugins {
66
}
77

88
dependencies {
9-
api(project(":platform-service-framework"))
10-
api(platform("io.grpc:grpc-bom:1.47.0"))
11-
api("io.grpc:grpc-api")
12-
api("io.grpc:grpc-services")
13-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.7.6")
14-
api("com.typesafe:config:1.4.2")
15-
api(project(":service-framework-spi"))
9+
api(projects.platformServiceFramework)
10+
api(libs.grpc.api)
11+
api(libs.grpc.services)
12+
api(libs.hypertrace.grpc.client.utils)
13+
api(libs.typesafe.config)
14+
api(projects.serviceFrameworkSpi)
1615

17-
annotationProcessor("org.projectlombok:lombok:1.18.24")
18-
compileOnly("org.projectlombok:lombok:1.18.24")
16+
annotationProcessor(libs.lombok)
17+
compileOnly(libs.lombok)
1918

20-
implementation("org.slf4j:slf4j-api:1.7.36")
21-
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.7.6")
19+
implementation(libs.slf4j.api)
20+
implementation(libs.hypertrace.grpc.server.utils)
2221
}

‎platform-http-service-framework/build.gradle.kts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ plugins {
44
}
55

66
dependencies {
7-
api(project(":platform-service-framework"))
8-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.7.6")
9-
api("com.typesafe:config:1.4.2")
10-
api("javax.servlet:javax.servlet-api:4.0.1")
11-
api("com.google.inject:guice:5.1.0")
12-
api(project(":service-framework-spi"))
7+
api(projects.platformServiceFramework)
8+
api(libs.hypertrace.grpc.client.utils)
9+
api(libs.typesafe.config)
10+
api(libs.javax.servlet.api)
11+
api(libs.google.guice)
12+
api(projects.serviceFrameworkSpi)
1313

14-
implementation("org.slf4j:slf4j-api:1.7.36")
15-
implementation("com.google.inject.extensions:guice-servlet:5.1.0")
16-
implementation("com.google.guava:guava:31.1-jre")
17-
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
18-
implementation("org.eclipse.jetty:jetty-server:9.4.48.v20220622")
19-
implementation("org.eclipse.jetty:jetty-servlets:9.4.48.v20220622")
14+
implementation(libs.slf4j.api)
15+
implementation(libs.google.guice.servlet)
16+
implementation(libs.google.guava)
17+
implementation(libs.jetty.servlet)
18+
implementation(libs.jetty.server)
19+
implementation(libs.jetty.servlets)
2020

21-
annotationProcessor("org.projectlombok:lombok:1.18.24")
22-
compileOnly("org.projectlombok:lombok:1.18.24")
21+
annotationProcessor(libs.lombok)
22+
compileOnly(libs.lombok)
2323

2424
}

‎platform-metrics/build.gradle.kts‎

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

1212
dependencies {
13-
api("com.typesafe:config:1.4.2")
14-
api("io.dropwizard.metrics:metrics-core:4.2.10")
15-
api("io.micrometer:micrometer-core:1.5.3")
16-
api("javax.servlet:javax.servlet-api:3.1.0")
13+
api(libs.typesafe.config)
14+
api(libs.dropwizard.metrics.core)
15+
api(libs.micrometer.core)
16+
api(libs.javax.servlet.api)
1717

18-
implementation("io.micrometer:micrometer-registry-prometheus:1.7.5")
18+
implementation(libs.micrometer.registry.prometheus)
1919

20-
implementation("io.github.mweirauch:micrometer-jvm-extras:0.2.0")
21-
implementation("org.slf4j:slf4j-api:1.7.36")
22-
implementation("io.dropwizard.metrics:metrics-jvm:4.2.10")
23-
implementation("io.prometheus:simpleclient_dropwizard:0.12.0")
24-
implementation("io.prometheus:simpleclient_servlet:0.12.0")
25-
implementation("io.prometheus:simpleclient_pushgateway:0.12.0")
26-
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
27-
implementation ("com.google.guava:guava:30.1.1-jre")
20+
implementation(libs.micrometer.jvm.extras)
21+
implementation(libs.slf4j.api)
22+
implementation(libs.dropwizard.metrics.jvm)
23+
implementation(libs.prometheus.dropwizard)
24+
implementation(libs.prometheus.servlet)
25+
implementation(libs.prometheus.pushgateway)
26+
implementation(libs.jetty.servlet)
27+
implementation (libs.google.guava)
2828

29-
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
30-
testImplementation("org.mockito:mockito-core:3.8.0")
29+
testImplementation(libs.junit.jupiter)
30+
testImplementation(libs.bundles.mockito)
3131
}

‎platform-service-framework/build.gradle.kts‎

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

1212
dependencies {
13-
api(project(":service-framework-spi"))
14-
implementation(project(":platform-metrics"))
13+
api(projects.serviceFrameworkSpi)
14+
implementation(projects.platformMetrics)
1515

16-
api("org.slf4j:slf4j-api:1.7.36")
17-
api("com.typesafe:config:1.4.2")
16+
api(libs.slf4j.api)
17+
api(libs.typesafe.config)
1818

1919
// Use for thread dump servlet
20-
implementation("io.dropwizard.metrics:metrics-servlets:4.2.10")
21-
implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
20+
implementation(libs.dropwizard.metrics.servlets)
21+
implementation(libs.jetty.servlet)
2222

2323
// Use for metrics servlet
24-
implementation("io.prometheus:simpleclient_servlet:0.12.0")
24+
implementation(libs.prometheus.servlet)
2525

2626
// http client
27-
implementation("org.apache.httpcomponents:httpclient:4.5.13")
28-
29-
constraints {
30-
implementation("commons-codec:commons-codec:1.15") {
31-
because("version 1.12 has a vulnerability https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518")
27+
implementation(libs.apache.httpclient)
28+
29+
testImplementation(libs.apache.log4j.slf4jImpl)
30+
testImplementation(libs.junit.jupiter)
31+
testImplementation(libs.bundles.mockito)
32+
testImplementation(libs.jetty.servlet) {
33+
artifact {
34+
classifier = "tests"
35+
}
36+
}
37+
testImplementation(libs.jetty.http) {
38+
artifact {
39+
classifier = "tests"
3240
}
3341
}
34-
35-
testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
36-
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
37-
testImplementation("org.mockito:mockito-core:3.8.0")
38-
testImplementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622:tests")
39-
testImplementation("org.eclipse.jetty:jetty-http:9.4.48.v20220622:tests")
4042
}

‎settings.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ plugins {
1212
id("org.hypertrace.version-settings") version "0.2.0"
1313
}
1414

15+
enableFeaturePreview("VERSION_CATALOGS")
16+
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
17+
1518
include(":platform-grpc-service-framework")
1619
include(":platform-http-service-framework")
1720
include(":platform-service-framework")

0 commit comments

Comments
 (0)