diff --git a/build.gradle b/build.gradle index 34dd7bd..311572a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '3.3.0' + id 'org.springframework.boot' version '3.4.3' id 'java' id 'war' } @@ -7,7 +7,7 @@ plugins { apply plugin: 'io.spring.dependency-management' group = 'de.jottyfan' -version = '1.5.6' +version = '1.5.7' description = """timetrack""" @@ -25,26 +25,24 @@ repositories { dependencies { implementation 'de.jottyfan:timetrackjooq:20240109' - implementation 'org.apache.logging.log4j:log4j-api:2.23.1' - implementation 'org.apache.logging.log4j:log4j-core:2.23.1' - implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.23.1' + implementation 'org.apache.logging.log4j:log4j-api:2.24.3' + implementation 'org.apache.logging.log4j:log4j-core:2.24.3' + implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.24.3' - implementation 'org.webjars:bootstrap:5.3.2' - implementation 'org.webjars:font-awesome:6.4.2' + implementation 'org.webjars:bootstrap:5.3.3' + implementation 'org.webjars:font-awesome:6.7.2' implementation 'org.webjars:jquery:3.7.1' implementation 'org.webjars:popper.js:2.11.7' - implementation 'org.webjars:datatables:1.13.5' - implementation 'org.webjars:jquery-ui:1.13.2' - implementation 'org.webjars:fullcalendar:5.11.3' - + implementation 'org.webjars:datatables:2.1.8' + implementation 'org.webjars:jquery-ui:1.14.1' + implementation 'org.webjars:fullcalendar:6.1.9' + implementation 'com.google.code.gson:gson:latest.release'; - - implementation 'org.webjars.bowergithub.datatables:datatables:1.10.21' - + 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.1.2' + implementation 'org.springframework.security:spring-security-oauth2-authorization-server:1.4.2' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..2733ed5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/de/jottyfan/timetrack/TimetrackApplication.java b/src/main/java/de/jottyfan/timetrack/Main.java similarity index 66% rename from src/main/java/de/jottyfan/timetrack/TimetrackApplication.java rename to src/main/java/de/jottyfan/timetrack/Main.java index e64296e..dfe04e1 100644 --- a/src/main/java/de/jottyfan/timetrack/TimetrackApplication.java +++ b/src/main/java/de/jottyfan/timetrack/Main.java @@ -1,5 +1,7 @@ package de.jottyfan.timetrack; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -8,15 +10,17 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement -public class TimetrackApplication extends SpringBootServletInitializer { +public class Main extends SpringBootServletInitializer { + + public static final Logger LOGGER = LogManager.getLogger(Main.class); @Override protected SpringApplicationBuilder configure( SpringApplicationBuilder application) { - return application.sources(TimetrackApplication.class); + return application.sources(Main.class); } - + public static void main(String[] args) { - SpringApplication.run(TimetrackApplication.class, args); + SpringApplication.run(Main.class, args); } } diff --git a/src/main/resources/templates/done/list.html b/src/main/resources/templates/done/list.html index babbc5c..2419fbb 100644 --- a/src/main/resources/templates/done/list.html +++ b/src/main/resources/templates/done/list.html @@ -116,9 +116,7 @@ -