Merge pull request #596 from hivemq/fix/module-deps

Clean up brokn modules

Author: codepitbull

gradle/libs.versions.toml

@@ -118,6 +118,7 @@ wiremock-jre8-standalone = { module = "com.github.tomakehurst:wiremock-jre8-stan
 zeroAllocationHashing = { module = "net.openhft:zero-allocation-hashing", version.ref = "zeroAllocationHashing" }
 
 [plugins]
+cyclonedx = { id = "org.cyclonedx.bom", version = "1.10.0" }
 defaults = { id = "io.github.sgtsilvio.gradle.defaults", version = "0.2.0" }
 metadata = { id = "io.github.sgtsilvio.gradle.metadata", version = "0.6.0" }
 javadocLinks = { id = "io.github.sgtsilvio.gradle.javadoc-links", version = "0.8.0" }

hivemq-edge/build.gradle.kts

@@ -560,4 +560,3 @@ artifacts {
 }
 
 
-

modules/hivemq-edge-module-etherip/build.gradle.kts

@@ -46,7 +46,6 @@ dependencies {
 
 dependencies {
     testImplementation("com.hivemq:hivemq-edge")
-    testImplementation(libs.hivemq.edge.adapterSdk)
     testImplementation(libs.apache.commonsIO)
     testImplementation(libs.mockito.junitJupiter)
     testImplementation(libs.junit.jupiter)

modules/hivemq-edge-module-etherip/gradle/libs.versions.toml

@@ -3,3 +3,11 @@ rootProject.name = "hivemq-edge-module-etherip"
 pluginManagement {
     includeBuild("../../edge-plugins")
 }
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../gradle/libs.versions.toml"))
+        }
+    }
+}

modules/hivemq-edge-module-etherip/settings.gradle.kts

@@ -45,6 +45,7 @@ dependencies {
     testImplementation(libs.assertj)
     testImplementation(libs.mockito.junitJupiter)
     testImplementation("com.hivemq:hivemq-edge")
+
 }
 
 tasks.test {
@@ -197,6 +198,7 @@ tasks.updateThirdPartyLicenses {
     dependencyLicense.set(tasks.downloadLicenses.get().xmlDestination.resolve("dependency-license.xml"))
     outputDirectory.set(layout.buildDirectory.dir("distribution/third-party-licenses"))
 }
+
 val javaComponent = components["java"] as AdhocComponentWithVariants
 javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements.get()) {
     skip()

modules/hivemq-edge-module-file/build.gradle.kts

@@ -2,7 +2,6 @@ import nl.javadude.gradle.plugins.license.DownloadLicensesExtension.license
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 
-
 plugins {
     java
     alias(libs.plugins.defaults)
@@ -41,14 +40,12 @@ dependencies {
     compileOnly(libs.jackson.databind)
     implementation(libs.digitalpetri.modbus.master.tcp)
 
-    testImplementation(libs.hivemq.edge)
     testImplementation(libs.jackson.databind)
-    testImplementation(libs.hivemq.edge.adapterSdk)
-    testImplementation(libs.apache.commonsIO)
-    testImplementation(libs.mockito.junitJupiter)
     testImplementation(libs.junit.jupiter)
-    testImplementation(libs.guava)
     testImplementation(libs.assertj)
+    testImplementation(libs.mockito.junitJupiter)
+    testImplementation(libs.guava)
+    testImplementation("com.hivemq:hivemq-edge")
 
 }
 
@@ -207,3 +204,4 @@ val javaComponent = components["java"] as AdhocComponentWithVariants
 javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements.get()) {
     skip()
 }
+

modules/hivemq-edge-module-modbus/build.gradle.kts

@@ -3,3 +3,11 @@ rootProject.name = "hivemq-edge-module-modbus"
 pluginManagement {
     includeBuild("../../edge-plugins")
 }
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../gradle/libs.versions.toml"))
+        }
+    }
+}