From 261fd5a4fbac1cbef6d02e3784ed95400c5a606a Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Wed, 21 Feb 2024 11:27:39 -0800 Subject: [PATCH] Add optional S3 dependency to py embedded-server (#5180) Also, adds overlooked sql and s3 to server-jetty-app-custom example. --- py/embedded-server/java-runtime/build.gradle | 4 ++++ server/jetty-app-custom/build.gradle | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/py/embedded-server/java-runtime/build.gradle b/py/embedded-server/java-runtime/build.gradle index 829754bd567..56111b847c5 100644 --- a/py/embedded-server/java-runtime/build.gradle +++ b/py/embedded-server/java-runtime/build.gradle @@ -29,6 +29,10 @@ dependencies { if (!hasProperty('excludeSql')) { runtimeOnly project(':engine-sql') } + + if (!hasProperty('excludeS3')) { + runtimeOnly project(':extensions-s3') + } } // making a dir here isn't optimal, but without it we need to make py-embedded-server be a java and a python diff --git a/server/jetty-app-custom/build.gradle b/server/jetty-app-custom/build.gradle index aff4370c322..5ced1d53458 100644 --- a/server/jetty-app-custom/build.gradle +++ b/server/jetty-app-custom/build.gradle @@ -46,6 +46,18 @@ if (!hasProperty('excludeClockImpl')) { extraJvmArgs += ['--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED'] } +if (!hasProperty('excludeSql')) { + dependencies { + runtimeOnly project(':engine-sql') + } +} + +if (!hasProperty('excludeS3')) { + dependencies { + runtimeOnly project(':extensions-s3') + } +} + if (hasProperty('devCerts') || hasProperty('devMTLS')) { extraJvmArgs += [ '-Dhttp.port=8443',