From 0564918ce43a3b525dfd20698c0df110470cfe05 Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Mon, 20 Jan 2025 16:07:59 +1100 Subject: [PATCH] fix: remove implicit JDBC deps (#4103) These make too much log noise when they are included but not used --- jvm-runtime/ftl-runtime/common/deployment/pom.xml | 8 -------- jvm-runtime/ftl-runtime/common/runtime/pom.xml | 8 -------- jvm-runtime/jvm_hot_reload_test.go | 12 ++++++++++++ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/jvm-runtime/ftl-runtime/common/deployment/pom.xml b/jvm-runtime/ftl-runtime/common/deployment/pom.xml index a82ad01ab..1d914c193 100644 --- a/jvm-runtime/ftl-runtime/common/deployment/pom.xml +++ b/jvm-runtime/ftl-runtime/common/deployment/pom.xml @@ -31,14 +31,6 @@ io.quarkus quarkus-opentelemetry-deployment - - io.quarkus - quarkus-jdbc-mysql-deployment - - - io.quarkus - quarkus-jdbc-postgresql-deployment - io.quarkus quarkus-agroal-spi diff --git a/jvm-runtime/ftl-runtime/common/runtime/pom.xml b/jvm-runtime/ftl-runtime/common/runtime/pom.xml index 763fac38e..89362d369 100644 --- a/jvm-runtime/ftl-runtime/common/runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/common/runtime/pom.xml @@ -48,14 +48,6 @@ io.quarkus quarkus-credentials - - io.quarkus - quarkus-jdbc-mysql - - - io.quarkus - quarkus-jdbc-postgresql - io.grpc grpc-stub diff --git a/jvm-runtime/jvm_hot_reload_test.go b/jvm-runtime/jvm_hot_reload_test.go index a76cfeb35..d87f7fe9b 100644 --- a/jvm-runtime/jvm_hot_reload_test.go +++ b/jvm-runtime/jvm_hot_reload_test.go @@ -24,6 +24,18 @@ func TestLifecycleJVM(t *testing.T) { in.Exec("ftl", "init", "test", "."), in.IfLanguage("java", in.Exec("ftl", "new", "java", "echo")), in.IfLanguage("kotlin", in.Exec("ftl", "new", "kotlin", "echo")), + // Add the DB dependency early in the test + // Hot reload is not as smooth with dependency changes + in.EditFile("echo", func(content []byte) []byte { + return []byte(strings.Replace(string(content), "", ` + + + + io.quarkus + quarkus-jdbc-postgresql + +`, 1)) + }, "pom.xml"), in.WaitWithTimeout("echo", time.Minute), in.VerifyControllerStatus(func(ctx context.Context, t testing.TB, status *ftlv1.StatusResponse) { assert.Equal(t, 1, len(status.Deployments))