diff --git a/northstar-api/src/main/java/org/dromara/northstar/gateway/mktdata/NorthstarDataServiceDataSource.java b/northstar-api/src/main/java/org/dromara/northstar/gateway/mktdata/NorthstarDataServiceDataSource.java index 57c0a15abd7157ca9d689513dfee039cfbceefa5..40ca17ba937c5af30df7b5600d97a8726427666b 100644 --- a/northstar-api/src/main/java/org/dromara/northstar/gateway/mktdata/NorthstarDataServiceDataSource.java +++ b/northstar-api/src/main/java/org/dromara/northstar/gateway/mktdata/NorthstarDataServiceDataSource.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.commons.lang3.StringUtils; import org.dromara.northstar.common.IDataSource; diff --git a/northstar-main/src/main/java/org/dromara/northstar/NorthstarApplication.java b/northstar-main/src/main/java/org/dromara/northstar/NorthstarApplication.java index 98673b7585b84425a80b7ef2070bc9f53c2c0fb4..c679a933d65af1682d3d18eb3d80411cd57a519b 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/NorthstarApplication.java +++ b/northstar-main/src/main/java/org/dromara/northstar/NorthstarApplication.java @@ -7,7 +7,7 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.scheduling.annotation.EnableScheduling; -@EnableCaching +//@EnableCaching @EnableScheduling @EnableAutoConfiguration @EnableJpaRepositories(basePackages = "org.dromara.northstar.data.jdbc") diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/BarDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/BarDO.java index aaa5dfbff40410b412e26b96087e2ca8b7a59652..cca31b8f059111eafd770818f5799a4e829f1c27 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/BarDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/BarDO.java @@ -1,12 +1,12 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/GatewayDescriptionDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/GatewayDescriptionDO.java index 38c466a7e54f927cd3fdec7a0c70af3b5a887570..422116c1d4e45609b1f6dea73051337152d1e8cb 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/GatewayDescriptionDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/GatewayDescriptionDO.java @@ -1,10 +1,10 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.GatewayDescription; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/MessageSenderSettingsDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/MessageSenderSettingsDO.java index 7b18e503d4b373704567134e8f53fb5bbd75acb7..675c10183edab588aee2136307bb8e5c99faf94b 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/MessageSenderSettingsDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/MessageSenderSettingsDO.java @@ -1,8 +1,8 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDealRecordDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDealRecordDO.java index a677bfafb99782dae8dccecb8117fd9a7924567b..303b9a3d297062bad75b34d61301a2e5c70b1e67 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDealRecordDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDealRecordDO.java @@ -1,12 +1,12 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.ModuleDealRecord; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDescriptionDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDescriptionDO.java index 32e56302e55473e20373679d4c97dd678719d92a..689cfe70fc0015aca347aab58905a5d6f0b61c2a 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDescriptionDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleDescriptionDO.java @@ -1,10 +1,10 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.ModuleDescription; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleRuntimeDescriptionDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleRuntimeDescriptionDO.java index 37196f81bb40cbdd3a45b13e873dde05bee48e41..cf135e0cc271976cec11b7132fdc9478c5982a1d 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleRuntimeDescriptionDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/ModuleRuntimeDescriptionDO.java @@ -1,10 +1,10 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.ModuleRuntimeDescription; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/PlaybackRuntimeDescriptionDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/PlaybackRuntimeDescriptionDO.java index 0cc3238d89f174444900bbb53cadcd21599d0626..ba3f776a129ac2ed8769f19f33ff91bd0eeb26dd 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/PlaybackRuntimeDescriptionDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/PlaybackRuntimeDescriptionDO.java @@ -2,9 +2,9 @@ package org.dromara.northstar.data.jdbc.entity; import java.time.LocalDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.PlaybackRuntimeDescription; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SimAccountDescriptionDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SimAccountDescriptionDO.java index 31637389b7574574000b700697ea1e99ec3b9939..13bb8e5fe6b290c4a9376f75780fcdfb76c70f00 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SimAccountDescriptionDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SimAccountDescriptionDO.java @@ -1,10 +1,10 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.dromara.northstar.common.model.SimAccountDescription; diff --git a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SubscriptionEventsDO.java b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SubscriptionEventsDO.java index 9dff89fb4ae49971ae94378ebdc344a3e1734263..854c46f9ebf54f145a3fca3f800a3cea8c532014 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SubscriptionEventsDO.java +++ b/northstar-main/src/main/java/org/dromara/northstar/data/jdbc/entity/SubscriptionEventsDO.java @@ -1,7 +1,7 @@ package org.dromara.northstar.data.jdbc.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/northstar-main/src/main/java/org/dromara/northstar/support/job/AppScheduleTask.java b/northstar-main/src/main/java/org/dromara/northstar/support/job/AppScheduleTask.java index 6c26f765901cdc2a5b74a01a73d9d104e8e73574..46cecfc9ecb116a9b1235d910972c261fd747a82 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/support/job/AppScheduleTask.java +++ b/northstar-main/src/main/java/org/dromara/northstar/support/job/AppScheduleTask.java @@ -7,7 +7,7 @@ import java.time.LocalTime; import java.util.List; import java.util.Objects; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.dromara.northstar.data.jdbc.MarketDataRepository; import org.dromara.northstar.strategy.IMessageSender; diff --git a/northstar-main/src/main/java/org/dromara/northstar/web/interceptor/AuthorizationInterceptor.java b/northstar-main/src/main/java/org/dromara/northstar/web/interceptor/AuthorizationInterceptor.java index 577df32eb97fbf4ad86d379cd3959a4c3d7e801f..28cc4cd6426d6659ca3862d2f1cabd9516a49183 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/web/interceptor/AuthorizationInterceptor.java +++ b/northstar-main/src/main/java/org/dromara/northstar/web/interceptor/AuthorizationInterceptor.java @@ -1,7 +1,7 @@ package org.dromara.northstar.web.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.dromara.northstar.common.constant.Constants; import org.springframework.http.HttpStatus; diff --git a/northstar-main/src/main/java/org/dromara/northstar/web/restful/AuthenticationController.java b/northstar-main/src/main/java/org/dromara/northstar/web/restful/AuthenticationController.java index 6e71fdda39333878961a331dcc559096608a90bc..41213cc2133ebc63d65380e48268cafacfaf4128 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/web/restful/AuthenticationController.java +++ b/northstar-main/src/main/java/org/dromara/northstar/web/restful/AuthenticationController.java @@ -3,7 +3,7 @@ package org.dromara.northstar.web.restful; import java.time.LocalDate; import java.util.concurrent.atomic.AtomicInteger; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.apache.commons.lang3.StringUtils; import org.dromara.northstar.common.constant.Constants; diff --git a/northstar-main/src/main/java/org/dromara/northstar/web/restful/common/CommonControllerAdvice.java b/northstar-main/src/main/java/org/dromara/northstar/web/restful/common/CommonControllerAdvice.java index 5b473b716732355fdbf53b04413380b7afd5d99c..03586a65b4366247a327ea0585c2892ce90158cb 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/web/restful/common/CommonControllerAdvice.java +++ b/northstar-main/src/main/java/org/dromara/northstar/web/restful/common/CommonControllerAdvice.java @@ -1,6 +1,6 @@ package org.dromara.northstar.web.restful.common; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dromara.northstar.common.constant.ReturnCode; diff --git a/northstar-main/src/main/java/org/dromara/northstar/web/service/ModuleService.java b/northstar-main/src/main/java/org/dromara/northstar/web/service/ModuleService.java index 3b81da12ad78d52b57a52cef974974c64ff0e1e1..d54648712a092d75898f30571daaa8efeda4809a 100644 --- a/northstar-main/src/main/java/org/dromara/northstar/web/service/ModuleService.java +++ b/northstar-main/src/main/java/org/dromara/northstar/web/service/ModuleService.java @@ -13,7 +13,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.dromara.northstar.account.AccountManager; import org.dromara.northstar.common.IModuleService; diff --git a/pom.xml b/pom.xml index 9b26e5f519aff6c104a8378f5c3c32721941f213..2656a706380d8d8b646abf1535ec443bde374900 100644 --- a/pom.xml +++ b/pom.xml @@ -12,18 +12,18 @@ https://gitee.com/dromara/northstar - 17 + 21 -Dfile.encoding=UTF-8 UTF-8 UTF-8 ${java.version} ${java.version} ${project.version} - 2.6.14 + 3.2.0 1.18.30 - 1.7.25 + 2.0.9 3.7 - 1.13 + 1.16.0 2.6 3.6.1 2.0.4 @@ -36,10 +36,10 @@ 1.7.19 1.0.0 5.7.22 - 2.12.5 - 1.10.20 - 4.1.69.Final - 2.1.214 + 2.15.3 + 1.14.10 + 4.1.104.Final + 2.2.224 @@ -173,7 +173,7 @@ org.springframework.retry spring-retry - 2.0.1 + 2.0.5 javax.cache @@ -183,7 +183,7 @@ com.squareup.okhttp3 okhttp - 4.10.0 + 4.12.0 javax.xml.bind @@ -193,7 +193,7 @@ org.springframework spring-web - 5.3.27 + 6.1.2 com.squareup.retrofit2