diff --git a/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java index 184da117d68d1057a9abe1169d8595decdbcf271..007262d032a2d84c429f3d27460badd91cd1af97 100644 --- a/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java +++ b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/s3/config/AmazonS3ReadOnlyContext.java @@ -55,7 +55,7 @@ public class AmazonS3ReadOnlyContext { public S3Client s3Client(AwsCredentialsProvider credentialsProvider, @Value("${xplanbox.s3.region:#{environment.XPLAN_S3_REGION}}") String region, @Value("${xplanbox.s3.endpoint.url:#{environment.XPLAN_S3_ENDPOINT}}") String endpointUrl, - @Value("${xplanbox.s3.chunkedEncodingEnabled:true}") boolean chunkedEncodingEnabled) + @Value("${xplanbox.s3.chunkedEncodingEnabled:#{environment.XPLAN_S3_CHUNKENCODING_ENABLED?:true}}") boolean chunkedEncodingEnabled) throws URISyntaxException { if (endpointUrl == null || endpointUrl.isEmpty()) { LOG.info("Using S3 region {}", region); diff --git a/xplan-manager/xplan-manager-web/.trivyignore b/xplan-manager/xplan-manager-web/.trivyignore index e3d6fbd587c48b7f55a6766e71d0f0a6c576c6c1..a579e8536bfb331dcf546856c44cf2cd45131547 100644 --- a/xplan-manager/xplan-manager-web/.trivyignore +++ b/xplan-manager/xplan-manager-web/.trivyignore @@ -2,4 +2,5 @@ CVE-2017-11467 CVE-2015-7501 CVE-2024-1597 -CVE-2022-22965 \ No newline at end of file +CVE-2022-22965 +CVE-2024-36404 \ No newline at end of file