From cdba4aca5f58db7bb99e0448e388897ef1351f9e Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Tue, 29 Apr 2025 00:08:49 -0400 Subject: [PATCH 1/4] cleanup pom --- pom.xml | 16 ++++++------- registry-server-runner/pom.xml | 4 ++-- server-bom/pom.xml | 43 ++++++++++++++++++++++------------ server/pom.xml | 15 ++++++------ 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index 80620be..79062ce 100644 --- a/pom.xml +++ b/pom.xml @@ -5,28 +5,26 @@ com.michael service-container-parent - 1.0.0 + ${project.version pom - - org.springframework.boot - spring-boot-starter-parent - 3.4.2 - - - server-bom server registry-server-runner + + 1.0.0 + 2.43.0 + + com.diffplug.spotless spotless-maven-plugin - 2.43.0 + ${spotless-maven-plugin.veresion} diff --git a/registry-server-runner/pom.xml b/registry-server-runner/pom.xml index 91d4e67..9527df5 100644 --- a/registry-server-runner/pom.xml +++ b/registry-server-runner/pom.xml @@ -22,7 +22,7 @@ com.michael service-container-parent - 1.0.0 + ${project.version} pom import @@ -33,7 +33,7 @@ com.michael service-container-server - 1.0.0 + ${project.version} diff --git a/server-bom/pom.xml b/server-bom/pom.xml index f9b745c..8562e09 100644 --- a/server-bom/pom.xml +++ b/server-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 service-container-server-bom - 1.0.0 + ${project.version pom @@ -17,12 +17,25 @@ 23 23 - 3.4.2 + 3.4.5 + 2.8.4 + 3.6.0 + 4.5.0-M3 + 8.0.2.Final + 3.1.1 + 0.8.4 UTF-8 + + org.springframework.boot + spring-boot-dependencies + ${spring.version} + pom + import + org.springframework.boot spring-boot-starter-web @@ -39,44 +52,44 @@ ${spring.version} - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.8.4 + org.springframework.boot + spring-boot-starter-data-redis + ${spring.version} org.springframework.boot spring-boot-starter-validation ${spring.version} + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc-doc.version} + org.apache.commons commons-collections4 - 4.5.0-M3 + ${commons-collections.version} org.wiremock.integrations wiremock-spring-boot - 3.6.0 + ${wiremock-spring.version} org.hibernate hibernate-validator - 8.0.2.Final + ${hibernate-validator.version} io.etcd jetcd-core - 0.8.4 + ${jetcd-core.version} jakarta.validation jakarta.validation-api - 3.1.1 - - - org.springframework.boot - spring-boot-starter-data-redis - ${spring.version} + ${jakarta-validation.version} diff --git a/server/pom.xml b/server/pom.xml index cd3f30b..a364201 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 service-container-server - 1.0.0 + ${project.version com.michael @@ -17,6 +17,9 @@ 23 23 UTF-8 + 3.10.1 + 1.6.4 + 0.8.4 @@ -24,7 +27,7 @@ com.michael service-container-server-bom - 1.0.0 + ${project.version} pom import @@ -79,29 +82,27 @@ io.etcd jetcd-launcher - 0.8.4 + ${jetcd-launcher.version} test org.springframework.boot spring-boot-starter-test - 3.4.5 test com.redis.testcontainers testcontainers-redis - 1.6.4 + ${testcontainers-redis.version} test - org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.verison} From 14c284f6f451798f66155e8f0c54698f469081ba Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Tue, 29 Apr 2025 00:13:45 -0400 Subject: [PATCH 2/4] cleanup pom --- server-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-bom/pom.xml b/server-bom/pom.xml index 8562e09..0f81e45 100644 --- a/server-bom/pom.xml +++ b/server-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 service-container-server-bom - ${project.version + ${project.version} pom From d4ac8c3647f4f32cd8679bdf5a56d32d0a41862f Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Tue, 29 Apr 2025 00:14:54 -0400 Subject: [PATCH 3/4] cleanup pom --- pom.xml | 2 +- server-bom/pom.xml | 2 +- server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 79062ce..9a89368 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.michael service-container-parent - ${project.version + 1.0.0 pom diff --git a/server-bom/pom.xml b/server-bom/pom.xml index 0f81e45..11b66cd 100644 --- a/server-bom/pom.xml +++ b/server-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 service-container-server-bom - ${project.version} + 1.0.0 pom diff --git a/server/pom.xml b/server/pom.xml index a364201..460f083 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 service-container-server - ${project.version + 1.0.0 com.michael From 1c0c0324910cd511ed5c958469a90ba082598fa3 Mon Sep 17 00:00:00 2001 From: Michael Rasch Date: Tue, 29 Apr 2025 00:18:04 -0400 Subject: [PATCH 4/4] cleanup pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9a89368..6817d9f 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.0.0 - 2.43.0 + 2.43.0 @@ -24,7 +24,7 @@ com.diffplug.spotless spotless-maven-plugin - ${spotless-maven-plugin.veresion} + ${spotless-maven-plugin.version}