From 00d6154c6078bd299053b910f12dd0375b7c1886 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 25 Aug 2020 10:38:34 +0200 Subject: [PATCH] Revert "Hardcoding reactor dependencies" This reverts commit 50d69cb74c31399ebc81e81d4f6ac42210604fb8. --- pom.xml | 9 --------- samples/standalone/dsl/http-server/build.gradle | 2 -- samples/standalone/dsl/http-server/gradle.properties | 3 +-- samples/standalone/dsl/http-server/pom.xml | 9 --------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index d9bcfde5bc..8b6b3e8a53 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,6 @@ 5.5.1.201910021850-r 1 3.4.6 - 2020.0.0-SNAPSHOT 1.3.2 5.6.2 @@ -111,14 +110,6 @@ - - - io.projectreactor - reactor-bom - ${reactor.version} - pom - import - org.apache.camel.springboot camel-spring-boot-starter diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index 2374c4b04e..e81eaf1341 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -61,8 +61,6 @@ apply plugin: 'maven-publish' dependencyManagement { imports { mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION" - // TODO: We shouldn't be setting this - mavenBom "io.projectreactor:reactor-bom:$reactorBomVersion" } } diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 3bcc187671..fbb41a63f2 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,5 +1,4 @@ org.gradle.daemon=false verifierVersion=3.0.0-SNAPSHOT BOM_VERSION=2020.0.0-SNAPSHOT -bootVersion=2.4.0-SNAPSHOT -reactorBomVersion=2020.0.0-SNAPSHOT \ No newline at end of file +bootVersion=2.4.0-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index a42b4278ee..5bf4ab4376 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -24,7 +24,6 @@ 3.0.0-SNAPSHOT 2020.0.0-SNAPSHOT - 2020.0.0-SNAPSHOT @@ -79,14 +78,6 @@ pom import - - - io.projectreactor - reactor-bom - ${reactor.version} - pom - import -