Skip to content

Commit

Permalink
Move deps to version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
@ymengesha
ymengesha committed Oct 6, 2023
1 parent ae32b18 commit 89c1ea5
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 273 deletions.
90 changes: 45 additions & 45 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ buildscript {
plugins {
java
application
id("com.github.johnrengelman.shadow")
id("io.github.sgtsilvio.gradle.defaults")
id("com.netflix.nebula.ospackage")
id("edu.sc.seis.launch4j")
id("org.openapi.generator")
id("com.google.cloud.tools.jib")
id("com.github.hierynomus.license")
id("de.thetaphi.forbiddenapis")
id("com.github.breadmoirai.github-release")
id("org.ajoberstar.git-publish")
id("org.graalvm.buildtools.native")
alias(libs.plugins.shadow)
alias(libs.plugins.defaults)
alias(libs.plugins.nebula.ospackage)
alias(libs.plugins.launch4j)
alias(libs.plugins.openapi.generator)
alias(libs.plugins.jib)
alias(libs.plugins.license)
alias(libs.plugins.forbiddenApis)
alias(libs.plugins.githubRelease)
alias(libs.plugins.gitPublish)
alias(libs.plugins.graalvm.native)
id("com.hivemq.cli.native-image")
}

Expand Down Expand Up @@ -90,38 +90,38 @@ repositories {

dependencies {
implementation(libs.swagger.annotations)
implementation("com.google.code.findbugs:jsr305:${property("find-bugs.version")}")
implementation("com.squareup.okhttp3:okhttp:${property("ok-http.version")}")
implementation("com.squareup.okhttp3:logging-interceptor:${property("ok-http.version")}")
implementation("io.gsonfire:gson-fire:${property("gson-fire.version")}")
implementation(libs.findbugs)
implementation(libs.okhttp)
implementation(libs.okhttp.loggingInterceptor)
implementation(libs.gsonFire)
implementation(libs.apache.commonsLang)
implementation("javax.annotation:javax.annotation-api:${property("javax.version")}")

implementation("org.jline:jline:${property("jline.version")}")
implementation("org.jline:jline-terminal-jansi:${property("jline.version")}")
implementation("com.google.dagger:dagger:${property("dagger.version")}")
compileOnly("org.graalvm.nativeimage:svm:${property("substrate-vm.version")}")
annotationProcessor("com.google.dagger:dagger-compiler:${property("dagger.version")}")

implementation("info.picocli:picocli:${property("picocli.version")}")
implementation("info.picocli:picocli-shell-jline3:${property("picoclishell.version")}")
implementation("info.picocli:picocli-codegen:${property("picocli.version")}")
annotationProcessor("info.picocli:picocli-codegen:${property("picocli.version")}")
implementation("com.google.guava:guava:${property("guava.version")}")
implementation("com.google.code.gson:gson:${property("gson.version")}")
implementation(libs.javax.annotation.api)

implementation(libs.jline)
implementation(libs.jline.terminal.jansi)
implementation(libs.dagger)
compileOnly(libs.graalvm.nativeImage.svm)
annotationProcessor(libs.dagger.compiler)

implementation(libs.picocli)
implementation(libs.picocli.shellJline)
implementation(libs.picocli.codegen)
annotationProcessor(libs.picocli.codegen)
implementation(libs.guava)
implementation(libs.gson)
implementation(libs.apache.commonsIO)
implementation("org.tinylog:tinylog-api:${property("tinylog.version")}")
implementation("org.tinylog:tinylog-impl:${property("tinylog.version")}")
implementation("org.jetbrains:annotations:${property("jetbrains-annotations.version")}")
implementation(libs.tinylog.api)
implementation(libs.tinylog.impl)
implementation(libs.jetbrains.annotations)
implementation(libs.bouncycastle.prov)
implementation(libs.bouncycastle.pkix)
implementation(libs.hivemq.mqttClient)
implementation("io.netty:netty-handler:${property("netty.version")}")
implementation("io.netty:netty-codec-http:${property("netty.version")}")
implementation("io.netty:netty-transport-native-epoll:${property("netty.version")}:linux-x86_64")
implementation("com.opencsv:opencsv:${property("open-csv.version")}")
implementation(libs.netty.handler)
implementation(libs.netty.codec.http)
implementation(variantOf(libs.netty.transport.native.epoll) { classifier("linux-x86_64") })
implementation(libs.openCsv)
constraints {
implementation("org.apache.commons:commons-text:1.10.0") {
implementation(libs.apache.commonsText) {
because(
"Force a commons-text version that does not contain CVE-2022-42889, " +
"because opencsv brings the vulnerable version 1.9 as transitive dependency"
Expand Down Expand Up @@ -162,8 +162,8 @@ dependencies {
hivemqOpenApi(files("specs/hivemq-openapi.yaml"))
swarmOpenApi(files("specs/hivemq-swarm-openapi.yaml"))

hivemqOpenApiFromProject("com.hivemq:hivemq-enterprise")
swarmOpenApiFromProject("com.hivemq:hivemq-swarm")
hivemqOpenApiFromProject(libs.hivemq.enterprise)
swarmOpenApiFromProject(libs.hivemq.swarm)
}

val generateHivemqOpenApi by tasks.registering(GenerateTask::class) {
Expand Down Expand Up @@ -238,8 +238,8 @@ tasks.test {
dependencies {
testImplementation(libs.junit.jupiter)
testImplementation(libs.mockito)
testImplementation("com.squareup.okhttp3:mockwebserver:${property("ok-http.version")}")
testImplementation("com.ginsberg:junit5-system-exit:${property("system-exit.version")}")
testImplementation(libs.okhttp.mockWebserver)
testImplementation(libs.junit.systemExit)

modules {
module("org.bouncycastle:bcpkix-jdk15on") { replacedBy("org.bouncycastle:bcpkix-jdk18on") }
Expand All @@ -263,7 +263,7 @@ val integrationTestRuntimeOnly: Configuration by configurations.getting {
}

dependencies {
integrationTestImplementation("com.hivemq:hivemq-testcontainer-junit5:${property("hivemq-testcontainer.version")}")
integrationTestImplementation(libs.hivemq.testcontainer.junit)
integrationTestImplementation(libs.testcontainers)
integrationTestImplementation(libs.awaitility)
}
Expand Down Expand Up @@ -291,11 +291,11 @@ val systemTestRuntimeOnly: Configuration by configurations.getting {
}

dependencies {
systemTestImplementation("com.hivemq:hivemq-testcontainer-junit5:${property("hivemq-testcontainer.version")}")
systemTestImplementation(libs.hivemq.testcontainer.junit)
systemTestImplementation(libs.testcontainers)
systemTestImplementation(libs.awaitility)
systemTestImplementation("com.hivemq:hivemq-community-edition-embedded:${property("hivemq-community-edition-embedded.version")}")
systemTestImplementation("org.junit-pioneer:junit-pioneer:${property("junit-pioneer.version")}")
systemTestImplementation(libs.hivemq.communityEditionEmbedded)
systemTestImplementation(libs.junit.pioneer)
}

val systemTest by tasks.registering(Test::class) {
Expand Down
60 changes: 0 additions & 60 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,6 @@
# the platform version defined in the artifacts creation (-Pversion=${PLATFORM_VERSION}) as all
# releases should be shipped with the newest mqtt-cli version.
#
# dependencies
#
bouncycastle.version=1.75
commons-io.version=2.13.0
commons-lang.version=3.12.0
dagger.version=2.46.1
find-bugs.version=3.0.2
gson.version=2.10.1
gson-fire.version=1.8.5
guava.version=32.0.1-jre
hivemq-client.version=1.3.2
javax.version=1.3.2
jetbrains-annotations.version=23.1.0
jline.version=3.21.0
netty.version=4.1.94.Final
ok-http.version=4.11.0
open-csv.version=5.7.1
picoclishell.version=4.7.0
picocli.version=4.7.0
substrate-vm.version=22.0.0.2
swagger.version=1.6.11
tinylog.version=2.6.2
#
# test dependencies
#
junit-jupiter.version=5.9.3
mockito.version=4.11.0
system-exit.version=1.1.2
#
# integration test dependencies
#
hivemq-testcontainer.version=2.0.0
hivemq-community-edition-embedded.version=2023.4
testcontainers.version=1.18.3
awaitility.version=4.2.0
#
# system test dependencies
#
junit-pioneer.version=2.0.1
#
# native image
#
graal.version=22.3.0
java-native.version=17
#
# plugins
#
plugin.defaults.version=0.2.0
plugin.forbiddenapis.version=3.5.1
plugin.git-publish.version=3.0.0
plugin.github-release.version=2.4.1
plugin.graal.version=0.9.27
plugin.jib.version=3.3.2
plugin.launch4j.version=3.0.4
plugin.license.version=0.16.1
# >= 5.0.0 break the tasks
plugin.openapi.generator.version=4.3.1
plugin.ospackage.version=11.4.0
plugin.shadow.version=8.1.1
#
# gradle properties
#
org.gradle.caching=true
Expand Down
Loading

0 comments on commit 89c1ea5

Please sign in to comment.