100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Use gradle version catalog instead of custom properties for dependency versions (#2814)
Eric Bariauxbfcbcbdef355
diff --git a/agent/build.gradle b/agent/build.gradleindex a8957852a..cf04d0933 100644--- a/agent/build.gradle+++ b/agent/build.gradle@@ -17,56 +17,56 @@ dependencies {api project(":container")- api "io.netty:netty-codec:$nettyVersion"- api "io.netty:netty-codec-http:$nettyVersion"+ api libs.nettyCodec+ api libs.nettyCodecHttp- api "com.fazecast:jSerialComm:$jSerialCommVersion"+ api libs.jserialcomm- api "com.github.calimero:calimero-core:$calimeroVersion"+ api libs.calimeroCore- api ("com.github.calimero:calimero-tools:$calimeroVersion") {+ api(libs.calimeroTools) {// Has a dependency on the SLF4J simple providerexclude group: "org.slf4j"}- api "net.sf.saxon:Saxon-HE:$saxonHEVersion"+ api libs.saxonHe//IKEA Tradfri agent dependencies- api "org.eclipse.californium:californium-core:$californiumCoreVersion"- api "org.eclipse.californium:scandium:$californiumScandiumVersion"+ api libs.californiumCore+ api libs.californiumScandium- api("org.openremote:or-zwave:$zwaveVersion") {+ api(libs.orZwave) {exclude group: "org.bidib.com.neuronrobotics"exclude group: "jdom" // We don't want to bring jdom 1.x dependency from or-zwave, it contains vulnerabilities}- api "com.hivemq:hivemq-mqtt-client:$hiveMQClientVersion"+ api libs.hiveMqttClient- api("com.github.weliem:blessed-bluez:$bluetoothVersion") {+ api(libs.blessedBluez) {exclude group: "com.github.weliem.blessed-bluez", module: "blessed-test"}- implementation "dev.failsafe:failsafe:$failsafeVersion"+ implementation libs.failsafe- implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion"+ implementation libs.angusMail- implementation "org.jdom:jdom2:$jdomVersion"+ implementation libs.jdom2- implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$jacksonVersion"- implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"+ implementation libs.jacksonDataformatCsv+ implementation libs.jacksonDatabind- implementation "io.grpc:grpc-netty-shaded:$grpcVersion"- implementation "io.grpc:grpc-protobuf:$grpcVersion"- implementation "io.grpc:grpc-stub:$grpcVersion"+ implementation libs.grpcNettyShaded+ implementation libs.grpcProtobuf+ implementation libs.grpcStub- compileOnly "javax.annotation:javax.annotation-api:$grpcAnnotationsVersion"+ compileOnly libs.javaxAnnotationApi- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"- testImplementation "org.mockito:mockito-core:$mockitoVersion"- testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"+ testImplementation libs.junitJupiterApi+ testImplementation libs.mockitoCore+ testRuntimeOnly libs.junitJupiterEnginetestRuntimeOnly "org.junit.platform:junit-platform-launcher"- implementation "org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion"+ implementation libs.bouncycastleBcprovJdk18on}protobuf {diff --git a/container/build.gradle b/container/build.gradleindex e5c20a604..5a8d6910d 100644--- a/container/build.gradle+++ b/container/build.gradle@@ -7,56 +7,56 @@ dependencies {api project(":model")- api "org.apache.groovy:groovy:$groovyVersion"- api "org.apache.groovy:groovy-json:$groovyVersion"- api "org.apache.groovy:groovy-xml:$groovyVersion"- api "org.apache.groovy:groovy-yaml:$groovyVersion"- api "org.craftercms:groovy-sandbox:$groovySandboxVersion"+ api libs.groovy+ api libs.groovyJson+ api libs.groovyXml+ api libs.groovyYaml+ api libs.groovySandbox// SLF4J JUL provider- api "org.slf4j:slf4j-jdk14:$slf4jVersion"+ api libs.slf4jJdk14- api "io.undertow:undertow-core:$undertowVersion"- api "io.undertow:undertow-websockets-jsr:$undertowVersion"- api ("org.jboss.resteasy:resteasy-undertow:$resteasyVersion") {+ api libs.undertowCore+ api libs.undertowWebsocketsJsr+ api(libs.resteasyUndertow) {exclude group: "jakarta.servlet", module: "undertow-servlet-jakarta"}- api "org.jboss.resteasy:resteasy-client:$resteasyVersion"- api "org.jboss.resteasy:resteasy-jackson2-provider:$resteasyVersion"- api "org.jboss.resteasy:resteasy-multipart-provider:$resteasyVersion"- api "org.jboss.resteasy:resteasy-validator-provider:$resteasyVersion"-- api "jakarta.security.enterprise:jakarta.security.enterprise-api:4.0.0"- api "org.glassfish.soteria:jakarta.security.enterprise:3.0.4"- api "com.nimbusds:nimbus-jose-jwt:10.4.2"--- api "org.keycloak:keycloak-admin-client:$keycloakVersion"-- api "org.postgresql:postgresql:$postgresJdbcVersion"- api "org.flywaydb:flyway-core:$flywaydbVersion"- implementation "org.flywaydb:flyway-database-postgresql:$flywaydbVersion"- api "org.hibernate.orm:hibernate-core:$hibernateVersion"- api "org.hibernate.orm:hibernate-hikaricp:$hibernateVersion"- api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion"- api "com.zaxxer:HikariCP:$hikaricpVersion"-- api "jakarta.el:jakarta.el-api:$javaxELAPIVersion"- api "org.glassfish:jakarta.el:$javaxELVersion"-- api "org.apache.camel:camel-core:$camelVersion"- api "org.apache.camel:camel-jackson:$camelVersion"- api "org.apache.camel:camel-snmp:$camelVersion"- api "org.apache.camel:camel-health:$camelVersion"- api "org.apache.camel:camel-management:$camelVersion"- api "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"- api "com.thetransactioncompany:cors-filter:$corsFilterVersion"+ api libs.resteasyClient+ api libs.resteasyJackson2Provider+ api libs.resteasyMultipartProvider+ api libs.resteasyValidatorProvider++ api libs.jakartaSecurityEnterpriseApi+ api libs.glassfishSoteria+ api libs.nimbusJoseJwt+++ api libs.keycloakAdminClient++ api libs.postgresql+ api libs.flywayCore+ implementation libs.flywayDatabasePostgresql+ api libs.hibernateCore+ api libs.hibernateHikaricp+ api libs.hibernateValidator+ api libs.hikaricp++ api libs.jakartaElApi+ api libs.jakartaEl++ api libs.camelCore+ api libs.camelJackson+ api libs.camelSnmp+ api libs.camelHealth+ api libs.camelManagement+ api libs.micrometerRegistryPrometheus+ api libs.corsFilter}dependencies {- testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"- testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"+ testImplementation libs.junitJupiterParams+ testImplementation libs.junitJupiterApi+ testRuntimeOnly libs.junitJupiterEnginetestRuntimeOnly "org.junit.platform:junit-platform-launcher"}diff --git a/extension/energy/build.gradle b/extension/energy/build.gradleindex 961667f77..9aa49395e 100644--- a/extension/energy/build.gradle+++ b/extension/energy/build.gradle@@ -8,8 +8,8 @@ base {}dependencies {- api "org.apache.camel:camel-core-model:$camelVersion"- api "org.jboss.resteasy:resteasy-client-api:$resteasyVersion"+ api libs.camelCoreModel+ api libs.resteasyClientApiapi resolveProject(":manager")api resolveProject(":model")diff --git a/gradle.properties b/gradle.propertiesindex 803cd8cdb..74c17419f 100644--- a/gradle.properties+++ b/gradle.properties@@ -8,72 +8,16 @@ systemProp.org.gradle.internal.repository.max.retries=10# the initial time before retrying, in milliseconds (default 125)systemProp.org.gradle.internal.repository.initial.backoff=500-jaxrsSpecVersion = 3.1.0-javaxAnnotationsVersion = 3.0.0-javaxELAPIVersion = 6.0.1-javaxELVersion = 4.0.2-slf4jVersion = 2.0.17-guavaVersion = 33.6.0-jre-checkerframeworkVersion = 4.2.0-undertowVersion = 2.3.24.Final-resteasyVersion = 6.2.16.Final-keycloakVersion = 25.0.3-classgraphVersion=4.8.184-jacksonVersion = 2.21.3-groovyVersion = 5.0.6-groovySandboxVersion = 4.3.2-sqliteVersion = 3.53.0.0-hibernateVersion = 7.3.3.Final-hibernateValidatorVersion = 9.1.0.Final-hikaricpVersion = 6.2.1-postgresJdbcVersion = 42.7.11-spockVersion = 2.4-groovy-5.0-byteBuddyVersion = 1.16.1-objenesisVersion = 3.4-camelVersion = 4.20.0-easyRulesVersion = 4.1.0-quartzVersion= 2.5.2-calimeroVersion = 2.6-uuidGeneratorVersion = 5.2.0-jSerialCommVersion = 2.11.4-saxonHEVersion = 12.9-exp4jVersion = 0.4.13-nettyVersion = 4.2.12.Final-flywaydbVersion = 11.13.1-ical4jVersion = 4.2.5-friendlyIdVersion = 1.0.4-geotoolsVersion = 34.3-firebaseAdminVersion = 9.8.0-jakartaMailVersion = 2.0.5-jaywayJsonPathVersion = 2.10.0typescriptGeneratorVersion = 3.2.1263-californiumCoreVersion = 3.14.0-californiumScandiumVersion = 3.14.0-zwaveVersion = 3.4.0-niftyModbusVersion = 0.17.0-reflectionsVersion=0.10.2-swaggerVersion=2.2.49+gradleNexusPublishPluginVersion = 2.0.0+gradleFileEncryptPluginVersion = 2.1.0+ideaExtPluginVersion = 1.2+axionReleasePluginVersion = 1.21.1+testLoggerPluginVersion = 4.0.0swaggeruiVersion = 5.18.2-hiveMQClientVersion=1.3.13-bluetoothVersion = 0.64-failsafeVersion=3.3.2-suncalcVersion=3.11snapshotsRepoUrl=https://central.sonatype.com/repository/maven-snapshots/releasesRepoUrl=https://ossrh-staging-api.central.sonatype.com/service/local/-artemisVersion = 2.53.0jbossLoggingManagerVersion=2.1.19.Final-greenmailVersion=2.1.2-prometheusVersion=1.6.1-micrometerVersion=1.16.5-jdomVersion = 2.0.6.1-apacheMINAVersion = 2.16.0-bouncyCastleVersion = 1.83-victoolsJsonSchemaGeneratorVersion = 4.38.0-moquetteVersion = 0.18.0-corsFilterVersion = 3.1-junitVersion = 6.0.3-mockitoVersion = 5.23.0grpcVersion = 1.80.0-grpcAnnotationsVersion = 1.3.2protobufVersion = 3.25.5protobufPluginVersion = 0.9.4diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlnew file mode 100644index 000000000..50967f6ee--- /dev/null+++ b/gradle/libs.versions.toml@@ -0,0 +1,181 @@+[versions]+angusMail = "2.0.5"+artemis = "2.53.0"+apacheSshd = "2.16.0"+bouncyCastle = "1.83"+byteBuddy = "1.16.1"+bluetooth = "0.64"+californium = "3.14.0"+calimero = "2.6"+camel = "4.20.0"+checkerframework = "3.55.1"+classgraph = "4.8.184"+corsFilter = "3.1"+easyRules = "4.1.0"+exp4j = "0.4.13"+failsafe = "3.3.2"+firebaseAdmin = "9.8.0"+flywaydb = "11.13.1"+friendlyId = "1.0.4"+geotools = "34.3"+glassfishSoteria = "3.0.4"+greenmail = "2.1.2"+grpc = "1.80.0"+grpcAnnotations = "1.3.2"+groovy = "5.0.6"+groovySandbox = "4.3.2"+guava = "33.6.0-jre"+hibernate = "7.3.3.Final"+hibernateValidator = "9.1.0.Final"+hikaricp = "6.2.1"+hiveMqttClient = "1.3.13"+ical4j = "4.2.5"+jackson = "2.21.3"+jakartaEl = "4.0.2"+jakartaElApi = "6.0.1"+jakartaSecurityEnterpriseApi = "4.0.0"+jakartaWsRs = "3.1.0"+javaxAnnotationApi = "3.0.0"+jaywayJsonPath = "2.10.0"+jdom = "2.0.6.1"+jserialcomm = "2.11.4"+jsonassert = "1.5.3"+junit = "6.0.3"+keycloak = "25.0.3"+micrometer = "1.16.5"+mockito = "5.23.0"+netty = "4.2.12.Final"+niftyModbus = "0.17.0"+nimbusJoseJwt = "10.4.2"+objenesis = "3.4"+moquette = "0.18.0"+postgresJdbc = "42.7.11"+prometheus = "1.6.1"+quartz = "2.5.2"+reflections = "0.10.2"+resteasy = "6.2.16.Final"+resteasyCache = "4.7.10.Final"+saxonHe = "12.9"+slf4j = "2.0.17"+spock = "2.4-groovy-5.0"+sqlite = "3.53.0.0"+suncalc = "3.11"+swagger = "2.2.49"+typescriptGenerator = "3.2.1263"+undertow = "2.3.24.Final"+uuidGenerator = "5.2.0"+victoolsJsonSchemaGenerator = "4.38.0"+zwave = "3.4.0"++[libraries]+angusMail = { module = "org.eclipse.angus:angus-mail", version.ref = "angusMail" }+artemisMqttProtocol = { module = "org.apache.artemis:artemis-mqtt-protocol", version.ref = "artemis" }+artemisServer = { module = "org.apache.artemis:artemis-server", version.ref = "artemis" }+byteBuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byteBuddy" }+byteBuddyAgent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "byteBuddy" }+blessedBluez = { module = "com.github.weliem:blessed-bluez", version.ref = "bluetooth" }+bouncycastleBcprovJdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }+bouncycastleBcpkixJdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncyCastle" }+californiumCore = { module = "org.eclipse.californium:californium-core", version.ref = "californium" }+californiumScandium = { module = "org.eclipse.californium:scandium", version.ref = "californium" }+calimeroCore = { module = "com.github.calimero:calimero-core", version.ref = "calimero" }+calimeroServer = { module = "com.github.calimero:calimero-server", version.ref = "calimero" }+calimeroTools = { module = "com.github.calimero:calimero-tools", version.ref = "calimero" }+camelCore = { module = "org.apache.camel:camel-core", version.ref = "camel" }+camelCoreModel = { module = "org.apache.camel:camel-core-model", version.ref = "camel" }+camelHealth = { module = "org.apache.camel:camel-health", version.ref = "camel" }+camelJackson = { module = "org.apache.camel:camel-jackson", version.ref = "camel" }+camelManagement = { module = "org.apache.camel:camel-management", version.ref = "camel" }+camelSnmp = { module = "org.apache.camel:camel-snmp", version.ref = "camel" }+camelUndertow = { module = "org.apache.camel:camel-undertow", version.ref = "camel" }+checkerQual = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework" }+classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" }+corsFilter = { module = "com.thetransactioncompany:cors-filter", version.ref = "corsFilter" }+easyRulesCore = { module = "org.jeasy:easy-rules-core", version.ref = "easyRules" }+exp4j = { module = "fr.neolegal:exp4j", version.ref = "exp4j" }+failsafe = { module = "dev.failsafe:failsafe", version.ref = "failsafe" }+firebaseAdmin = { module = "com.google.firebase:firebase-admin", version.ref = "firebaseAdmin" }+flywayCore = { module = "org.flywaydb:flyway-core", version.ref = "flywaydb" }+flywayDatabasePostgresql = { module = "org.flywaydb:flyway-database-postgresql", version.ref = "flywaydb" }+friendlyId = { module = "com.devskiller.friendly-id:friendly-id", version.ref = "friendlyId" }+geotoolsMain = { module = "org.geotools:gt-main", version.ref = "geotools" }+glassfishSoteria = { module = "org.glassfish.soteria:jakarta.security.enterprise", version.ref = "glassfishSoteria" }+grpcNettyShaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" }+grpcProtobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }+grpcStub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }+groovy = { module = "org.apache.groovy:groovy", version.ref = "groovy" }+groovyAll = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }+groovyJson = { module = "org.apache.groovy:groovy-json", version.ref = "groovy" }+groovySandbox = { module = "org.craftercms:groovy-sandbox", version.ref = "groovySandbox" }+groovyTest = { module = "org.apache.groovy:groovy-test", version.ref = "groovy" }+groovyXml = { module = "org.apache.groovy:groovy-xml", version.ref = "groovy" }+groovyYaml = { module = "org.apache.groovy:groovy-yaml", version.ref = "groovy" }+greenmail = { module = "com.icegreen:greenmail", version.ref = "greenmail" }+guava = { module = "com.google.guava:guava", version.ref = "guava" }+hibernateCore = { module = "org.hibernate.orm:hibernate-core", version.ref = "hibernate" }+hibernateHikaricp = { module = "org.hibernate.orm:hibernate-hikaricp", version.ref = "hibernate" }+hibernateValidator = { module = "org.hibernate.validator:hibernate-validator", version.ref = "hibernateValidator" }+hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "hikaricp" }+hiveMqttClient = { module = "com.hivemq:hivemq-mqtt-client", version.ref = "hiveMqttClient" }+ical4j = { module = "org.mnode.ical4j:ical4j", version.ref = "ical4j" }+jacksonDataformatCsv = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-csv", version.ref = "jackson" }+jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }+jacksonDatatypeJdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }+jacksonDatatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }+jacksonModuleParameterNames = { module = "com.fasterxml.jackson.module:jackson-module-parameter-names", version.ref = "jackson" }+jakartaAnnotationApi = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "javaxAnnotationApi" }+jakartaEl = { module = "org.glassfish:jakarta.el", version.ref = "jakartaEl" }+jakartaElApi = { module = "jakarta.el:jakarta.el-api", version.ref = "jakartaElApi" }+jakartaSecurityEnterpriseApi = { module = "jakarta.security.enterprise:jakarta.security.enterprise-api", version.ref = "jakartaSecurityEnterpriseApi" }+jakartaWsRsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakartaWsRs" }+javaUuidGenerator = { module = "com.fasterxml.uuid:java-uuid-generator", version.ref = "uuidGenerator" }+javaxAnnotationApi = { module = "javax.annotation:javax.annotation-api", version.ref = "grpcAnnotations" }+jaywayJsonPath = { module = "com.jayway.jsonpath:json-path", version.ref = "jaywayJsonPath" }+jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom" }+jserialcomm = { module = "com.fazecast:jSerialComm", version.ref = "jserialcomm" }+jsonassert = { module = "org.skyscreamer:jsonassert", version.ref = "jsonassert" }+junitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }+junitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }+junitJupiterParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }+keycloakAdminClient = { module = "org.keycloak:keycloak-admin-client", version.ref = "keycloak" }+keycloakCore = { module = "org.keycloak:keycloak-core", version.ref = "keycloak" }+micrometerCore = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" }+micrometerRegistryPrometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer" }+mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }+nettyCodec = { module = "io.netty:netty-codec", version.ref = "netty" }+nettyCodecHttp = { module = "io.netty:netty-codec-http", version.ref = "netty" }+nettyCodecMqtt = { module = "io.netty:netty-codec-mqtt" }+niftyModbusApi = { module = "net.solarnetwork.common:nifty-modbus-api", version.ref = "niftyModbus" }+niftyModbusCore = { module = "net.solarnetwork.common:nifty-modbus-core", version.ref = "niftyModbus" }+niftyModbusRtuJsc = { module = "net.solarnetwork.common:nifty-modbus-rtu-jsc", version.ref = "niftyModbus" }+niftyModbusTcp = { module = "net.solarnetwork.common:nifty-modbus-tcp", version.ref = "niftyModbus" }+nimbusJoseJwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbusJoseJwt" }+objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }+moquette = { module = "com.github.moquette-io:moquette", version.ref = "moquette" }+orZwave = { module = "org.openremote:or-zwave", version.ref = "zwave" }+postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresJdbc" }+prometheusMetricsExporterHttpserver = { module = "io.prometheus:prometheus-metrics-exporter-httpserver", version.ref = "prometheus" }+quartz = { module = "org.quartz-scheduler:quartz", version.ref = "quartz" }+reflections = { module = "org.reflections:reflections", version.ref = "reflections" }+resteasyCacheCore = { module = "org.jboss.resteasy:resteasy-cache-core", version.ref = "resteasyCache" }+resteasyClient = { module = "org.jboss.resteasy:resteasy-client", version.ref = "resteasy" }+resteasyClientApi = { module = "org.jboss.resteasy:resteasy-client-api", version.ref = "resteasy" }+resteasyJackson2Provider = { module = "org.jboss.resteasy:resteasy-jackson2-provider", version.ref = "resteasy" }+resteasyMultipartProvider = { module = "org.jboss.resteasy:resteasy-multipart-provider", version.ref = "resteasy" }+resteasyUndertow = { module = "org.jboss.resteasy:resteasy-undertow", version.ref = "resteasy" }+resteasyValidatorProvider = { module = "org.jboss.resteasy:resteasy-validator-provider", version.ref = "resteasy" }+saxonHe = { module = "net.sf.saxon:Saxon-HE", version.ref = "saxonHe" }+slf4jJdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }+spockBom = { module = "org.spockframework:spock-bom", version.ref = "spock" }+spockCore = { module = "org.spockframework:spock-core" }+sqliteJdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }+suncalc = { module = "org.shredzone.commons:commons-suncalc", version.ref = "suncalc" }+swaggerAnnotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger" }+swaggerJaxrs2Jakarta = { module = "io.swagger.core.v3:swagger-jaxrs2-jakarta", version.ref = "swagger" }+sshdNetty = { module = "org.apache.sshd:sshd-netty", version.ref = "apacheSshd" }+typescriptGeneratorCore = { module = "cz.habarta.typescript-generator:typescript-generator-core", version.ref = "typescriptGenerator" }+undertowCore = { module = "io.undertow:undertow-core", version.ref = "undertow" }+undertowWebsocketsJsr = { module = "io.undertow:undertow-websockets-jsr", version.ref = "undertow" }+victoolsJsonschemaGenerator = { module = "com.github.victools:jsonschema-generator", version.ref = "victoolsJsonSchemaGenerator" }+victoolsJsonschemaModuleJackson = { module = "com.github.victools:jsonschema-module-jackson", version.ref = "victoolsJsonSchemaGenerator" }+victoolsJsonschemaModuleJakartaValidation = { module = "com.github.victools:jsonschema-module-jakarta-validation", version.ref = "victoolsJsonSchemaGenerator" }diff --git a/manager/build.gradle b/manager/build.gradleindex e401f37b5..fb6990638 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -17,50 +17,50 @@ dependencies {api project(":agent")api project(":model")- implementation "org.xerial:sqlite-jdbc:$sqliteVersion"+ implementation libs.sqliteJdbc- api "org.mnode.ical4j:ical4j:$ical4jVersion"+ api libs.ical4j- implementation "org.geotools:gt-main:$geotoolsVersion"- implementation "com.google.firebase:firebase-admin:$firebaseAdminVersion"- implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion"- implementation "io.swagger.core.v3:swagger-jaxrs2-jakarta:$swaggerVersion"- implementation "org.apache.camel:camel-undertow:$camelVersion"+ implementation libs.geotoolsMain+ implementation libs.firebaseAdmin+ implementation libs.angusMail+ implementation libs.swaggerJaxrs2Jakarta+ implementation libs.camelUndertow// Indirect dep from org.apache.activemq:artemis-mqtt-protocol- api ("io.netty:netty-codec-mqtt") {+ api(libs.nettyCodecMqtt) {version {- strictly "$nettyVersion"+ strictly libs.versions.netty.get()}}- implementation("org.apache.artemis:artemis-mqtt-protocol:$artemisVersion") {+ implementation(libs.artemisMqttProtocol) {exclude group: "org.osgi"exclude group: "org.jboss.logmanager"}// Needed for reference in tests- api("org.apache.artemis:artemis-server:$artemisVersion") {+ api(libs.artemisServer) {exclude group: "org.osgi"exclude group: "org.jboss.logmanager"}- implementation("org.quartz-scheduler:quartz:$quartzVersion") {+ implementation(libs.quartz) {exclude module: "c3p0"exclude module: "HikariCP-java7"}- implementation "org.shredzone.commons:commons-suncalc:$suncalcVersion"- implementation "io.prometheus:prometheus-metrics-exporter-httpserver:$prometheusVersion"+ implementation libs.suncalc+ implementation libs.prometheusMetricsExporterHttpserver- implementation "org.apache.sshd:sshd-netty:$apacheMINAVersion"+ implementation libs.sshdNetty- testImplementation "org.apache.groovy:groovy-all:$groovyVersion"- testImplementation platform("org.spockframework:spock-bom:$spockVersion")- testImplementation "org.spockframework:spock-core"- testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion"- testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion"- testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion"+ testImplementation libs.groovyAll+ testImplementation platform(libs.spockBom)+ testImplementation libs.spockCore+ testImplementation libs.byteBuddy+ testImplementation libs.byteBuddyAgent+ testRuntimeOnly libs.objenesis}sourceSets {diff --git a/model-util/build.gradle b/model-util/build.gradleindex a16e42d38..f4fc66d83 100644--- a/model-util/build.gradle+++ b/model-util/build.gradle@@ -12,7 +12,7 @@ repositories {dependencies {implementation project(":model")implementation project(":agent")- implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"+ implementation libs.typescriptGeneratorCore}base {diff --git a/model/build.gradle b/model/build.gradleindex 11be54809..4d93a9f54 100644--- a/model/build.gradle+++ b/model/build.gradle@@ -3,50 +3,50 @@ apply plugin: "maven-publish"apply plugin: "signing"dependencies {- api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"- api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- api "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"+ api libs.jacksonDatabind+ api libs.jacksonDatatypeJdk8+ api libs.jacksonDatatypeJsr310+ api libs.jacksonModuleParameterNames- api "org.hibernate.orm:hibernate-core:$hibernateVersion"- api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion"- api "jakarta.el:jakarta.el-api:$javaxELAPIVersion"- api "jakarta.annotation:jakarta.annotation-api:$javaxAnnotationsVersion"- api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxrsSpecVersion"- api "org.jboss.resteasy:resteasy-cache-core:4.7.10.Final"+ api libs.hibernateCore+ api libs.hibernateValidator+ api libs.jakartaElApi+ api libs.jakartaAnnotationApi+ api libs.jakartaWsRsApi+ api libs.resteasyCacheCore- api "org.keycloak:keycloak-core:$keycloakVersion"+ api libs.keycloakCore- api "org.geotools:gt-main:$geotoolsVersion"- api "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"+ api libs.geotoolsMain+ api libs.jaywayJsonPath- api "org.jeasy:easy-rules-core:$easyRulesVersion"- api "org.mnode.ical4j:ical4j:$ical4jVersion"- api "org.reflections:reflections:$reflectionsVersion"- api "com.google.guava:guava:$guavaVersion"+ api libs.easyRulesCore+ api libs.ical4j+ api libs.reflections+ api libs.guava- api "org.checkerframework:checker-qual:$checkerframeworkVersion"+ api libs.checkerQual- api "io.swagger.core.v3:swagger-annotations:$swaggerVersion"+ api libs.swaggerAnnotations- api "com.github.victools:jsonschema-generator:$victoolsJsonSchemaGeneratorVersion"- api "com.github.victools:jsonschema-module-jackson:$victoolsJsonSchemaGeneratorVersion"- api "com.github.victools:jsonschema-module-jakarta-validation:$victoolsJsonSchemaGeneratorVersion"+ api libs.victoolsJsonschemaGenerator+ api libs.victoolsJsonschemaModuleJackson+ api libs.victoolsJsonschemaModuleJakartaValidation- api "io.github.classgraph:classgraph:$classgraphVersion"- api "io.micrometer:micrometer-core:$micrometerVersion"- api "com.devskiller.friendly-id:friendly-id:$friendlyIdVersion"- api "com.fasterxml.uuid:java-uuid-generator:$uuidGeneratorVersion"+ api libs.classgraph+ api libs.micrometerCore+ api libs.friendlyId+ api libs.javaUuidGenerator- api "fr.neolegal:exp4j:$exp4jVersion"+ api libs.exp4jdependencies {- testImplementation 'org.skyscreamer:jsonassert:1.5.3'- testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"- testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"- testImplementation "org.mockito:mockito-core:$mockitoVersion"- testRuntimeOnly 'org.glassfish:jakarta.el:4.0.2'- testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"+ testImplementation libs.jsonassert+ testImplementation libs.junitJupiterParams+ testImplementation libs.junitJupiterApi+ testImplementation libs.mockitoCore+ testRuntimeOnly libs.jakartaEl+ testRuntimeOnly libs.junitJupiterEnginetestRuntimeOnly "org.junit.platform:junit-platform-launcher"}}diff --git a/settings.gradle b/settings.gradleindex e7b27273e..f53147800 100644--- a/settings.gradle+++ b/settings.gradle@@ -17,10 +17,10 @@ pluginManagement {plugins {id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false- id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false- id 'io.openremote.com.cherryperry.gradle-file-encrypt' version '2.1.0' apply false- id 'org.jetbrains.gradle.plugin.idea-ext' version '1.2' apply false- id 'pl.allegro.tech.build.axion-release' version '1.21.1' apply false+ id 'io.github.gradle-nexus.publish-plugin' version "$gradleNexusPublishPluginVersion" apply false+ id 'io.openremote.com.cherryperry.gradle-file-encrypt' version "$gradleFileEncryptPluginVersion" apply false+ id 'org.jetbrains.gradle.plugin.idea-ext' version "$ideaExtPluginVersion" apply false+ id 'pl.allegro.tech.build.axion-release' version "$axionReleasePluginVersion" apply false}rootProject.name = "openremote"diff --git a/test/build.gradle b/test/build.gradleindex f1500e83b..dfdf6377a 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -1,5 +1,5 @@plugins {- id 'com.adarshr.test-logger' version '4.0.0'+ id 'com.adarshr.test-logger' version "$testLoggerPluginVersion"}apply plugin: "java-library"@@ -12,39 +12,39 @@ dependencies {testImplementation rootProject.project(":setup").sourceSets.integration.outputapi project(":manager")- implementation "org.apache.groovy:groovy-all:$groovyVersion"- implementation "org.apache.groovy:groovy-test:$groovyVersion"- api platform("org.spockframework:spock-bom:$spockVersion")- api 'org.spockframework:spock-core'+ implementation libs.groovyAll+ implementation libs.groovyTest+ api platform(libs.spockBom)+ api libs.spockCore// optional dependencies for using Spock- testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)- testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion" // for runtime class redefinition- testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)+ testImplementation libs.byteBuddy // allows mocking of classes (in addition to interfaces)+ testImplementation libs.byteBuddyAgent // for runtime class redefinition+ testRuntimeOnly libs.objenesis // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)- testImplementation("com.github.calimero:calimero-server:$calimeroVersion") {+ testImplementation(libs.calimeroServer) {// Has a dependency on the SLF4J simple providerexclude group: "org.slf4j"}- testImplementation "com.google.firebase:firebase-admin:$firebaseAdminVersion"- testImplementation "org.shredzone.commons:commons-suncalc:$suncalcVersion"- testImplementation "com.icegreen:greenmail:$greenmailVersion"- testImplementation "dev.failsafe:failsafe:$failsafeVersion"+ testImplementation libs.firebaseAdmin+ testImplementation libs.suncalc+ testImplementation libs.greenmail+ testImplementation libs.failsafe- testImplementation "net.solarnetwork.common:nifty-modbus-tcp:$niftyModbusVersion"- testImplementation "net.solarnetwork.common:nifty-modbus-rtu-jsc:$niftyModbusVersion"- testImplementation "net.solarnetwork.common:nifty-modbus-api:$niftyModbusVersion"- testImplementation "net.solarnetwork.common:nifty-modbus-core:$niftyModbusVersion"+ testImplementation libs.niftyModbusTcp+ testImplementation libs.niftyModbusRtuJsc+ testImplementation libs.niftyModbusApi+ testImplementation libs.niftyModbusCore- testImplementation "com.github.moquette-io:moquette:$moquetteVersion"- testImplementation "com.hivemq:hivemq-mqtt-client:$hiveMQClientVersion"+ testImplementation libs.moquette+ testImplementation libs.hiveMqttClient- testImplementation "io.grpc:grpc-netty-shaded:$grpcVersion"- testImplementation "io.grpc:grpc-protobuf:$grpcVersion"- testImplementation "io.grpc:grpc-stub:$grpcVersion"+ testImplementation libs.grpcNettyShaded+ testImplementation libs.grpcProtobuf+ testImplementation libs.grpcStub- testImplementation "org.bouncycastle:bcpkix-jdk18on:$bouncyCastleVersion"+ testImplementation libs.bouncycastleBcpkixJdk18on}tasks.withType(Test) {diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex 78bc62a4d..f3de5a724 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -16,10 +16,10 @@ dependencies {compileOnly project(":model-util")implementation project(":model")implementation project(":agent")- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"- implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"+ implementation libs.jacksonDatatypeJdk8+ implementation libs.jacksonDatatypeJsr310+ implementation libs.jacksonModuleParameterNames+ implementation libs.typescriptGeneratorCore}generateTypeScript createTSGeneratorConfigForModel("src/model.ts")diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 813980ea9..f7bf0045c 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -20,10 +20,10 @@ dependencies {}compileOnly project(":model-util")implementation project(":model")- implementation "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"- implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"+ implementation libs.typescriptGeneratorCore+ implementation libs.jacksonDatatypeJdk8+ implementation libs.jacksonDatatypeJsr310+ implementation libs.jacksonModuleParameterNames}//project.task(Collections.singletonMap(Task.TASK_TYPE, cz.habarta.typescript.generator.gradle.GenerateTask), "generateTypescriptModelInfo")