fix build

F43nd1r · Sep 13, 2024 · 0a7d0eb · 0a7d0eb
1 parent 605e137
commit 0a7d0eb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/acrarium/build.gradle.kts b/acrarium/build.gradle.kts
@@ -156,7 +156,7 @@ jooq {
                             includeTypes = "DATETIME"
                         }, ForcedType().apply {
                             name = "BOOLEAN"
-                            includeTypes = "(?i:TINYINT\\(1\\))"
+                            includeTypes = "(?i:TINYINT)"
                         })
                     }
                     target.apply {

diff --git a/acrarium/docker-compose.yml b/acrarium/docker-compose.yml
@@ -12,5 +12,4 @@ services:
       SPRING_DATASOURCE_URL: jdbc:mysql://host.docker.internal:3306/test?useSSL=false&allowPublicKeyRetrieval=true&useLegacyDatetimeCode=false&serverTimezone=UTC
       SPRING_DATASOURCE_USERNAME: acra
       SPRING_DATASOURCE_PASSWORD: 1qay2wsx
-      SPRING_JPA_DATABASE-PLATFORM: org.hibernate.dialect.MariaDB10Dialect
       SPRING_APPLICATION_JSON: '{ "management": { "endpoints": { "enabled-by-default": true }, "endpoint": { "health": { "show-details": "always", "probes": { "enabled": true } } }, "health": { "livenessState": { "enabled": true }, "readinessState": { "enabled": true } } } }'
diff --git a/acrarium/src/main/kotlin/com/faendir/acra/security/BasicSecurityConfiguration.kt b/acrarium/src/main/kotlin/com/faendir/acra/security/BasicSecurityConfiguration.kt
@@ -36,7 +36,7 @@ class BasicSecurityConfiguration {
     @Bean
     fun randomStringGenerator(secureRandom: SecureRandom): RandomStringGenerator =
         RandomStringGenerator.Builder().usingRandom { secureRandom.nextInt(it) }.withinRange('0'.code, 'z'.code)
-            .filteredBy(CharacterPredicate { Character.isLetterOrDigit(it) }).build()
+            .filteredBy(CharacterPredicate { Character.isLetterOrDigit(it) }).get()
 
     @Bean
     fun grantedAuthoritiesMapper() =

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ kotlinPoet = "1.16.0"
 testContainers = "1.19.8"
 jooq = "3.18.5"
 karibu = "2.1.6"
+liquibase = "4.29.2"
 
 [libraries]
 spring-boot-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springBoot" }

diff --git a/jooq-helper/src/main/kotlin/com/faendir/jooq/MySqlLiquibaseDatabase.kt b/jooq-helper/src/main/kotlin/com/faendir/jooq/MySqlLiquibaseDatabase.kt
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2022 Lukas Morawietz (https://github.com/F43nd1r)
+ * (C) Copyright 2022-2024 Lukas Morawietz (https://github.com/F43nd1r)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ class MySqlLiquibaseDatabase : MySQLDatabase() {
     override fun create0(): DSLContext {
         if (conn == null) {
             val scripts = Objects.requireNonNull(properties.getProperty("scripts"))
-            val mySqlVersion = properties.getProperty("mySqlVersion", "8.0.31")
+            val mySqlVersion = properties.getProperty("mySqlVersion", "8.0.39")
             val dbName = properties.getProperty("databaseName", "test")
             try {
                 mySQLContainer = MySQLContainer(DockerImageName.parse("mysql:$mySqlVersion"))