From 520461ecbfdf8e21dd62326a3844b5e3232ce9d0 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 4 Dec 2022 09:20:47 +0100 Subject: [PATCH] update to SpringBoot 3.0.0 --- build.gradle | 6 +++--- pdb-ui/src/main/java/org/lucares/pdbui/Ingestion.java | 4 ++-- pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 965962b..b9fa84f 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ ext { javaVersion=17 - version_log4j2= '2.17.2' // keep in sync with spring-boot-starter-log4j2 - version_spring = '2.7.4' + version_log4j2= '2.19.0' // keep in sync with spring-boot-starter-log4j2 + version_spring = '3.0.0' version_junit = '5.9.1' version_junit_platform = '1.9.1' version_nodejs = '16.17.1' // keep in sync with npm @@ -24,7 +24,7 @@ ext { lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4' lib_commons_csv= 'org.apache.commons:commons-csv:1.9.0' lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.12.0' - lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.13.2' + lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.14.1' lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}" lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}" diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/Ingestion.java b/pdb-ui/src/main/java/org/lucares/pdbui/Ingestion.java index 31923e5..b0ef25e 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/Ingestion.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/Ingestion.java @@ -1,9 +1,9 @@ package org.lucares.pdbui; -import javax.annotation.PostConstruct; - import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class Ingestion { diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java b/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java index ffbece1..8d84ec9 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/TcpIngestor.java @@ -13,8 +13,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PreDestroy; - import org.lucares.pdb.api.StringCompressor; import org.lucares.pdb.datastore.Entries; import org.lucares.performance.db.PerformanceDb; @@ -25,6 +23,8 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import jakarta.annotation.PreDestroy; + @Component public class TcpIngestor implements Ingestor, AutoCloseable, DisposableBean { static final Logger LOGGER = LoggerFactory.getLogger(TcpIngestor.class);