moderization

build.gradle

@@ -1,16 +1,13 @@
 plugins {
-	id 'org.springframework.boot' version '3.5.0'
+	id 'org.springframework.boot' version '4.1.1'
 	id "io.spring.dependency-management" version "1.1.7"
 	id 'java'
-	id 'war'
 	id 'eclipse'
-	id 'application'
 }
 
-group = 'de.jottyfan.camporganizer'
-version = '1.0.6'
-
-description = """CampOrganizer2"""
+group = project.group
+version = project.version
+description = project.description
 
 repositories {
 	mavenCentral()
@@ -26,8 +23,9 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs.add("-parameters")
 }
 
-application {
+springBoot {
   mainClass = 'de.jottyfan.camporganizer.Main'
+  buildInfo()
 }
 
 java {
@@ -36,26 +34,22 @@ java {
   }
 }
 
-war {
-  doFirst {
-    manifest {
-      attributes("Implementation-Title": project.name,
-		             "Implementation-Version": version,
-		             "Implementation-Timestamp": new Date())
-    }
+bootJar {
+  manifest {
+    attributes(
+      'Implementation-Title': project.name,
+      'Implementation-Version': project.version,
+      'Implementation-Timestamp': new Date().toString()
+    )
   }
-  version = version
-  archiveFileName = 'CampOrganizer2.war'
+  archiveVersion = project.version
+  archiveFileName = "CampOrganizer2.jar"
 }
 
 dependencies {
-  implementation 'org.jooq:jooq:3.20.8'
+  implementation 'org.jooq:jooq'
 	implementation 'de.jottyfan:COJooq:2026.10.12'
 
-	implementation 'org.apache.logging.log4j:log4j-api:2.25.2'
-	implementation 'org.apache.logging.log4j:log4j-core:2.25.2'
-	implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.25.2'
-
 	implementation 'org.webjars:bootstrap:5.3.8'
 	implementation 'org.webjars:font-awesome:7.0.1'
 	implementation 'org.webjars:jquery:3.7.1'
@@ -64,6 +58,8 @@ dependencies {
   implementation 'org.webjars:select2:4.0.13'
   implementation 'org.webjars.npm:fancyapps__fancybox:3.5.7'
 
+  implementation 'org.springframework.boot:spring-boot-starter-log4j2'
+
   implementation 'net.sf.biweekly:biweekly:0.6.8'
 
 	// for using the keycloak rest interface
@@ -81,28 +77,30 @@ dependencies {
 	implementation 'commons-validator:commons-validator:1.10.0'
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
 
+	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-jooq'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 	implementation 'org.springframework.security:spring-security-oauth2-authorization-server:1.5.3'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 	implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.4.0'
 
 	implementation 'commons-io:commons-io:2.20.0'
 
-	runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
+	implementation 'org.springframework.boot:spring-boot-starter-tomcat'
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+
+	modules {
+    module("org.springframework.boot:spring-boot-starter-logging") {
+      replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "use log4j2 for logback")
+    }
+  }
 }
 
 test {
 	useJUnitPlatform()
 }
-
-// add version to manifest
-springBoot {
-  buildInfo()
-}