[Web App JOLT] Update Gradle resolves #16

build.gradle.kts

@@ -1,54 +1,14 @@
-plugins {
-    id("java")
-    id("io.spring.dependency-management") version "1.1.6"
-}
-
 allprojects {
-    apply(plugin = "java")
-    apply(plugin = "jacoco")
-    apply(plugin = "io.spring.dependency-management")
-
     val versionFromProperty = "${project.property("version")}"
     val versionFromEnv: String? = System.getenv("VERSION")
 
     version = versionFromEnv ?: versionFromProperty
     group = "${project.property("group")}"
 
-    val targetJavaVersion = (project.property("jdk_version") as String).toInt()
-    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
-
-    java {
-        sourceCompatibility = javaVersion
-        targetCompatibility = javaVersion
-
-        if (JavaVersion.current() < javaVersion) {
-            toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-        }
-        withJavadocJar()
-        withSourcesJar()
-    }
-
     repositories {
         mavenCentral()
         maven(url = "https://nexus.sibmaks.ru/repository/maven-snapshots/")
         maven(url = "https://nexus.sibmaks.ru/repository/maven-releases/")
     }
 
-    dependencyManagement {
-        imports {
-            mavenBom("org.springframework.boot:spring-boot-dependencies:${project.property("lib_springboot_version")}")
-        }
-    }
-
-    tasks.withType<JavaCompile>().configureEach {
-        // ensure that the encoding is set to UTF-8, no matter what the system default is
-        // this fixes some edge cases with special characters not displaying correctly
-        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-        // If Javadoc is generated, this must be specified in that task too.
-        options.encoding = "UTF-8"
-        if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-            options.release = targetJavaVersion
-        }
-    }
-
-}
+}

gradle.properties

@@ -7,7 +7,4 @@ jdk_version=21
 author=SibDevTools
 project_name=jolt
 group=com.github.sibdevtools.web.app
-version=unspecified
-
-# spring libraries
-lib_springboot_version=3.3.3
+version=unspecified

gradle/libs.versions.toml

@@ -0,0 +1,38 @@
+[versions]
+java = "21"
+
+spring-framework = "3.3.3"
+spring-dependency-managment = "1.1.6"
+gradle-node = "7.1.0"
+node = "22.13.1"
+npm = "11.1.0"
+
+jolt = "0.1.8"
+
+# service APIs deps
+common-api = "0.0.2"
+localization-api = "0.0.7"
+error-api = "0.0.16"
+web-app-api = "0.0.6"
+
+[libraries]
+jolt = { module = "com.bazaarvoice.jolt:jolt-core", version.ref = "jolt"}
+
+common-api = { module = "com.github.sibdevtools:api-common", version.ref = "common-api" }
+localization-api = { module = "com.github.sibdevtools:api-localization", version.ref = "localization-api" }
+error-api = { module = "com.github.sibdevtools:api-error", version.ref = "error-api" }
+web-app-api = { module = "com.github.sibdevtools:api-web-app", version.ref = "web-app-api" }
+
+[bundles]
+service-api = [
+    "common-api",
+    "localization-api",
+    "error-api",
+    "web-app-api"
+]
+
+[plugins]
+spring-framework-boot = { id = "org.springframework.boot", version.ref = "spring-framework" }
+spring-dependency-managment = { id = "io.spring.dependency-management", version.ref = "spring-dependency-managment" }
+
+node = { id = "com.github.node-gradle.node", version.ref = "gradle-node" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Apr 10 16:28:10 MSK 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

web-app-frontend/build.gradle.kts

@@ -1,22 +1,18 @@
 import com.github.gradle.node.npm.task.NpmTask
 
 plugins {
-  id("com.github.node-gradle.node") version "7.0.2"
+  alias(libs.plugins.node)
 }
 
 node {
-  version.set("22.9.0")
-  npmVersion.set("10.8.3")
+  version = libs.versions.node.get()
+  npmVersion = libs.versions.npm.get()
   download.set(true)
 }
 
-tasks.register<NpmTask>("buildFrontend") {
+tasks.register<NpmTask>("build") {
   group = "build"
   description = "Builds the React frontend using npm."
   dependsOn("npmInstall")
   args.set(listOf("run", "build"))
 }
-
-tasks.named("build") {
-  dependsOn("buildFrontend")
-}

web-app/build.gradle.kts

@@ -5,26 +5,27 @@ plugins {
     id("java")
     id("jacoco")
     id("maven-publish")
+    alias(libs.plugins.spring.dependency.managment)
 }
 
 dependencies {
     compileOnly("org.projectlombok:lombok")
+    compileOnly("jakarta.servlet:jakarta.servlet-api")
+
     annotationProcessor("org.projectlombok:lombok")
 
     implementation("org.springframework:spring-context")
     implementation("org.springframework:spring-core")
     implementation("org.springframework:spring-web")
     implementation("org.springframework:spring-webmvc")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
 
-    implementation("com.bazaarvoice.jolt:jolt-core:${project.property("lib_jolt_version")}")
+    implementation(libs.jolt)
 
     implementation("jakarta.annotation:jakarta.annotation-api")
 
-    implementation("com.github.sibdevtools:api-common:${project.property("lib_api_common_version")}")
-    implementation("com.github.sibdevtools:api-error:${project.property("lib_api_error_version")}")
-    implementation("com.github.sibdevtools:api-localization:${project.property("lib_api_localization_version")}")
-    implementation("com.github.sibdevtools:api-web-app:${project.property("lib_api_web_app_version")}")
+    implementation(libs.bundles.service.api)
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.boot:spring-boot-starter-web")
@@ -40,6 +41,36 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
+val targetJavaVersion = (libs.versions.java.get()).toInt()
+val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+
+java {
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
+
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+    }
+    withSourcesJar()
+}
+
+dependencyManagement {
+    imports {
+        mavenBom("org.springframework.boot:spring-boot-dependencies:${libs.versions.spring.framework.get()}")
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    options.encoding = "UTF-8"
+    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+        options.release = targetJavaVersion
+    }
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }
@@ -69,9 +100,6 @@ tasks.jar {
     from("LICENSE") {
         rename { "${it}_${project.property("project_name")}" }
     }
-    from("LICENSE") {
-        rename { "${it}_${project.property("project_name")}" }
-    }
     manifest {
         attributes(
             mapOf(