diff --git a/pom.xml b/pom.xml index e81f4a0..3422ab5 100644 --- a/pom.xml +++ b/pom.xml @@ -74,20 +74,15 @@ 17 - 4.1.3 - 3.3.3 - 6.1.4 + 6.1.14 + 4.1.113.Final + 3.25.5 + 1.63.2 - - 3.25.2 - 1.63.0 - - - 5.3.1 - - - 1.20.1 - 2.0.1 + + 3.3.4 + 2.17.2 + 5.10.5 0.0.4 @@ -382,9 +377,16 @@ - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + io.netty + netty-bom + ${netty.version} pom import @@ -463,4 +465,4 @@ - \ No newline at end of file + diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index 14eed8d..5087058 100644 --- a/samples/grpc-server/build.gradle +++ b/samples/grpc-server/build.gradle @@ -29,7 +29,7 @@ dependencyManagement { } dependencies { - implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure:0.1.0-SNAPSHOT' + implementation 'org.springframework.grpc:spring-grpc-spring-boot-autoconfigure' implementation 'io.grpc:grpc-services' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.grpc:spring-grpc-test' @@ -55,4 +55,4 @@ protobuf { grpc {} } } -} \ No newline at end of file +} diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml index 539b293..38ab5ed 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 org.springframework.grpc @@ -30,22 +30,15 @@ 17 0.0.39 - 3.25.2 - 1.63.0 + 3.25.5 + 1.63.2 org.springframework.grpc spring-grpc-bom - 0.1.0-SNAPSHOT - pom - import - - - org.springframework.grpc - spring-grpc - 0.1.0-SNAPSHOT + ${project.version} pom import @@ -60,7 +53,6 @@ io.grpc grpc-services - org.springframework.boot spring-boot-starter-test @@ -185,4 +177,4 @@ - \ No newline at end of file + diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml index d68cd27..53debb1 100644 --- a/spring-grpc-core/pom.xml +++ b/spring-grpc-core/pom.xml @@ -21,7 +21,6 @@ - org.springframework spring-context @@ -54,14 +53,14 @@ 1.3.2 - - org.springframework.boot - spring-boot-starter-test + org.junit.jupiter + junit-jupiter + ${junit.version} test - \ No newline at end of file + diff --git a/spring-grpc-docs/pom.xml b/spring-grpc-docs/pom.xml index 1e2171f..7cc9f34 100644 --- a/spring-grpc-docs/pom.xml +++ b/spring-grpc-docs/pom.xml @@ -20,17 +20,14 @@ - org.springframework - spring-core + org.springframework.grpc + spring-grpc-spring-boot-autoconfigure + ${project.version} com.fasterxml.jackson.core jackson-databind - - - org.springframework.grpc - spring-grpc-spring-boot-autoconfigure - ${project.version} + ${jackson.version} diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml index b224b89..0f5ca76 100644 --- a/spring-grpc-spring-boot-autoconfigure/pom.xml +++ b/spring-grpc-spring-boot-autoconfigure/pom.xml @@ -20,79 +20,59 @@ git@github.com:spring-projects-experimental/spring-grpc.git - + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.boot spring-boot-configuration-processor true - - com.google.protobuf - protobuf-java - ${protobuf-java.version} - true - - - org.springframework.grpc spring-grpc-core ${project.parent.version} - org.springframework.boot spring-boot-starter - io.grpc grpc-netty-shaded true + + com.google.protobuf + protobuf-java + true + - org.springframework.grpc spring-grpc-test ${project.parent.version} test - org.springframework.boot spring-boot-starter-test test - - org.springframework.boot - spring-boot-testcontainers - test - - - - org.testcontainers - testcontainers - test - - - - org.awaitility - awaitility - test - - - - io.micrometer - micrometer-observation-test - test - - diff --git a/spring-grpc-test/pom.xml b/spring-grpc-test/pom.xml index c914b89..2dc642b 100644 --- a/spring-grpc-test/pom.xml +++ b/spring-grpc-test/pom.xml @@ -26,7 +26,6 @@ - org.springframework.grpc spring-grpc-core @@ -36,16 +35,5 @@ io.grpc grpc-testing - - - org.springframework.boot - spring-boot-starter-test - - - com.vaadin.external.google - android-json - - - - \ No newline at end of file +