diff --git a/.gitignore b/.gitignore index 1f91cfd..f81b38e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ -.DS_Store data logs target/ pom-xml-flattened +.vscode/ ### STS ### .apt_generated @@ -11,6 +11,7 @@ pom-xml-flattened .project .settings .springBeans +.DS_Store ### IntelliJ IDEA ### .idea diff --git a/opensabre-base-dependencies/pom.xml b/opensabre-base-dependencies/pom.xml index a865c0d..99dd6e3 100644 --- a/opensabre-base-dependencies/pom.xml +++ b/opensabre-base-dependencies/pom.xml @@ -21,28 +21,27 @@ 17 17 1.18.30 - 3.2.3 + 3.4.1 1.4.13 3.11.0 4.9.10 - 3.2.3 - 2023.0.0 - 2023.0.0.0-RC1 - 2.7.5 - 4.4.0 + 3.4.1 + 2024.0.0 + 2023.0.3.2 + 2.7.7 + 4.5.0 2.2.19 8.0.31 6.0.0 - 3.5.5 - 3.0.3 - 5.8.18 + 3.5.9 + 3.0.4 + 5.8.35 1.1.2 31.1-jre 3.0.5 - 5.9.1 - 5.3.31 + 5.11.4 5.2.3 @@ -117,6 +116,12 @@ knife4j-openapi3-jakarta-spring-boot-starter ${knife4j-openapi3.version} + + + io.swagger.core.v3 + swagger-annotations-jakarta + ${swagger-annotations.version} + io.github.opensabre @@ -191,12 +196,6 @@ mysql-connector-j ${mysql-connector-j.version} - - - io.swagger.core.v3 - swagger-annotations-jakarta - ${swagger-annotations.version} - com.google.guava @@ -318,23 +317,23 @@ ${project.build.outputDirectory}/git.properties true - + true - + true - + 7 - + flat false - + true 7 - + -dirty diff --git a/opensabre-starter-boot/src/main/resources/bootstrap.yaml b/opensabre-starter-boot/src/main/resources/bootstrap.yaml index 6e0267e..a642bad 100644 --- a/opensabre-starter-boot/src/main/resources/bootstrap.yaml +++ b/opensabre-starter-boot/src/main/resources/bootstrap.yaml @@ -8,4 +8,4 @@ logging: file: path: logs pattern: - level: '%5p [${spring.application.name},%X{traceId:-},%X{spanId:-}]' \ No newline at end of file + level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-},%X{parentId:-}]' \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6ba0456..a71b208 100644 --- a/pom.xml +++ b/pom.xml @@ -55,15 +55,15 @@ UTF-8 UTF-8 - 11 - 11 + 17 + 17 3.1.0 3.5.0 1.6 1.7.0 2.22.2 - 0.1.0 + 0.1.1