Merge pull request #49 from jactor-rises/feature/versions

Feature/versions

build.gradle.kts

@@ -1,9 +1,9 @@
 
 plugins {
-    id("com.github.ben-manes.versions") version Versions.V0_46_0 apply false
-    id("io.spring.dependency-management") version Versions.V1_1_0 apply false
+    id("com.github.ben-manes.versions") version "0.46.0" apply false
+    id("io.spring.dependency-management") version "1.1.0" apply false
 
-    kotlin("plugin.spring") version Versions.V1_9_10 apply false
+    kotlin("plugin.spring") version "1.9.21" apply false
 }
 
 subprojects {

buildSrc/build.gradle.kts

@@ -18,5 +18,5 @@ tasks.compileKotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
 }

buildSrc/src/main/kotlin/jactor-modules-kotlin-conventions.gradle.kts

@@ -16,21 +16,21 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     // springdoc-openapi (swagger)
-    implementation("org.springdoc:springdoc-openapi-ui:${Versions.V1_7_0}")
+    implementation("org.springdoc:springdoc-openapi-ui:1.7.0")
 
     // test
-    testImplementation("com.ninja-squad:springmockk:${Versions.V4_0_2}")
+    testImplementation("com.ninja-squad:springmockk:4.0.2")
     testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.27.0")
-    testImplementation("io.mockk:mockk:${Versions.V1_13_8}")
+    testImplementation("io.mockk:mockk:1.13.8")
     testImplementation("org.junit.platform:junit-platform-suite")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 
     // cucumber
-    testImplementation("io.cucumber:cucumber-java:${Versions.V7_14_0}")
-    testImplementation("io.cucumber:cucumber-java8:${Versions.V7_14_0}")
-    testImplementation("io.cucumber:cucumber-junit-platform-engine:${Versions.V7_14_0}")
-    testImplementation("io.cucumber:cucumber-spring:${Versions.V7_14_0}")
+    testImplementation("io.cucumber:cucumber-java:7.14.1")
+    testImplementation("io.cucumber:cucumber-java8:7.14.1")
+    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.14.1")
+    testImplementation("io.cucumber:cucumber-spring:7.14.1")
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

persistence/build.gradle.kts

@@ -3,7 +3,7 @@ version = "2.0.x-SNAPSHOT"
 description = "jactor::persistence"
 
 plugins {
-    id("org.springframework.boot") version Versions.V3_1_4
+    id("org.springframework.boot") version "3.2.0"
 }
 
 dependencies {
@@ -17,6 +17,6 @@ dependencies {
     implementation(project(":shared"))
 
     // database
-    runtimeOnly("org.flywaydb:flyway-core:${Versions.V9_22_0}")
-    runtimeOnly("com.h2database:h2:${Versions.V2_2_224}")
+    runtimeOnly("org.flywaydb:flyway-core:9.22.0")
+    runtimeOnly("com.h2database:h2:2.2.224")
 }

persistence/src/main/kotlin/com/github/jactor/persistence/entity/PersistentDataEmbeddable.kt

@@ -1,9 +1,8 @@
 package com.github.jactor.persistence.entity
 
+import java.time.LocalDateTime
 import com.github.jactor.persistence.dto.PersistentDto
-import com.github.jactor.persistence.time.Now
 import jakarta.persistence.Embeddable
-import java.time.LocalDateTime
 
 @Embeddable
 class PersistentDataEmbeddable : PersistentData {
@@ -16,9 +15,9 @@ class PersistentDataEmbeddable : PersistentData {
 
     constructor() {
         createdBy = "todo"
-        timeOfCreation = Now.asDateTime()
+        timeOfCreation = LocalDateTime.now()
         modifiedBy = "todo"
-        timeOfModification = Now.asDateTime()
+        timeOfModification = LocalDateTime.now()
     }
 
     internal constructor(persistentDto: PersistentDto) {
@@ -30,7 +29,7 @@ class PersistentDataEmbeddable : PersistentData {
 
     fun modifiedBy(modifier: String) {
         modifiedBy = modifier
-        timeOfModification = Now.asDateTime()
+        timeOfModification = LocalDateTime.now()
     }
 
     fun asPersistentDto(id: Long?): PersistentDto {

shared/build.gradle.kts

@@ -4,5 +4,5 @@ description = "jactor::shared"
 
 dependencies {
     // swagger
-    implementation("org.springdoc:springdoc-openapi-ui:${Versions.V1_7_0}")
+    implementation("org.springdoc:springdoc-openapi-ui:1.7.0")
 }

web/build.gradle.kts

@@ -3,7 +3,7 @@ version = "1.0.x-SNAPSHOT"
 description = "jactor-web"
 
 plugins {
-    id("org.springframework.boot") version Versions.V3_1_4
+    id("org.springframework.boot") version "3.2.0"
 }
 
 dependencies {
@@ -16,13 +16,13 @@ dependencies {
     implementation(project(":shared"))
 
     // --- misc dependencies ---
-    implementation("org.webjars:bootstrap:${Versions.V5_2_3}")
-    implementation("org.webjars:jquery:${Versions.V3_6_4}")
+    implementation("org.webjars:bootstrap:5.3.2")
+    implementation("org.webjars:jquery:3.7.1")
 
     // kotlin
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     // swagger
-    implementation("org.springdoc:springdoc-openapi-ui:${Versions.V1_7_0}")
+    implementation("org.springdoc:springdoc-openapi-ui:1.7.0")
 }