diff --git a/build.gradle b/build.gradle index ee63164..e4086dd 100644 --- a/build.gradle +++ b/build.gradle @@ -20,4 +20,10 @@ subprojects { repositories { mavenCentral() } + + dependencyManagement { + imports { + mavenBom "org.springframework.boot:spring-boot-dependencies:3.4.5" + } + } } diff --git a/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Controllers/TunnelController.java b/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Controllers/TunnelController.java index c6ea6e8..0a2e9ff 100644 --- a/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Controllers/TunnelController.java +++ b/cftunnels-service/src/main/java/com/hithomelabs/cftunnels/Controllers/TunnelController.java @@ -3,7 +3,7 @@ package com.hithomelabs.cftunnels.Controllers; import com.fasterxml.jackson.core.JsonProcessingException; import com.hithomelabs.cftunnels.Config.AuthoritiesToGroupMapping; import com.hithomelabs.cftunnels.Config.CloudflareConfig; -import com.hithomelabs.cftunnels.Config.RestTemplateConfig; +import com.hithomelabs.common.config.RestTemplateConfig; import com.hithomelabs.cftunnels.Entity.Request; import com.hithomelabs.cftunnels.Entity.Tunnel; import com.hithomelabs.cftunnels.Entity.User; diff --git a/cftunnels-service/src/test/java/com/hithomelabs/cftunnels/Controllers/TunnelControllerTest.java b/cftunnels-service/src/test/java/com/hithomelabs/cftunnels/Controllers/TunnelControllerTest.java index 9d49582..d9e41a0 100644 --- a/cftunnels-service/src/test/java/com/hithomelabs/cftunnels/Controllers/TunnelControllerTest.java +++ b/cftunnels-service/src/test/java/com/hithomelabs/cftunnels/Controllers/TunnelControllerTest.java @@ -3,7 +3,7 @@ package com.hithomelabs.cftunnels.Controllers; import com.fasterxml.jackson.databind.ObjectMapper; import com.hithomelabs.cftunnels.Config.AuthoritiesToGroupMapping; import com.hithomelabs.cftunnels.Config.CloudflareConfig; -import com.hithomelabs.cftunnels.Config.RestTemplateConfig; +import com.hithomelabs.common.config.RestTemplateConfig; import com.hithomelabs.cftunnels.Headers.AuthKeyEmailHeader; import com.hithomelabs.cftunnels.Entity.Request; import com.hithomelabs.cftunnels.Entity.Tunnel; diff --git a/common/build.gradle b/common/build.gradle index e9aac46..4af833f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,4 +1,5 @@ dependencies { + implementation 'org.springframework:spring-context' implementation 'org.springframework:spring-web' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'org.apache.httpcomponents.client5:httpclient5'