From 19228e4269a74381885eadcf6e91767111689529 Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 20 May 2025 10:59:52 +0800 Subject: [PATCH 1/7] fix: Switch JDK version to 17 (#221) * fix: Switch JDK version to 17 --- .github/workflows/checkstyle.yml | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index a2f41cb3..74529b84 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -18,10 +18,10 @@ jobs: uses: actions/checkout@v4 # 设置 JDK（如果是 Java 项目） - - name: Set up JDK 8.* + - name: Set up JDK 17.* uses: actions/setup-java@v4 with: - java-version: '8.*' + java-version: '17.*' distribution: 'temurin' # 安装依赖并运行 Checkstyle（如果是 Maven 项目） diff --git a/pom.xml b/pom.xml index 6faa8c7e..d7cd9480 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.8 + 17 2.0.50 5.8.27 1.5.5.Final @@ -159,8 +159,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 + 17 From fdae65a67709178a427739052c5ef8b4d15c6ac2 Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 27 May 2025 15:58:53 +0800 Subject: [PATCH 2/7] fix: Switch JDK version to 17 (#231) * fix: Switch JDK version to 17 * fix: Switch JDK version to 17 --- .github/workflows/checkstyle.yml | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index a2f41cb3..74529b84 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -18,10 +18,10 @@ jobs: uses: actions/checkout@v4 # 设置 JDK（如果是 Java 项目） - - name: Set up JDK 8.* + - name: Set up JDK 17.* uses: actions/setup-java@v4 with: - java-version: '8.*' + java-version: '17.*' distribution: 'temurin' # 安装依赖并运行 Checkstyle（如果是 Maven 项目） diff --git a/pom.xml b/pom.xml index 6faa8c7e..d7cd9480 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.8 + 17 2.0.50 5.8.27 1.5.5.Final @@ -159,8 +159,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 + 17 From d8f3d39bc4ee07fd4e072c9490680f119d31594d Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 27 May 2025 20:54:08 +0800 Subject: [PATCH 3/7] fix: Fix i18n test (#232) (#233) --- .../tinyengine/it/controller/I18nEntryController.java | 4 ++-- .../it/controller/I18nEntryControllerTest.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java index c8b8dad0..42a7705d 100644 --- a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java @@ -70,7 +70,7 @@ public class I18nEntryController { private I18nEntryService i18nEntryService; /** - * Gets all i 18 n entries by app. + * Gets i 18 n entries by app. * * @return 获取国际化词条列表 i 18 n entries */ @@ -79,7 +79,7 @@ public class I18nEntryController { content = @Content(mediaType = "application/json", schema = @Schema())), @ApiResponse(responseCode = "400", description = "请求失败") }) - @SystemControllerLog(description = "获取国际化词条列表") + @SystemControllerLog(description = "通过app获取国际化词条列表") @GetMapping("/i18n/entries") public Result getI18nEntriesByApp( @RequestParam(value = "host", required = false) Integer host, @RequestParam(value = "host_type", required = false) String hostType) { diff --git a/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java index 3650b72f..0068ef75 100644 --- a/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java @@ -58,11 +58,12 @@ void setUp() { } @Test - void testGetAllI18nEntries() { + void testGetI18nEntriesByApp() { I18nEntryListResult mockData = new I18nEntryListResult(); - when(i18nEntryService.findAllI18nEntry()).thenReturn(mockData); - - Result result = i18nEntryController.getAllI18nEntries(); + when(i18nEntryService.findI18nEntryByApp(anyInt(), anyString())).thenReturn(mockData); + Integer host = 1; + String hostType = "app"; + Result result = i18nEntryController.getI18nEntriesByApp(host, hostType); Assertions.assertEquals(mockData, result.getData()); } From b30cbd3703e4fb2a25b8c5f769d8836a6dbcf00b Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 05:51:27 -0700 Subject: [PATCH 4/7] fix: Modify the springboot version --- app/pom.xml | 9 +++++++++ .../it/config/filter/RequestIdFilter.java | 18 +++++------------- base/pom.xml | 7 +++++++ .../exception/GlobalExceptionAdvice.java | 3 +-- .../it/controller/AppController.java | 2 +- .../it/controller/AppExtensionController.java | 3 +-- .../it/controller/BlockController.java | 3 +-- .../it/controller/BlockGroupController.java | 3 +-- .../it/controller/ComponentController.java | 3 +-- .../controller/ComponentLibraryController.java | 4 ++-- .../it/controller/DataSourceController.java | 2 +- .../it/controller/I18nEntryController.java | 3 +-- .../it/controller/MaterialController.java | 5 ++--- .../it/controller/PageController.java | 3 +-- .../it/controller/PageHistoryController.java | 3 +-- .../it/controller/PageTemplateController.java | 3 +-- .../it/controller/PlatformController.java | 5 ++--- .../controller/PlatformHistoryController.java | 4 ++-- pom.xml | 14 ++++++++++++-- 19 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 640b1e25..d6e219e8 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -19,6 +19,15 @@ tiny-engine-base 1.0-SNAPSHOT + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.54 + + + org.apache.tomcat.embed + tomcat-embed-core + diff --git a/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java b/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java index 20706dc3..f9f5bf4b 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java +++ b/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java @@ -12,29 +12,21 @@ package com.tinyengine.it.config.filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.slf4j.MDC; import java.io.IOException; import java.util.UUID; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - /** * The type Request id filter. * * @since 2024-10-20 */ -public class RequestIdFilter implements Filter { - @Override - public void init(FilterConfig filterConfig) { - // 初始化方法 - } - +public class RequestIdFilter implements jakarta.servlet.Filter { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/base/pom.xml b/base/pom.xml index 06e78402..edcff259 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,6 +4,13 @@ tiny-engine-base jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + + 1.0-SNAPSHOT tiny engine base module diff --git a/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java b/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java index 4e0e0f30..1b07b66d 100644 --- a/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java +++ b/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java @@ -14,6 +14,7 @@ import com.tinyengine.it.common.base.Result; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -25,8 +26,6 @@ import java.util.Map; import java.util.Objects; -import javax.servlet.http.HttpServletRequest; - /** * The type Global exception. * diff --git a/base/src/main/java/com/tinyengine/it/controller/AppController.java b/base/src/main/java/com/tinyengine/it/controller/AppController.java index f1995ec3..b4c07a90 100644 --- a/base/src/main/java/com/tinyengine/it/controller/AppController.java +++ b/base/src/main/java/com/tinyengine/it/controller/AppController.java @@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -37,7 +38,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; /** * 应用api diff --git a/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java b/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java index 97c7cc7c..2ae2c1c4 100644 --- a/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java +++ b/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java @@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -36,8 +37,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; - /** *

* app的桥接或工具 diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java index ba6139b2..8665b243 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockController.java @@ -33,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -49,8 +50,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; - /** * 区块 * diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java index f4782dae..f090c927 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java @@ -25,6 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -39,8 +40,6 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; - /** *

* 区块分组 diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java index 833e3a44..b4b0b109 100644 --- a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java +++ b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java @@ -27,6 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -37,8 +38,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.validation.Valid; - /** * 组件api * diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java index e4d4ece1..b30e2017 100644 --- a/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -34,8 +36,6 @@ import java.util.List; -import javax.validation.Valid; - /** * 组件库API * diff --git a/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java b/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java index 7add4ddc..a538011e 100644 --- a/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java +++ b/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java @@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -35,7 +36,6 @@ import java.util.List; -import javax.validation.Valid; /** *

diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java index 4be56b81..f00fd550 100644 --- a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java @@ -32,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -48,8 +49,6 @@ import java.util.List; import java.util.Map; -import javax.validation.Valid; - /** *

* 国际化词条 diff --git a/base/src/main/java/com/tinyengine/it/controller/MaterialController.java b/base/src/main/java/com/tinyengine/it/controller/MaterialController.java index cde9dc51..27f8609b 100644 --- a/base/src/main/java/com/tinyengine/it/controller/MaterialController.java +++ b/base/src/main/java/com/tinyengine/it/controller/MaterialController.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -34,9 +36,6 @@ import java.util.List; -import javax.validation.Valid; - - /** * 物料历史api * diff --git a/base/src/main/java/com/tinyengine/it/controller/PageController.java b/base/src/main/java/com/tinyengine/it/controller/PageController.java index 7f8ac710..208c7baa 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageController.java @@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -39,8 +40,6 @@ import java.util.List; -import javax.validation.Valid; - /** *

* 页面管理 diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java index 0a260090..ff1509b0 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java @@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -40,8 +41,6 @@ import java.util.List; import java.util.regex.Pattern; -import javax.validation.Valid; - /** *

* 页面历史记录管理 diff --git a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java index 78f5cae5..f490d1fd 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java @@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -36,8 +37,6 @@ import java.util.List; -import javax.validation.Valid; - /** *

* 页面模版 diff --git a/base/src/main/java/com/tinyengine/it/controller/PlatformController.java b/base/src/main/java/com/tinyengine/it/controller/PlatformController.java index a20b7107..ed007a98 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PlatformController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PlatformController.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -34,9 +36,6 @@ import java.util.List; -import javax.validation.Valid; - - /** * 设计器api * diff --git a/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java index f076b1c6..54ebd19a 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java @@ -22,6 +22,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -35,8 +37,6 @@ import java.util.List; -import javax.validation.Valid; - /** * 设计器api * diff --git a/pom.xml b/pom.xml index d7cd9480..9e9b653c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.1.9 @@ -31,6 +31,8 @@ 2.3.32 2.5.4 1.6.14 + 4.11.0 + 6.0.0 1.0-SNAPSHOT @@ -108,6 +110,13 @@ ${springdoc-openapi-ui.version} + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} + provided + + com.h2database h2 @@ -122,6 +131,7 @@ org.mockito mockito-inline test + ${mockito.version} org.junit.vintage @@ -157,7 +167,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 17 17 From eccb60a31b426125379d07a79f4f699a57067b66 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 06:15:39 -0700 Subject: [PATCH 5/7] fix: Modify the springboot version --- base/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index edcff259..06e78402 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,13 +4,6 @@ tiny-engine-base jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - - 1.0-SNAPSHOT tiny engine base module From 315a2980e5b3037a12f2270868490fbeed160971 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 18:22:59 -0700 Subject: [PATCH 6/7] fix: Modify the pom --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9e9b653c..1e5f9b7e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ 2.3.32 2.5.4 1.6.14 - 4.11.0 - 6.0.0 + 4.11.0 + 6.1.0 1.0-SNAPSHOT @@ -131,7 +131,7 @@ org.mockito mockito-inline test - ${mockito.version} + ${mockito-inline.version} org.junit.vintage From d1c3164d4d9a15eebd10f5211494fb0a3bff51d5 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 19:20:52 -0700 Subject: [PATCH 7/7] fix: Modify the pom --- app/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index d6e219e8..640b1e25 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -19,15 +19,6 @@ tiny-engine-base 1.0-SNAPSHOT - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.54 - - - org.apache.tomcat.embed - tomcat-embed-core -