update deps

Signed-off-by: Kirill Mokevnin <[email protected]>

Author: mokevnin

Dockerfile

@@ -6,9 +6,9 @@
 # COPY frontend /frontend
 # RUN npm run build
 
-FROM eclipse-temurin:20-jdk
+FROM eclipse-temurin:24-jdk
 
-ARG GRADLE_VERSION=8.3
+ARG GRADLE_VERSION=9.0.0
 
 RUN apt-get update && apt-get install -yq make unzip
 

Makefile

@@ -1,5 +1,5 @@
 setup:
-	./gradlew wrapper --gradle-version 8.14.1
+	./gradlew wrapper --gradle-version 9.0.0
 	./gradlew build
 
 app:
@@ -22,6 +22,9 @@ install:
 test:
 	./gradlew test
 
+lint:
+	./gradlew spotlessApply
+
 update-deps:
 	./gradlew refreshVersions
 

build.gradle.kts

@@ -1,17 +1,18 @@
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.api.tasks.testing.logging.TestLogEvent
+// import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+// import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
+    alias(libs.plugins.spotless)
+
     application
-    jacoco
-    checkstyle
+    // jacoco
     alias(libs.plugins.lombok)
-    alias(libs.plugins.versions)
-    alias(libs.plugins.spotless)
+    // alias(libs.plugins.versions)
+    // alias(libs.plugins.spotless)
     alias(libs.plugins.spring.boot)
     alias(libs.plugins.spring.dependency.management)
     alias(libs.plugins.shadow)
-    alias(libs.plugins.sonarqube)
+    // alias(libs.plugins.sonarqube)
 }
 
 group = "io.hexlet.blog"
@@ -21,6 +22,12 @@ application {
     mainClass.set("io.hexlet.blog.Application")
 }
 
+// java {
+//     toolchain {
+//         languageVersion.set(JavaLanguageVersion.of(21))
+//     }
+// }
+
 repositories {
     mavenCentral()
 }
@@ -59,40 +66,47 @@ dependencies {
     testRuntimeOnly(libs.junitPlatformLauncher)
 }
 
+// Show deprecation warnings to pinpoint source
+tasks.withType<JavaCompile>().configureEach {
+    options.compilerArgs.add("-Xlint:deprecation")
+}
+
 tasks.test {
     useJUnitPlatform()
-    testLogging {
-        exceptionFormat = TestExceptionFormat.FULL
-        events =
-            setOf(
-                TestLogEvent.FAILED,
-                TestLogEvent.PASSED,
-                TestLogEvent.SKIPPED,
-            )
-        showStandardStreams = true
-    }
+    // Silence CDS warning emitted by the JVM during tests
+    jvmArgs("-Xshare:off")
+    // Uncomment to enable detailed logging
+    // testLogging {
+    //     exceptionFormat = TestExceptionFormat.FULL
+    //     events = setOf(
+    //         TestLogEvent.FAILED,
+    //         TestLogEvent.PASSED,
+    //         TestLogEvent.SKIPPED,
+    //     )
+    //     showStandardStreams = true
+    // }
 }
 
-tasks.jacocoTestReport {
-    reports {
-        xml.required.set(true)
-    }
-}
+// tasks.jacocoTestReport {
+//     reports {
+//         xml.required.set(true)
+//     }
+// }
 
 spotless {
     java {
         importOrder()
         removeUnusedImports()
         eclipse().sortMembersEnabled(true)
         formatAnnotations()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
     }
 }
 
-sonar {
-    properties {
-        property("sonar.projectKey", "hexlet-boilerplates_java-package")
-        property("sonar.organization", "hexlet-boilerplates")
-        property("sonar.host.url", "https://sonarcloud.io")
-    }
-}
+// sonar {
+//     properties {
+//         property("sonar.projectKey", "hexlet-boilerplates_java-package")
+//         property("sonar.organization", "hexlet-boilerplates")
+//         property("sonar.host.url", "https://sonarcloud.io")
+//     }
+// }

gradle/libs.versions.toml

@@ -6,38 +6,52 @@ spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot-vers
 spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-version" }
 lombok = { id = "io.freefair.lombok", version.ref = "lombok-plugin" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions-plugin" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-plugin" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow-plugin" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube-plugin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless-plugin" }
 
+# com-diffplug-spotless = { id = "com.diffplug.spotless", version = "7.2.1" }
+#
+# io-freefair-lombok = { id = "io.freefair.lombok", version = "9.0.0-rc2" }
+#
+# com-github-ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
+#
+# org-springframework-boot = { id = "org.springframework.boot", version = "3.5.5" }
+#
+# io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
+#
+# com-gradleup-shadow = { id = "com.gradleup.shadow", version = "9.1.0" }
+#
+# org-sonarqube = { id = "org.sonarqube", version = "6.2.0.5505" }
+
 [versions]
 
-spring-boot-version = "3.5.0"
+spring-boot-version = "3.5.5"
+
 spring-dependency-version = "1.1.7"
-lombok-plugin = "8.13.1"
+lombok-plugin = "9.0.0-rc2"
 versions-plugin = "0.52.0"
-shadow-plugin = "8.1.1"
+shadow-plugin = "9.1.0"
 sonarqube-plugin = "6.2.0.5505"
-spotless-plugin = "7.0.3"
+spotless-plugin = "7.2.1"
 
-commons-lang3 = "3.17.0"
+commons-lang3 = "3.18.0"
 commons-collections4 = "4.5.0"
-junit-bom = "5.12.2"
-##     ⬆ = "5.13.0-M1"
-##     ⬆ = "5.13.0-M2"
-##     ⬆ = "5.13.0-M3"
-##     ⬆ = "5.13.0-RC1"
-jackson-databind-nullable = "0.2.6"
-springdoc-openapi-ui = "2.8.8"
+junit-bom = "5.13.4"
+
+jackson-databind-nullable = "0.2.7"
+springdoc-openapi-ui = "2.8.13"
+
 datafaker = "2.4.3"
-instancio-junit = "5.4.1"
+instancio-junit = "5.5.1"
 jsonunit-assertj = "4.1.1"
 mapstruct = "1.6.3"
 h2 = "2.3.232"
 
+junit = "5.13.4"
+
 [libraries]
 
-# Spring Boot
 springBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-boot-version" }
 springBootStarterDataJpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "spring-boot-version" }
 springBootStarterValidation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "spring-boot-version" }
@@ -47,27 +61,21 @@ springBootStarterTest = { module = "org.springframework.boot:spring-boot-starter
 springBootDevtools = { module = "org.springframework.boot:spring-boot-devtools", version.ref = "spring-boot-version" }
 springBootConfigProcessor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot-version" }
 
-# OpenAPI
 springdocOpenapiUi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc-openapi-ui" }
 
-# Jackson
 jacksonDatabindNullable = { module = "org.openapitools:jackson-databind-nullable", version.ref = "jackson-databind-nullable" }
 
-# Utility libraries
 commonsLang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3" }
 commonsCollections4 = { module = "org.apache.commons:commons-collections4", version.ref = "commons-collections4" }
-datafaker = { module = "net.datafaker:datafaker", version.ref = "datafaker" }
+datafaker = "net.datafaker:datafaker:2.4.4"
 instancioJunit = { module = "org.instancio:instancio-junit", version.ref = "instancio-junit" }
 jsonunitAssertj = { module = "net.javacrumbs.json-unit:json-unit-assertj", version.ref = "jsonunit-assertj" }
 
-# MapStruct
-mapstruct = { module = "org.mapstruct:mapstruct", version.ref = "mapstruct" }
+mapstruct = "org.mapstruct:mapstruct:1.6.3"
 mapstructProcessor = { module = "org.mapstruct:mapstruct-processor", version.ref = "mapstruct" }
 
-# DB
-h2 = { module = "com.h2database:h2", version.ref = "h2" }
+h2 = "com.h2database:h2:2.3.232"
 
-# JUnit
 junitBom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
 junitJupiter = { module = "org.junit.jupiter:junit-jupiter" }
 junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher" }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_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" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -4,5 +4,5 @@ rootProject.name = "SpringBootApplication"
 
 plugins {
     // See https://jmfayard.github.io/refreshVersions
-    id("de.fayard.refreshVersions") version "0.60.5"
+    id("de.fayard.refreshVersions") version "0.60.6"
 }

settings.gradle.kts

@@ -1,46 +1,18 @@
 package io.hexlet.blog.config;
 
-import io.hexlet.blog.service.CustomUserDetailsService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 
 @Configuration
 @EnableWebSecurity
-@AllArgsConstructor
 public class SecurityConfig {
-    @Autowired
-    private final PasswordEncoder passwordEncoder;
-
-    @Autowired
-    private CustomUserDetailsService userService;
-
-    @Bean
-    public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
-        return http.getSharedObject(AuthenticationManagerBuilder.class).build();
-    }
-
-    @Bean
-    public AuthenticationProvider daoAuthProvider(AuthenticationManagerBuilder auth) {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(userService);
-        provider.setPasswordEncoder(passwordEncoder);
-        return provider;
-    }
 
     @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http, HandlerMappingIntrospector introspector)
-            throws Exception {
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        // Customize as needed; minimal chain without deprecated APIs
         return http.build();
     }
 }