fix build

espoon-voltti · Nov 27, 2023 · 4c31a71 · 4c31a71
1 parent 9ec49b9
commit 4c31a71
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -2,11 +2,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
-    id("org.springframework.boot") version "3.2.0"
+    id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.4"
     kotlin("jvm") version "1.9.20"
     kotlin("plugin.spring") version "1.9.20"
-    id("org.flywaydb.flyway") version "10.1.0"
+    id("org.flywaydb.flyway") version "10.0.0"
     id("org.jlleitschuh.gradle.ktlint") version "11.6.1"
 }
 
@@ -31,8 +31,7 @@ dependencies {
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
     implementation("com.zaxxer:HikariCP:5.1.0")
-    implementation("org.flywaydb:flyway-core:10.1.0")
-    implementation("org.flywaydb:flyway-database-postgresql:10.1.0")
+    implementation("org.flywaydb:flyway-core")
     implementation("org.postgresql:postgresql:42.7.0")
 
     api(platform("org.jdbi:jdbi3-bom:3.41.2"))
@@ -95,6 +94,12 @@ tasks.register("resolveDependencies") {
     }
 }
 
+tasks {
+    bootRun {
+        systemProperty("spring.profiles.active", "local")
+    }
+}
+
 flyway {
     url = "jdbc:postgresql://localhost:5432/oppivelvollisuus"
     user = "oppivelvollisuus"

diff --git a/service/src/main/resources/logback-spring.xml b/service/src/main/resources/logback-spring.xml
@@ -3,9 +3,17 @@
 <configuration>
     <springProperty scope="context" name="appName" source="spring.application.name"/>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="fi/espoo/oppivelvollisuus/default-appender-sanitized.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <include resource="default-appender-sanitized.xml"/>
 
-    <root level="INFO">
-        <appender-ref ref="VOLTTI_DEFAULT_APPENDER_SANITIZED"/>
-    </root>
+    <springProfile name="local">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+    <springProfile name="!local">
+        <root level="INFO">
+            <appender-ref ref="VOLTTI_DEFAULT_APPENDER_SANITIZED"/>
+        </root>
+    </springProfile>
 </configuration>