refactor: changed to version catalogue and upgraded dependencies

devkit-core/build.gradle.kts

@@ -56,11 +56,10 @@ dependencies {
     val logbackVersion: String by project
     val junitVersion: String by project
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    compileOnly(libs.slf4j)
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    implementation(libs.logback)
 
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    testImplementation(libs.junit)
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

devkit-utils/build.gradle.kts

@@ -52,16 +52,10 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-
+    testImplementation(libs.junit)
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation(project(":devkit-core"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

gradle.properties

@@ -19,12 +19,4 @@ artefactVersion=2.1.0
 projectUrl=https://onixbyte.com/JDevKit
 projectGithubUrl=https://github.com/OnixByte/JDevKit
 licenseName=The Apache License, Version 2.0
-licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt
+licenseUrl=https://www.apache.org/licenses/LICENSE-2.0.txt
-
-jacksonVersion=2.18.2
-javaJwtVersion=4.4.0
-junitVersion=5.11.4
-logbackVersion=1.5.16
-slf4jVersion=2.0.16
-springVersion=6.2.2
-springBootVersion=3.4.2

gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+slf4j = "2.0.17"
+logback = "1.5.18"
+jackson = "2.18.3"
+jwt = "4.5.0"
+spring = "6.2.6"
+springBoot = "3.4.4"
+junit = "5.12.2"
+
+[libraries]
+slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
+jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" }
+jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
+jwt = { group = "com.auth0", name = "java-jwt", version.ref = "jwt"}
+spring-boot-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure", version.ref = "springBoot" }
+spring-boot-starter-logging = { group = "org.springframework.boot", name = "spring-boot-starter-logging", version.ref = "springBoot" }
+spring-boot-configuration-processor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "springBoot" }
+spring-boot-starter-redis = { group = "org.springframework.boot", name = "spring-boot-starter-data-redis", version.ref = "springBoot" }
+spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBoot" }
+junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }

guid/build.gradle.kts

@@ -52,16 +52,10 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-
+    testImplementation(libs.junit)
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation(project(":devkit-core"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

key-pair-loader/build.gradle.kts

@@ -52,16 +52,10 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-
+    testImplementation(libs.junit)
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation(project(":devkit-core"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

map-util-unsafe/build.gradle.kts

@@ -52,16 +52,10 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-
+    testImplementation(libs.junit)
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation(project(":devkit-core"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

num4j/build.gradle.kts

@@ -52,16 +52,10 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-
+    testImplementation(libs.junit)
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
-    implementation(project(":devkit-core"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

property-guard-spring-boot-starter/build.gradle.kts

@@ -52,22 +52,16 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
+    api(project(":devkit-core"))
-    val springBootVersion: String by project
+    api(project(":devkit-utils"))
+    implementation(libs.spring.boot.autoconfigure)
+    implementation(libs.spring.boot.starter.logging)
+    implementation(libs.spring.boot.configuration.processor)
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    testImplementation(libs.junit)
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    testImplementation(libs.spring.boot.starter.test)
-    implementation(project(":devkit-core"))
-    implementation(project(":devkit-utils"))
-    implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-starter-logging:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
-
-    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

simple-jwt-authzero/build.gradle.kts

@@ -52,24 +52,17 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
-    val jacksonVersion: String by project
-    val javaJwtVersion: String by project
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    api(project(":devkit-utils"))
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    api(project(":guid"))
+    api(project(":key-pair-loader"))
+    api(project(":simple-jwt-facade"))
+    api(libs.jackson.databind)
+    api(libs.jwt)
 
-    implementation(project(":devkit-utils"))
+    testImplementation(libs.junit)
-    implementation(project(":guid"))
-    implementation(project(":key-pair-loader"))
-    implementation(project(":simple-jwt-facade"))
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    implementation("com.auth0:java-jwt:$javaJwtVersion")
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

simple-jwt-facade/build.gradle.kts

@@ -52,19 +52,14 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    api(project(":devkit-core"))
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    api(project(":devkit-utils"))
+    api(project(":guid"))
 
-    implementation(project(":devkit-core"))
+    testImplementation(libs.junit)
-    implementation(project(":devkit-utils"))
-    implementation(project(":guid"))
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
 }
 
 tasks.test {

simple-jwt-spring-boot-starter/build.gradle.kts

@@ -52,29 +52,19 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
-    val javaJwtVersion: String by project
-    val jacksonVersion: String by project
-    val springBootVersion: String by project
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    api(project(":guid"))
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    api(project(":simple-jwt-facade"))
+    api(project(":simple-jwt-authzero"))
+    implementation(libs.spring.boot.autoconfigure)
+    implementation(libs.spring.boot.starter.logging)
+    implementation(libs.spring.boot.configuration.processor)
+    annotationProcessor(libs.spring.boot.configuration.processor)
 
-    implementation(project(":guid"))
+    testImplementation(libs.junit)
-    implementation(project(":simple-jwt-facade"))
+    testImplementation(libs.spring.boot.starter.test)
-    compileOnly("com.auth0:java-jwt:$javaJwtVersion")
-    compileOnly(project(":simple-jwt-authzero"))
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-starter-logging:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
-    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
 }
 
 java {

simple-jwt/build.gradle.kts

@@ -1,8 +1,32 @@
+/*
+ * Copyright (C) 2024-2024 OnixByte.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 plugins {
     id("java")
+    id("java-library")
+    id("maven-publish")
+    id("signing")
 }
 
 val artefactVersion: String by project
+val projectUrl: String by project
+val projectGithubUrl: String by project
+val licenseName: String by project
+val licenseUrl: String by project
 
 group = "com.onixbyte"
 version = artefactVersion
@@ -12,13 +36,13 @@ repositories {
 }
 
 dependencies {
-    val jacksonVersion: String by project
+    compileOnly(libs.slf4j)
-    implementation(project(":devkit-core"))
+    implementation(libs.logback)
-    implementation(project(":devkit-utils"))
+    api(project(":devkit-core"))
-    implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
+    api(project(":devkit-utils"))
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+    implementation(libs.jackson.core)
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    implementation(libs.jackson.databind)
-    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation(libs.junit)
 }
 
 tasks.test {

simple-serial-spring-boot-starter/build.gradle.kts

@@ -52,27 +52,18 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    val slf4jVersion: String by project
+    compileOnly(libs.slf4j)
-    val logbackVersion: String by project
+    implementation(libs.logback)
-    val junitVersion: String by project
-    val jacksonVersion: String by project
-    val springBootVersion: String by project
 
-    compileOnly("org.slf4j:slf4j-api:$slf4jVersion")
+    implementation(libs.jackson.databind)
-    implementation("ch.qos.logback:logback-classic:$logbackVersion")
+    implementation(libs.spring.boot.autoconfigure)
+    implementation(libs.spring.boot.starter.logging)
+    implementation(libs.spring.boot.configuration.processor)
+    implementation(libs.spring.boot.starter.redis)
+    annotationProcessor(libs.spring.boot.configuration.processor)
 
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
+    testImplementation(libs.junit)
-    implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
+    testImplementation(libs.spring.boot.starter.test)
-    implementation("org.springframework.boot:spring-boot-starter-logging:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
-    implementation("org.springframework.boot:spring-boot-starter-data-redis:$springBootVersion")
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
-
-    testCompileOnly("org.slf4j:slf4j-api:$slf4jVersion")
-    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
-    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
 }
 
 tasks.test {