From aa128007442c56515ff6aa2be9dc2b6480f9548a Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:45:58 +0200 Subject: [PATCH 1/7] Fix checkstyle violations --- .../io/trino/plugin/resourcegroups/StaticSelector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/StaticSelector.java b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/StaticSelector.java index 2a813168c26b..d29d3eea2ec2 100644 --- a/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/StaticSelector.java +++ b/plugin/trino-resource-group-managers/src/main/java/io/trino/plugin/resourcegroups/StaticSelector.java @@ -85,13 +85,13 @@ public StaticSelector( return new PatternMatcher(variableNames, sourceRegexValue, criteria -> criteria.getSource().orElse("")); })) .add(userGroupRegex.map(userGroupRegexValue -> - new BasicMatcher(criteria -> criteria.getUserGroups().stream().anyMatch(userGroup -> userGroupRegexValue.matcher(userGroup).matches())))) + new BasicMatcher(criteria -> criteria.getUserGroups().stream().anyMatch(userGroup -> userGroupRegexValue.matcher(userGroup).matches())))) .add(queryType.map(queryTypeValue -> - new BasicMatcher(criteria -> queryTypeValue.equalsIgnoreCase(criteria.getQueryType().orElse(""))))) + new BasicMatcher(criteria -> queryTypeValue.equalsIgnoreCase(criteria.getQueryType().orElse(""))))) .add(selectorResourceEstimate.map(selectorResourceEstimateValue -> - new BasicMatcher(criteria -> selectorResourceEstimateValue.match(criteria.getResourceEstimates())))) + new BasicMatcher(criteria -> selectorResourceEstimateValue.match(criteria.getResourceEstimates())))) .add(clientTags.map(clientTagsValue -> - new BasicMatcher(criteria -> criteria.getTags().containsAll(clientTagsValue)))) + new BasicMatcher(criteria -> criteria.getTags().containsAll(clientTagsValue)))) .build() .stream() .flatMap(Optional::stream) // remove any empty optionals From e6a30c72466db79bc9afe921fa22f44ff3cff396 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:55:40 +0200 Subject: [PATCH 2/7] Update docker-java to 3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb31a6068779..ece4db34b023 100644 --- a/pom.xml +++ b/pom.xml @@ -447,7 +447,7 @@ com.github.docker-java docker-java-api - 3.5.3 + 3.6.0 From deffb405c919a5fea231c357f410553c38ed72e6 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:56:35 +0200 Subject: [PATCH 3/7] Update metrics-core to 4.2.34 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ece4db34b023..9a754df4935c 100644 --- a/pom.xml +++ b/pom.xml @@ -804,7 +804,7 @@ io.dropwizard.metrics metrics-core - 4.2.33 + 4.2.34 From 40c955431599f999f98788322bc62f27a867a104 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:57:06 +0200 Subject: [PATCH 4/7] Update jjwt to 0.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a754df4935c..28924044d4c3 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ 5.3.4 1.9.2 5.17.0 - 0.12.7 + 0.13.0 1.20.0 4.0.0 5.1.0 From b29f5f56d969e33808bc4e5fcdd1376bbfa61f33 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:57:36 +0200 Subject: [PATCH 5/7] Update flywaydb to 11.11.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28924044d4c3..ac1f2434e7b8 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,7 @@ 7.8.0 119 1.23 - 11.11.1 + 11.11.2 1.15.1 v22.14.0 11.2.0 From 61f9d0b82e24ca69211c9a1f5312aae8679dd1c6 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:57:56 +0200 Subject: [PATCH 6/7] Update AWS SDK v2 to 2.32.30 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac1f2434e7b8..7816fac7c36e 100644 --- a/pom.xml +++ b/pom.xml @@ -302,7 +302,7 @@ software.amazon.awssdk bom - 2.32.25 + 2.32.30 pom import From e70aa0708509944d41d82fb1f67bb7fd21b6b2e5 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 26 Aug 2025 12:59:49 +0200 Subject: [PATCH 7/7] Update toxiproxy to 2.1.11 --- lib/trino-filesystem-s3/pom.xml | 1 - plugin/trino-password-authenticators/pom.xml | 1 - pom.xml | 6 ++++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/trino-filesystem-s3/pom.xml b/lib/trino-filesystem-s3/pom.xml index 55923ca21fcd..319e68659243 100644 --- a/lib/trino-filesystem-s3/pom.xml +++ b/lib/trino-filesystem-s3/pom.xml @@ -206,7 +206,6 @@ eu.rekawek.toxiproxy toxiproxy-java - 2.1.7 test diff --git a/plugin/trino-password-authenticators/pom.xml b/plugin/trino-password-authenticators/pom.xml index 61ec1463242f..d5ddc86a5e2a 100644 --- a/plugin/trino-password-authenticators/pom.xml +++ b/plugin/trino-password-authenticators/pom.xml @@ -111,7 +111,6 @@ eu.rekawek.toxiproxy toxiproxy-java - 2.1.7 test diff --git a/pom.xml b/pom.xml index 7816fac7c36e..44503e736d0e 100644 --- a/pom.xml +++ b/pom.xml @@ -621,6 +621,12 @@ 3.3.2 + + eu.rekawek.toxiproxy + toxiproxy-java + 2.1.11 + + info.picocli picocli