Update dependencies (#144)

* Updated many dep versions

* Removed old config file I didn't mean to commit

* Fixed default config, removed discriminator references

* Update docker

* Update docker

* Update gha

* Enable gradle debug flag to determine why its broken

* Reduce logging to info, add version for hibernate

* Remove logging from gradle

Author: adamsong

.editorconfig

@@ -5,5 +5,6 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = tab
 
-[*.{kt,kts}]
-disabled_rules=import-ordering,no-wildcard-imports
+[{*.yml,*.yaml}]
+indent_size = 2
+indent_style = space

.github/workflows/detekt.yaml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b

Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.18.5 as compiler
+FROM alpine:3.20.3 as compiler
 
-RUN apk add --no-cache openjdk17 gradle
+RUN apk add --no-cache openjdk21 gradle
 
 WORKDIR /app
 COPY build.gradle settings.gradle ./
@@ -9,9 +9,9 @@ COPY src src
 RUN gradle --no-daemon bootJar
 
 
-FROM alpine:3.18.5
+FROM alpine:3.20.3
 
-RUN apk add --no-cache openjdk17-jre-headless
+RUN apk add --no-cache openjdk21-jre-headless
 
 COPY --from=compiler /app/build/libs/Yogbot-1.0-SNAPSHOT.jar app.jar
 

build.gradle

@@ -1,80 +1,73 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-noarg:1.6.20-RC2"
-    }
-}
-
 plugins {
-    id 'org.springframework.boot' version '2.7.18'
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.24'
-	id "io.gitlab.arturbosch.detekt" version "1.20.0"
+	id 'org.jetbrains.kotlin.jvm' version '2.0.10'
+	id 'org.jetbrains.kotlin.plugin.spring' version '2.0.10'
+	id 'org.springframework.boot' version '3.3.4'
+	id 'io.spring.dependency-management' version '1.1.6'
+	id 'org.jetbrains.kotlin.plugin.jpa' version '2.0.10'
+	id "io.gitlab.arturbosch.detekt" version "1.23.7"
 }
 
-apply plugin: "kotlin-jpa"
-apply plugin: "kotlin-kapt"
+detekt {
+	buildUponDefaultConfig = true
+	config = files(file("config/detekt/detekt.yml"))
+}
 
 group 'net.yogstation'
 version '1.0-SNAPSHOT'
 
-repositories {
-	maven { url 'https://repo.spring.io/milestone' }
-    mavenCentral()
+apply plugin: 'kotlin-kapt'
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
 }
 
-jar {
-    manifest {
-        attributes 'Main-Class': 'net.yogstation.yogbot.Yogbot'
-    }
+repositories {
+    mavenCentral()
 }
 
 dependencyLocking {
 	lockAllConfigurations()
 }
 
 dependencies {
-    kapt 'org.hibernate:hibernate-jpamodelgen:5.6.15.Final'
-    kapt "org.springframework.boot:spring-boot-configuration-processor:2.7.18"
+	kapt 'org.hibernate:hibernate-jpamodelgen:6.5.3.Final'
+	kapt 'org.springframework.boot:spring-boot-configuration-processor'
+	detektPlugins "io.gitlab.arturbosch.detekt:detekt-rules-libraries:1.23.7"
+
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
+	implementation 'io.projectreactor.kotlin:reactor-kotlin-extensions'
+	implementation 'org.jetbrains.kotlin:kotlin-reflect'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-reactor'
+	implementation 'com.mysql:mysql-connector-j'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'io.projectreactor:reactor-test'
+	testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     constraints {
-        implementation('org.springframework:spring-web:5.3.36'){
-            because 'Patch CVE-2024-22243, CVE-2024-22259, CVE-2024-22262'
-        }
+		// Example pinned dependency
+//        implementation('org.springframework:spring-web:5.3.36'){
+//            because 'Patch CVE-2024-22243, CVE-2024-22259, CVE-2024-22262'
+//        }
     }
-    implementation 'org.yaml:snakeyaml:2.0'
-    implementation('com.fasterxml.jackson:jackson-bom:2.14.2')
-	implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
-	implementation 'org.thymeleaf:thymeleaf:3.1.2.RELEASE'
-	implementation 'org.thymeleaf:thymeleaf-spring5:3.1.2.RELEASE'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.18'
-
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    implementation 'com.discord4j:discord4j-core:3.2.3'
-    implementation 'mysql:mysql-connector-java:8.0.32'
-    implementation 'org.springframework.boot:spring-boot-starter-webflux:2.7.18'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:2.7.18'
-    implementation 'org.apache.commons:commons-text:1.10.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.springframework:spring-jdbc:5.3.36"
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10'
-	implementation 'io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.2'
-	implementation 'ch.qos.logback:logback-classic:1.2.13'
-	implementation 'ch.qos.logback:logback-core:1.2.13'
-	implementation 'io.netty:netty-codec-http2:4.1.100.Final'
-	implementation 'io.projectreactor.netty:reactor-netty-http:1.0.39'
 
+    implementation 'com.discord4j:discord4j-core:3.2.6'
+    implementation 'org.apache.commons:commons-text:1.12.0'
+	implementation 'ch.qos.logback:logback-classic:1.5.8'
+	implementation 'ch.qos.logback:logback-core:1.5.8'
 }
 
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
+kotlin {
+	compilerOptions {
+		freeCompilerArgs.addAll '-Xjsr305=strict'
+	}
 }
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "17"
-    }
+
+tasks.named('test') {
+	useJUnitPlatform()
 }