From 569cf81f04f723b8901044beb7bfcfe325d0bb48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 22:59:18 +0100 Subject: [PATCH 001/166] build(deps-dev): bump org.wiremock:wiremock from 3.3.1 to 3.4.1 (#211) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index f367934e..539cfdd0 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.3.1 + 3.4.1 test From de8db508597b0d60446ae0df28eb6b63c4678e2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 22:15:19 +0100 Subject: [PATCH 002/166] build(deps): bump scacap/action-surefire-report from 1.7.3 to 1.8.0 (#212) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fde8dd7..2c79ce42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} min-coverage-overall: 80 min-coverage-changed-files: 80 - - uses: scacap/action-surefire-report@v1.7.3 \ No newline at end of file + - uses: scacap/action-surefire-report@v1.8.0 \ No newline at end of file From 4722ebd689ed4265452e94c58d58db65d9dacbcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 22:24:02 +0100 Subject: [PATCH 003/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.2.2 to 3.2.3 (#214) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 8adfadc4..b1a3c1e6 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.2.2 + 3.2.3 From 892f688b602bc3c983ea0002e2c8813806f1f0b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 22:24:16 +0100 Subject: [PATCH 004/166] build(deps-dev): bump org.wiremock:wiremock from 3.4.1 to 3.4.2 (#213) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 539cfdd0..7d181c7f 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.4.1 + 3.4.2 test From 88280fd5f5add0aed8219b19722d876b9b3a8b37 Mon Sep 17 00:00:00 2001 From: Daniel Heid Date: Sat, 9 Mar 2024 13:30:18 +0100 Subject: [PATCH 005/166] Resolves #215 --- README.md | 190 +++++++++++------- core/pom.xml | 2 +- .../java/tracking/ExecutorServiceCloser.java | 42 ++++ .../matomo/java/tracking/MatomoTracker.java | 10 +- .../java/org/matomo/java/tracking/Sender.java | 2 +- .../tracking/ExecutorServiceCloserTest.java | 46 +++++ .../org/matomo/java/tracking/TestSender.java | 4 + java11/pom.xml | 4 +- .../matomo/java/tracking/Java11Sender.java | 71 +++++-- .../java/tracking/Java11SenderProvider.java | 25 ++- .../matomo/java/tracking/Java11SenderIT.java | 13 +- java8/pom.xml | 4 +- .../org/matomo/java/tracking/Java8Sender.java | 12 +- .../matomo/java/tracking/Java8SenderIT.java | 3 +- .../matomo/java/tracking/MatomoTrackerIT.java | 8 + pom.xml | 2 +- servlet-jakarta/pom.xml | 4 +- .../tracking/servlet/MatomoTrackerFilter.java | 11 + .../org/matomo/java/tracking/TestSender.java | 4 + servlet-javax/pom.xml | 4 +- .../java/tracking/MatomoTrackerFilterIT.java | 2 + .../org/matomo/java/tracking/TestSender.java | 4 + spring/pom.xml | 2 +- test/pom.xml | 2 +- .../java/tracking/test/BulkExample.java | 26 +-- .../java/tracking/test/ConsumerExample.java | 28 +-- .../java/tracking/test/EcommerceExample.java | 54 ++--- .../tracking/test/MatomoTrackerTester.java | 21 +- .../java/tracking/test/SendExample.java | 16 +- 29 files changed, 426 insertions(+), 190 deletions(-) create mode 100644 core/src/main/java/org/matomo/java/tracking/ExecutorServiceCloser.java create mode 100644 core/src/test/java/org/matomo/java/tracking/ExecutorServiceCloserTest.java diff --git a/README.md b/README.md index bcd72ba4..fe47114d 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ dependencies. Release notes can be found here: https://github.com/matomo-org/mat Here are the most important changes: -* Matomo Java Tracker 3.2.0 is compatible with Matomo 4 and 5 +* Matomo Java Tracker 3.3.0 is compatible with Matomo 4 and 5 * less dependencies * new dimension parameter * special types allow to provide valid parameters now @@ -140,7 +140,7 @@ Add a dependency on Matomo Java Tracker using Maven. For Java 8: org.piwik.java.tracking matomo-java-tracker - 3.2.0 + 3.3.0 ``` @@ -151,7 +151,7 @@ For Java 11: org.piwik.java.tracking matomo-java-tracker-java11 - 3.2.0 + 3.3.0 ``` @@ -159,7 +159,7 @@ or Gradle (Java 8): ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker:3.2.0") + implementation("org.piwik.java.tracking:matomo-java-tracker:3.3.0") } ``` @@ -167,20 +167,20 @@ or Gradle (Java 11): ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.2.0") + implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.3.0") } ``` or Gradle with Kotlin DSL (Java 8) ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker:3.2.0") +implementation("org.piwik.java.tracking:matomo-java-tracker:3.3.0") ``` or Gradle with Kotlin DSL (Java 11) ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.2.0") +implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.3.0") ``` ### Spring Boot Module @@ -193,7 +193,7 @@ and allows you to configure the tracker via application properties. Add the foll org.piwik.java.tracking matomo-java-tracker-spring-boot-starter - 3.2.0 + 3.3.0 ``` @@ -201,14 +201,14 @@ or Gradle: ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.2.0") + implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.3.0") } ``` or Gradle with Kotlin DSL ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.2.0") +implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.3.0") ``` The following properties are supported: @@ -270,14 +270,21 @@ To let the Matomo Java Tracker send a request to the Matomo instance, you need t ```java import java.net.URI; -import org.matomo.java.tracking.MatomoRequest; import org.matomo.java.tracking.MatomoRequests; import org.matomo.java.tracking.MatomoTracker; import org.matomo.java.tracking.TrackerConfiguration; import org.matomo.java.tracking.parameters.VisitorId; +/** + * Example for sending a request. + */ public class SendExample { + /** + * Example for sending a request. + * + * @param args ignored + */ public static void main(String[] args) { TrackerConfiguration configuration = TrackerConfiguration @@ -288,17 +295,19 @@ public class SendExample { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - tracker.sendRequestAsync(MatomoRequests - .event("Training", "Workout completed", "Bench press", 60.0) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build() - ); - + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + tracker.sendRequestAsync(MatomoRequests + .event("Training", "Workout completed", "Bench press", 60.0) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } } + ``` This will send a request to the Matomo instance at https://www.yourdomain.com/matomo.php and track a page view for the @@ -311,15 +320,23 @@ If you want to perform an operation after a successful asynchronous call to Mato result like this: ```java - import java.net.URI; +import org.matomo.java.tracking.MatomoRequest; import org.matomo.java.tracking.MatomoRequests; import org.matomo.java.tracking.MatomoTracker; import org.matomo.java.tracking.TrackerConfiguration; import org.matomo.java.tracking.parameters.VisitorId; +/** + * Example for sending a request and performing an action when the request was sent successfully. + */ public class ConsumerExample { + /** + * Example for sending a request and performing an action when the request was sent successfully. + * + * @param args ignored + */ public static void main(String[] args) { TrackerConfiguration configuration = TrackerConfiguration @@ -330,24 +347,27 @@ public class ConsumerExample { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - MatomoRequest request = MatomoRequests - .event("Training", "Workout completed", "Bench press", 60.0) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build(); - - tracker.sendRequestAsync(request) - .thenAccept(req -> System.out.printf("Sent request %s%n", req)) - .exceptionally(throwable -> { - System.err.printf("Failed to send request: %s%n", throwable.getMessage()); - return null; - }); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + MatomoRequest request = MatomoRequests + .event("Training", "Workout completed", "Bench press", 60.0) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build(); + + tracker.sendRequestAsync(request) + .thenAccept(req -> System.out.printf("Sent request %s%n", req)) + .exceptionally(throwable -> { + System.err.printf("Failed to send request: %s%n", throwable.getMessage()); + return null; + }); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } } + ``` If you have multiple requests to wish to track, it may be more efficient to send them in a single HTTP call. To do this, @@ -355,14 +375,21 @@ send a bulk request. Place your requests in an _Iterable_ data structure and cal ```java import java.net.URI; -import org.matomo.java.tracking.MatomoRequest; import org.matomo.java.tracking.MatomoRequests; import org.matomo.java.tracking.MatomoTracker; import org.matomo.java.tracking.TrackerConfiguration; import org.matomo.java.tracking.parameters.VisitorId; +/** + * Example for sending multiple requests in one bulk request. + */ public class BulkExample { + /** + * Example for sending multiple requests in one bulk request. + * + * @param args ignored + */ public static void main(String[] args) { TrackerConfiguration configuration = TrackerConfiguration @@ -373,23 +400,24 @@ public class BulkExample { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - VisitorId visitorId = VisitorId.fromString("customer@mail.com"); - tracker.sendBulkRequestAsync( - MatomoRequests.siteSearch("Running shoes", "Running", 120L) - .visitorId(visitorId).build(), - MatomoRequests.pageView("VelocityStride ProX Running Shoes") - .visitorId(visitorId).build(), - MatomoRequests.ecommerceOrder("QXZ-789LMP", 100.0, 124.0, 19.0, 10.0, 5.0) - .visitorId(visitorId) - .build() - ); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + VisitorId visitorId = VisitorId.fromString("customer@mail.com"); + tracker.sendBulkRequestAsync( + MatomoRequests.siteSearch("Running shoes", "Running", 120L) + .visitorId(visitorId).build(), + MatomoRequests.pageView("VelocityStride ProX Running Shoes") + .visitorId(visitorId).build(), + MatomoRequests.ecommerceOrder("QXZ-789LMP", 100.0, 124.0, 19.0, 10.0, 5.0) + .visitorId(visitorId) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } } - ``` This will send two requests in a single HTTP call. The requests will be sent asynchronously. @@ -410,9 +438,7 @@ a unique identifier, e.g. an email address. If you do not provide a visitor id, Ecommerce requests contain ecommerce items, that can be fluently build: ```java - import java.net.URI; -import org.matomo.java.tracking.MatomoRequest; import org.matomo.java.tracking.MatomoRequests; import org.matomo.java.tracking.MatomoTracker; import org.matomo.java.tracking.TrackerConfiguration; @@ -420,8 +446,16 @@ import org.matomo.java.tracking.parameters.EcommerceItem; import org.matomo.java.tracking.parameters.EcommerceItems; import org.matomo.java.tracking.parameters.VisitorId; +/** + * Example for sending an ecommerce request. + */ public class EcommerceExample { + /** + * Example for sending an ecommerce request. + * + * @param args ignored + */ public static void main(String[] args) { TrackerConfiguration configuration = TrackerConfiguration @@ -432,37 +466,38 @@ public class EcommerceExample { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - tracker.sendBulkRequestAsync(MatomoRequests - .ecommerceCartUpdate(50.0) - .ecommerceItems(EcommerceItems - .builder() - .item(EcommerceItem - .builder() - .sku("XYZ12345") - .name("Matomo - The big book about web analytics") - .category("Education & Teaching") - .price(23.1) - .quantity(2) - .build()) - .item(EcommerceItem - .builder() - .sku("B0C2WV3MRJ") - .name("Matomo for data visualization") - .category("Education & Teaching") - .price(15.0) - .quantity(1) - .build()) - .build()) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build() - ); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + tracker.sendBulkRequestAsync(MatomoRequests + .ecommerceCartUpdate(50.0) + .ecommerceItems(EcommerceItems + .builder() + .item(EcommerceItem + .builder() + .sku("XYZ12345") + .name("Matomo - The big book about web analytics") + .category("Education & Teaching") + .price(23.1) + .quantity(2) + .build()) + .item(EcommerceItem + .builder() + .sku("B0C2WV3MRJ") + .name("Matomo for data visualization") + .category("Education & Teaching") + .price(15.0) + .quantity(1) + .build()) + .build()) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } } - ``` Note that if you want to be able to track campaigns using *Referrers > Campaigns*, you must add the correct @@ -640,11 +675,10 @@ the Maven goal `install, a snapshot version can be used in your local Maven repository for testing purposes, e.g. ```xml - org.piwik.java.tracking matomo-java-tracker - 3.2.1-SNAPSHOT + 3.3.1-SNAPSHOT ``` diff --git a/core/pom.xml b/core/pom.xml index b6d57050..e7453fc2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/org/matomo/java/tracking/ExecutorServiceCloser.java b/core/src/main/java/org/matomo/java/tracking/ExecutorServiceCloser.java new file mode 100644 index 00000000..1ef11c97 --- /dev/null +++ b/core/src/main/java/org/matomo/java/tracking/ExecutorServiceCloser.java @@ -0,0 +1,42 @@ +package org.matomo.java.tracking; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import lombok.NonNull; + +/** + * Helps to close an executor service. + */ +public class ExecutorServiceCloser { + + /** + * Closes the given executor service. + * + *

This will check whether the executor service is already terminated, and if not, it + * initiates a shutdown and waits a minute. If the minute expires, the executor service + * is shutdown immediately. + * + * @param executorService The executor service to close + */ + public static void close(@NonNull ExecutorService executorService) { + boolean terminated = executorService.isTerminated(); + if (!terminated) { + executorService.shutdown(); + boolean interrupted = false; + while (!terminated) { + try { + terminated = executorService.awaitTermination(1L, TimeUnit.MINUTES); + } catch (InterruptedException e) { + if (!interrupted) { + executorService.shutdownNow(); + interrupted = true; + } + } + } + if (interrupted) { + Thread.currentThread().interrupt(); + } + } + } + +} diff --git a/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java b/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java index 51a585d5..84c48271 100644 --- a/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java +++ b/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java @@ -35,7 +35,7 @@ * @author brettcsorba */ @Slf4j -public class MatomoTracker { +public class MatomoTracker implements AutoCloseable { private final TrackerConfiguration trackerConfiguration; @@ -364,4 +364,12 @@ public CompletableFuture sendBulkRequestAsync( ) { return sendBulkRequestAsync(requests, authToken, null); } + + @Override + public void close() throws Exception { + if (sender != null) { + sender.close(); + } + } + } diff --git a/core/src/main/java/org/matomo/java/tracking/Sender.java b/core/src/main/java/org/matomo/java/tracking/Sender.java index acb82280..a256335e 100644 --- a/core/src/main/java/org/matomo/java/tracking/Sender.java +++ b/core/src/main/java/org/matomo/java/tracking/Sender.java @@ -4,7 +4,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; import java.util.concurrent.CompletableFuture; -interface Sender { +interface Sender extends AutoCloseable { @NonNull CompletableFuture sendSingleAsync( @NonNull MatomoRequest request diff --git a/core/src/test/java/org/matomo/java/tracking/ExecutorServiceCloserTest.java b/core/src/test/java/org/matomo/java/tracking/ExecutorServiceCloserTest.java new file mode 100644 index 00000000..e0d167a9 --- /dev/null +++ b/core/src/test/java/org/matomo/java/tracking/ExecutorServiceCloserTest.java @@ -0,0 +1,46 @@ +package org.matomo.java.tracking; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import org.junit.jupiter.api.Test; + +class ExecutorServiceCloserTest { + + @Test + void shutsDownExecutorService() { + + ExecutorService executorService = Executors.newFixedThreadPool(2, new DaemonThreadFactory()); + + ExecutorServiceCloser.close(executorService); + + assertThat(executorService.isTerminated()).isTrue(); + assertThat(executorService.isShutdown()).isTrue(); + + } + + @Test + void shutsDownExecutorServiceImmediately() throws Exception { + + ExecutorService executorService = Executors.newSingleThreadExecutor(); + executorService.submit(() -> { + try { + Thread.sleep(10000L); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + + Thread thread = new Thread(() -> { + ExecutorServiceCloser.close(executorService); + }); + thread.start(); + Thread.sleep(1000L); + thread.interrupt(); + + assertThat(executorService.isShutdown()).isTrue(); + + } + +} \ No newline at end of file diff --git a/core/src/test/java/org/matomo/java/tracking/TestSender.java b/core/src/test/java/org/matomo/java/tracking/TestSender.java index 4d4c7465..0342cf98 100644 --- a/core/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/core/src/test/java/org/matomo/java/tracking/TestSender.java @@ -69,4 +69,8 @@ private void createQueryAndAddRequest(@lombok.NonNull MatomoRequest request, @Nu requests.add(request); } + @Override + public void close() { + // do nothing + } } diff --git a/java11/pom.xml b/java11/pom.xml index 7d181c7f..28779b26 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml matomo-java-tracker-java11 - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT jar Matomo Java Tracker Java 11 diff --git a/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java b/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java index 3daf434f..2cff400d 100644 --- a/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java +++ b/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java @@ -17,6 +17,7 @@ import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -39,9 +40,14 @@ public class Java11Sender implements Sender { @lombok.NonNull private final CookieStore cookieStore; + @lombok.NonNull + private final ExecutorService executorService; + @NonNull @Override - public CompletableFuture sendSingleAsync(@NonNull @lombok.NonNull MatomoRequest request) { + public CompletableFuture sendSingleAsync( + @NonNull @lombok.NonNull MatomoRequest request + ) { return sendAsyncAndCheckResponse(buildHttpGetRequest(request), request); } @@ -51,14 +57,19 @@ public void sendSingle(@NonNull @lombok.NonNull MatomoRequest request) { } private void sendAndCheckResponse(@NonNull HttpRequest httpRequest) { - checkResponse(send(httpRequest, () -> httpClient.send(httpRequest, HttpResponse.BodyHandlers.discarding())), + checkResponse( + send( + httpRequest, + () -> httpClient.send(httpRequest, HttpResponse.BodyHandlers.discarding()) + ), httpRequest ); } @Override public void sendBulk( - @NonNull @lombok.NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull @lombok.NonNull Iterable requests, + @Nullable String overrideAuthToken ) { sendAndCheckResponse(buildHttpPostRequest(requests, overrideAuthToken)); } @@ -67,7 +78,8 @@ public void sendBulk( private HttpRequest buildHttpPostRequest( @NonNull Iterable requests, @Nullable String overrideAuthToken ) { - String authToken = AuthToken.determineAuthToken(overrideAuthToken, requests, trackerConfiguration); + String authToken = + AuthToken.determineAuthToken(overrideAuthToken, requests, trackerConfiguration); Collection queries = new ArrayList<>(); Map headers = new LinkedHashMap<>(10); String headerUserAgent = null; @@ -103,7 +115,8 @@ private HttpRequest buildHttpPostRequest( @NonNull @Override public CompletableFuture sendBulkAsync( - @NonNull @lombok.NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull @lombok.NonNull Iterable requests, + @Nullable String overrideAuthToken ) { return sendAsyncAndCheckResponse(buildHttpPostRequest(requests, overrideAuthToken), null); } @@ -112,11 +125,13 @@ public CompletableFuture sendBulkAsync( private CompletableFuture sendAsyncAndCheckResponse( @NonNull HttpRequest httpRequest, @Nullable T result ) { - return send(httpRequest, - () -> httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding()).thenApply(response -> { - checkResponse(response, httpRequest); - return result; - }) + return send( + httpRequest, + () -> httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.discarding()) + .thenApply(response -> { + checkResponse(response, httpRequest); + return result; + }) ); } @@ -129,7 +144,8 @@ private HttpRequest buildHttpGetRequest(@NonNull MatomoRequest request) { URI apiEndpoint = trackerConfiguration.getApiEndpoint(); HttpRequest.Builder builder = HttpRequest .newBuilder() - .uri(apiEndpoint.resolve(String.format("%s?%s", + .uri(apiEndpoint.resolve(String.format( + "%s?%s", apiEndpoint.getPath(), queryCreator.createQuery(request, authToken) ))); @@ -155,12 +171,22 @@ private T send( } } - private void checkResponse(@NonNull HttpResponse response, @NonNull HttpRequest httpRequest) { + private void checkResponse( + @NonNull HttpResponse response, + @NonNull HttpRequest httpRequest + ) { if (response.statusCode() > 399) { if (trackerConfiguration.isLogFailedTracking()) { - log.error("Received HTTP error code {} for URL {}", response.statusCode(), httpRequest.uri()); + log.error( + "Received HTTP error code {} for URL {}", + response.statusCode(), + httpRequest.uri() + ); } - throw new MatomoException(String.format("Tracking endpoint responded with code %d", response.statusCode())); + throw new MatomoException(String.format( + "Tracking endpoint responded with code %d", + response.statusCode() + )); } } @@ -176,13 +202,16 @@ private void addCookies(MatomoRequest request) { } private void applyTrackerConfiguration(@NonNull HttpRequest.Builder builder) { - if (trackerConfiguration.getSocketTimeout() != null && trackerConfiguration.getSocketTimeout().toMillis() > 0L) { + if (trackerConfiguration.getSocketTimeout() != null + && trackerConfiguration.getSocketTimeout().toMillis() > 0L) { builder.timeout(trackerConfiguration.getSocketTimeout()); } } private void setUserAgentHeader( - HttpRequest.Builder builder, @Nullable String headerUserAgent, @Nullable Map headers + HttpRequest.Builder builder, + @Nullable String headerUserAgent, + @Nullable Map headers ) { String userAgentHeader = null; if ((headerUserAgent == null || headerUserAgent.trim().isEmpty()) && headers != null) { @@ -197,11 +226,19 @@ private void setUserAgentHeader( } } - private void addHeaders(@NonNull HttpRequest.Builder builder, @Nullable Map headers) { + private void addHeaders( + @NonNull HttpRequest.Builder builder, + @Nullable Map headers + ) { if (headers != null) { for (Map.Entry header : headers.entrySet()) { builder.header(header.getKey(), header.getValue()); } } } + + @Override + public void close() { + ExecutorServiceCloser.close(executorService); + } } diff --git a/java11/src/main/java/org/matomo/java/tracking/Java11SenderProvider.java b/java11/src/main/java/org/matomo/java/tracking/Java11SenderProvider.java index 273ca19f..d6145198 100644 --- a/java11/src/main/java/org/matomo/java/tracking/Java11SenderProvider.java +++ b/java11/src/main/java/org/matomo/java/tracking/Java11SenderProvider.java @@ -6,6 +6,7 @@ import java.net.ProxySelector; import java.net.http.HttpClient; import java.security.SecureRandom; +import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; @@ -22,19 +23,25 @@ public Sender provideSender( TrackerConfiguration trackerConfiguration, QueryCreator queryCreator ) { CookieManager cookieManager = new CookieManager(); + ExecutorService executorService = Executors.newFixedThreadPool( + trackerConfiguration.getThreadPoolSize(), + new DaemonThreadFactory() + ); HttpClient.Builder builder = HttpClient .newBuilder() .cookieHandler(cookieManager) - .executor(Executors.newFixedThreadPool(trackerConfiguration.getThreadPoolSize(), new DaemonThreadFactory())) - ; - if (trackerConfiguration.getConnectTimeout() != null && trackerConfiguration.getConnectTimeout().toMillis() > 0L) { + .executor(executorService); + if (trackerConfiguration.getConnectTimeout() != null + && trackerConfiguration.getConnectTimeout().toMillis() > 0L) { builder.connectTimeout(trackerConfiguration.getConnectTimeout()); } if (!isEmpty(trackerConfiguration.getProxyHost()) && trackerConfiguration.getProxyPort() > 0) { - builder.proxy(ProxySelector.of(new InetSocketAddress(trackerConfiguration.getProxyHost(), + builder.proxy(ProxySelector.of(new InetSocketAddress( + trackerConfiguration.getProxyHost(), trackerConfiguration.getProxyPort() ))); - if (!isEmpty(trackerConfiguration.getProxyUsername()) && !isEmpty(trackerConfiguration.getProxyPassword())) { + if (!isEmpty(trackerConfiguration.getProxyUsername()) + && !isEmpty(trackerConfiguration.getProxyPassword())) { builder.authenticator(new ProxyAuthenticator( trackerConfiguration.getProxyUsername(), trackerConfiguration.getProxyPassword() @@ -54,7 +61,13 @@ public Sender provideSender( throw new MatomoException("Please disable SSL hostname verification manually using the system parameter -Djdk.internal.httpclient.disableHostnameVerification=true"); } - return new Java11Sender(trackerConfiguration, queryCreator, builder.build(), cookieManager.getCookieStore()); + return new Java11Sender( + trackerConfiguration, + queryCreator, + builder.build(), + cookieManager.getCookieStore(), + executorService + ); } private static boolean isEmpty( diff --git a/java11/src/test/java/org/matomo/java/tracking/Java11SenderIT.java b/java11/src/test/java/org/matomo/java/tracking/Java11SenderIT.java index cdfef1df..6ce1a63b 100644 --- a/java11/src/test/java/org/matomo/java/tracking/Java11SenderIT.java +++ b/java11/src/test/java/org/matomo/java/tracking/Java11SenderIT.java @@ -21,6 +21,7 @@ import java.time.Duration; import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,7 +46,8 @@ void failsIfTrackerConfigurationIsNotSet() { .apiEndpoint(URI.create("http://localhost")) .build()), HttpClient.newBuilder().cookieHandler(cookieManager).build(), - cookieManager.getCookieStore() + cookieManager.getCookieStore(), + Executors.newFixedThreadPool(2, new DaemonThreadFactory()) )).isInstanceOf(NullPointerException.class) .hasMessage("trackerConfiguration is marked non-null but is null"); } @@ -57,7 +59,8 @@ void failsIfQueryCreatorIsNotSet() { TrackerConfiguration.builder().apiEndpoint(URI.create("http://localhost")).build(), null, HttpClient.newBuilder().cookieHandler(cookieManager).build(), - cookieManager.getCookieStore() + cookieManager.getCookieStore(), + Executors.newFixedThreadPool(2, new DaemonThreadFactory()) )).isInstanceOf(NullPointerException.class) .hasMessage("queryCreator is marked non-null but is null"); } @@ -71,7 +74,8 @@ void failsIfHttpClientIsNotSet() { .apiEndpoint(URI.create("http://localhost")) .build()), null, - cookieManager.getCookieStore() + cookieManager.getCookieStore(), + Executors.newFixedThreadPool(2, new DaemonThreadFactory()) )).isInstanceOf(NullPointerException.class) .hasMessage("httpClient is marked non-null but is null"); } @@ -85,7 +89,8 @@ void failsIfCookieStoreIsNotSet() { .apiEndpoint(URI.create("http://localhost")) .build()), HttpClient.newBuilder().cookieHandler(cookieManager).build(), - null + null, + Executors.newFixedThreadPool(2, new DaemonThreadFactory()) )).isInstanceOf(NullPointerException.class) .hasMessage("cookieStore is marked non-null but is null"); } diff --git a/java8/pom.xml b/java8/pom.xml index 9c47baae..d7bf1a49 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml matomo-java-tracker - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT jar Matomo Java Tracker Java 8 diff --git a/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java b/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java index 9b386f89..849ccda1 100644 --- a/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java +++ b/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; @@ -59,7 +59,7 @@ class Java8Sender implements Sender { private final QueryCreator queryCreator; - private final Executor executor; + private final ExecutorService executorService; private final Collection queries = new ArrayList<>(16); @Override @@ -70,7 +70,7 @@ public CompletableFuture sendSingleAsync( return CompletableFuture.supplyAsync(() -> { sendSingle(request); return request; - }, executor); + }, executorService); } @Override @@ -340,7 +340,7 @@ public CompletableFuture sendBulkAsync( } } return CompletableFuture.supplyAsync(() -> - sendBulkAsync(authToken, headers, headerUserAgent, sessionId, cookies), executor); + sendBulkAsync(authToken, headers, headerUserAgent, sessionId, cookies), executorService); } @Nullable @@ -385,4 +385,8 @@ private Map findCookies(Iterable reques return null; } + @Override + public void close() { + ExecutorServiceCloser.close(executorService); + } } diff --git a/java8/src/test/java/org/matomo/java/tracking/Java8SenderIT.java b/java8/src/test/java/org/matomo/java/tracking/Java8SenderIT.java index 4b92535f..dcaeafa4 100644 --- a/java8/src/test/java/org/matomo/java/tracking/Java8SenderIT.java +++ b/java8/src/test/java/org/matomo/java/tracking/Java8SenderIT.java @@ -16,6 +16,7 @@ import java.net.MalformedURLException; import java.net.URI; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -242,7 +243,7 @@ private void givenSender() { sender = new Java8Sender( trackerConfiguration, new QueryCreator(trackerConfiguration), - Runnable::run + Executors.newFixedThreadPool(2, new DaemonThreadFactory()) ); } diff --git a/java8/src/test/java/org/matomo/java/tracking/MatomoTrackerIT.java b/java8/src/test/java/org/matomo/java/tracking/MatomoTrackerIT.java index fe8eb7c1..04500061 100644 --- a/java8/src/test/java/org/matomo/java/tracking/MatomoTrackerIT.java +++ b/java8/src/test/java/org/matomo/java/tracking/MatomoTrackerIT.java @@ -23,6 +23,7 @@ import java.util.Locale.LanguageRange; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -69,6 +70,13 @@ void givenStub() { wireMockServer.stubFor(get(urlPathEqualTo("/matomo.php")).willReturn(status(204))); } + @AfterEach + void closeTracker() throws Exception { + if (matomoTracker != null) { + matomoTracker.close(); + } + } + @Test void requiresSiteId() { diff --git a/pom.xml b/pom.xml index 247ff62f..724fbfea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT pom Matomo Java Tracker Parent diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 59d85e5b..0f96202e 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-jakarta - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-jakarta/src/main/java/org/matomo/java/tracking/servlet/MatomoTrackerFilter.java b/servlet-jakarta/src/main/java/org/matomo/java/tracking/servlet/MatomoTrackerFilter.java index 664ce209..11ca4494 100644 --- a/servlet-jakarta/src/main/java/org/matomo/java/tracking/servlet/MatomoTrackerFilter.java +++ b/servlet-jakarta/src/main/java/org/matomo/java/tracking/servlet/MatomoTrackerFilter.java @@ -30,4 +30,15 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC tracker.sendRequestAsync(matomoRequest); super.doFilter(req, res, chain); } + + @Override + public void destroy() { + if (tracker != null) { + try { + tracker.close(); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } + } + } } diff --git a/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java b/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java index d6c03833..d610ff08 100644 --- a/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java @@ -51,4 +51,8 @@ public CompletableFuture sendBulkAsync( throw new UnsupportedOperationException(); } + @Override + public void close() { + // Do nothing + } } diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 4fd8bf9d..ee46c5c4 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-javax - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT jar Matomo Java Tracker Servlet Javax diff --git a/servlet-javax/src/test/java/org/matomo/java/tracking/MatomoTrackerFilterIT.java b/servlet-javax/src/test/java/org/matomo/java/tracking/MatomoTrackerFilterIT.java index 62979d9b..676524c2 100644 --- a/servlet-javax/src/test/java/org/matomo/java/tracking/MatomoTrackerFilterIT.java +++ b/servlet-javax/src/test/java/org/matomo/java/tracking/MatomoTrackerFilterIT.java @@ -58,6 +58,8 @@ void sendsAnAsyncRequestOnFilter() throws Exception { ); }); + tracker.close(); + } } \ No newline at end of file diff --git a/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java b/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java index d6c03833..4d155494 100644 --- a/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java @@ -51,4 +51,8 @@ public CompletableFuture sendBulkAsync( throw new UnsupportedOperationException(); } + @Override + public void close() { + // do nothing + } } diff --git a/spring/pom.xml b/spring/pom.xml index b1a3c1e6..eebbb0f3 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 24aeb628..a8fc3f93 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/test/src/main/java/org/matomo/java/tracking/test/BulkExample.java b/test/src/main/java/org/matomo/java/tracking/test/BulkExample.java index d674acf2..54f35f92 100644 --- a/test/src/main/java/org/matomo/java/tracking/test/BulkExample.java +++ b/test/src/main/java/org/matomo/java/tracking/test/BulkExample.java @@ -26,18 +26,20 @@ public static void main(String[] args) { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - VisitorId visitorId = VisitorId.fromString("customer@mail.com"); - tracker.sendBulkRequestAsync( - MatomoRequests.siteSearch("Running shoes", "Running", 120L) - .visitorId(visitorId).build(), - MatomoRequests.pageView("VelocityStride ProX Running Shoes") - .visitorId(visitorId).build(), - MatomoRequests.ecommerceOrder("QXZ-789LMP", 100.0, 124.0, 19.0, 10.0, 5.0) - .visitorId(visitorId) - .build() - ); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + VisitorId visitorId = VisitorId.fromString("customer@mail.com"); + tracker.sendBulkRequestAsync( + MatomoRequests.siteSearch("Running shoes", "Running", 120L) + .visitorId(visitorId).build(), + MatomoRequests.pageView("VelocityStride ProX Running Shoes") + .visitorId(visitorId).build(), + MatomoRequests.ecommerceOrder("QXZ-789LMP", 100.0, 124.0, 19.0, 10.0, 5.0) + .visitorId(visitorId) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } diff --git a/test/src/main/java/org/matomo/java/tracking/test/ConsumerExample.java b/test/src/main/java/org/matomo/java/tracking/test/ConsumerExample.java index 3c49b87a..6c37626a 100644 --- a/test/src/main/java/org/matomo/java/tracking/test/ConsumerExample.java +++ b/test/src/main/java/org/matomo/java/tracking/test/ConsumerExample.java @@ -27,19 +27,21 @@ public static void main(String[] args) { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - MatomoRequest request = MatomoRequests - .event("Training", "Workout completed", "Bench press", 60.0) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build(); - - tracker.sendRequestAsync(request) - .thenAccept(req -> System.out.printf("Sent request %s%n", req)) - .exceptionally(throwable -> { - System.err.printf("Failed to send request: %s%n", throwable.getMessage()); - return null; - }); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + MatomoRequest request = MatomoRequests + .event("Training", "Workout completed", "Bench press", 60.0) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build(); + + tracker.sendRequestAsync(request) + .thenAccept(req -> System.out.printf("Sent request %s%n", req)) + .exceptionally(throwable -> { + System.err.printf("Failed to send request: %s%n", throwable.getMessage()); + return null; + }); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } diff --git a/test/src/main/java/org/matomo/java/tracking/test/EcommerceExample.java b/test/src/main/java/org/matomo/java/tracking/test/EcommerceExample.java index 584aa32d..3f16258a 100644 --- a/test/src/main/java/org/matomo/java/tracking/test/EcommerceExample.java +++ b/test/src/main/java/org/matomo/java/tracking/test/EcommerceExample.java @@ -28,32 +28,34 @@ public static void main(String[] args) { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - tracker.sendBulkRequestAsync(MatomoRequests - .ecommerceCartUpdate(50.0) - .ecommerceItems(EcommerceItems - .builder() - .item(EcommerceItem - .builder() - .sku("XYZ12345") - .name("Matomo - The big book about web analytics") - .category("Education & Teaching") - .price(23.1) - .quantity(2) - .build()) - .item(EcommerceItem - .builder() - .sku("B0C2WV3MRJ") - .name("Matomo for data visualization") - .category("Education & Teaching") - .price(15.0) - .quantity(1) - .build()) - .build()) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build() - ); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + tracker.sendBulkRequestAsync(MatomoRequests + .ecommerceCartUpdate(50.0) + .ecommerceItems(EcommerceItems + .builder() + .item(EcommerceItem + .builder() + .sku("XYZ12345") + .name("Matomo - The big book about web analytics") + .category("Education & Teaching") + .price(23.1) + .quantity(2) + .build()) + .item(EcommerceItem + .builder() + .sku("B0C2WV3MRJ") + .name("Matomo for data visualization") + .category("Education & Teaching") + .price(15.0) + .quantity(1) + .build()) + .build()) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } diff --git a/test/src/main/java/org/matomo/java/tracking/test/MatomoTrackerTester.java b/test/src/main/java/org/matomo/java/tracking/test/MatomoTrackerTester.java index 8255d0ed..8532c370 100644 --- a/test/src/main/java/org/matomo/java/tracking/test/MatomoTrackerTester.java +++ b/test/src/main/java/org/matomo/java/tracking/test/MatomoTrackerTester.java @@ -25,7 +25,7 @@ import org.matomo.java.tracking.parameters.VisitorId; @Slf4j -class MatomoTrackerTester { +class MatomoTrackerTester implements AutoCloseable { private final MatomoTracker tracker; @@ -39,7 +39,7 @@ class MatomoTrackerTester { } } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { TrackerConfiguration configuration = TrackerConfiguration .builder() @@ -49,12 +49,12 @@ public static void main(String[] args) { .logFailedTracking(true) .build(); - MatomoTrackerTester matomoTrackerTester = new MatomoTrackerTester(configuration); - - matomoTrackerTester.sendRequestAsync(); - matomoTrackerTester.sendBulkRequestsAsync(); - matomoTrackerTester.sendRequest(); - matomoTrackerTester.sendBulkRequests(); + try (MatomoTrackerTester matomoTrackerTester = new MatomoTrackerTester(configuration)) { + matomoTrackerTester.sendRequestAsync(); + matomoTrackerTester.sendBulkRequestsAsync(); + matomoTrackerTester.sendRequest(); + matomoTrackerTester.sendBulkRequests(); + } } @@ -187,4 +187,9 @@ private MatomoRequest randomRequest() { .debug(true) .build(); } + + @Override + public void close() throws Exception { + tracker.close(); + } } diff --git a/test/src/main/java/org/matomo/java/tracking/test/SendExample.java b/test/src/main/java/org/matomo/java/tracking/test/SendExample.java index 1fe55b3e..d43bcfc3 100644 --- a/test/src/main/java/org/matomo/java/tracking/test/SendExample.java +++ b/test/src/main/java/org/matomo/java/tracking/test/SendExample.java @@ -26,13 +26,15 @@ public static void main(String[] args) { .logFailedTracking(true) .build(); - MatomoTracker tracker = new MatomoTracker(configuration); - - tracker.sendRequestAsync(MatomoRequests - .event("Training", "Workout completed", "Bench press", 60.0) - .visitorId(VisitorId.fromString("customer@mail.com")) - .build() - ); + try (MatomoTracker tracker = new MatomoTracker(configuration)) { + tracker.sendRequestAsync(MatomoRequests + .event("Training", "Workout completed", "Bench press", 60.0) + .visitorId(VisitorId.fromString("customer@mail.com")) + .build() + ); + } catch (Exception e) { + throw new RuntimeException("Could not close tracker", e); + } } } From 36324181fdeee88f503b09c5460920ae16d459e8 Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Sat, 9 Mar 2024 12:36:20 +0000 Subject: [PATCH 006/166] [ci skip] prepare release matomo-java-tracker-parent-3.3.0 --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index e7453fc2..46059efe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index 28779b26..ee15ed98 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml matomo-java-tracker-java11 - 3.3.0-SNAPSHOT + 3.3.0 jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index d7bf1a49..764363a9 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml matomo-java-tracker - 3.3.0-SNAPSHOT + 3.3.0 jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index 724fbfea..4b7daa10 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - HEAD + matomo-java-tracker-parent-3.3.0 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 0f96202e..1d56c33d 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml matomo-java-tracker-servlet-jakarta - 3.3.0-SNAPSHOT + 3.3.0 jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index ee46c5c4..9b3e33ec 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml matomo-java-tracker-servlet-javax - 3.3.0-SNAPSHOT + 3.3.0 jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index eebbb0f3..cb2ffbb6 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index a8fc3f93..f99f3e6c 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0-SNAPSHOT + 3.3.0 ../pom.xml From a10f2c421b0f855884e6a466b6556824c99b32b9 Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Sat, 9 Mar 2024 12:36:21 +0000 Subject: [PATCH 007/166] [ci skip] prepare for next development iteration --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 46059efe..092b2f28 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index ee15ed98..aceb475e 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml matomo-java-tracker-java11 - 3.3.0 + 3.3.1-SNAPSHOT jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index 764363a9..ae6d8733 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml matomo-java-tracker - 3.3.0 + 3.3.1-SNAPSHOT jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index 4b7daa10..db1ede34 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - matomo-java-tracker-parent-3.3.0 + HEAD diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 1d56c33d..59e0a18e 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-jakarta - 3.3.0 + 3.3.1-SNAPSHOT jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 9b3e33ec..9f0c5451 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-javax - 3.3.0 + 3.3.1-SNAPSHOT jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index cb2ffbb6..1f73d522 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index f99f3e6c..ef0874bf 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.0 + 3.3.1-SNAPSHOT ../pom.xml From 5d4e7201344af03c3796e6ac95e09670263e7bf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:17:36 +0100 Subject: [PATCH 008/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.1.0 to 3.2.0 (#217) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db1ede34..219c9a25 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.0 sign-artifacts From 87ecbe83a0bc785d277cc6311cc03733b19a4a92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:17:46 +0100 Subject: [PATCH 009/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.6 to 12.0.7 (#216) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 219c9a25..50e14916 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.6 + 12.0.7 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 59e0a18e..0b36cfcd 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.6 + 12.0.7 test diff --git a/test/pom.xml b/test/pom.xml index ef0874bf..687ce85c 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.6 + 12.0.7 From 1039bd3d465f2c76a2fd000c9733b35af5ff08ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:09:30 +0100 Subject: [PATCH 010/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.0 to 3.2.1 (#220) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50e14916..a67a4a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.0 + 3.2.1 sign-artifacts From 143520c0912b629763530b13dc825a95f175bb1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:09:39 +0100 Subject: [PATCH 011/166] build(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 (#219) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a67a4a8b..ae87df44 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 org.apache.maven.plugins From 75a499331ea1b076e413cac2e1748b07967c72c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:09:48 +0100 Subject: [PATCH 012/166] build(deps): bump org.owasp:dependency-check-maven from 9.0.9 to 9.0.10 (#218) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae87df44..194e346d 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 9.0.9 + 9.0.10 true From 964278f6edc115468044f2173b7ec6810bc3d98b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 23:42:38 +0100 Subject: [PATCH 013/166] build(deps): bump org.projectlombok:lombok from 1.18.30 to 1.18.32 (#222) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 194e346d..2d868210 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.8 1.8 ${project.build.outputDirectory}/delombok - 1.18.30 + 1.18.32 2.0.12 From 04b73e1f0c6fccab3c2721838c6ee393c636516d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 23:43:01 +0100 Subject: [PATCH 014/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.2.3 to 3.2.4 (#221) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 1f73d522..e0d3da50 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.2.3 + 3.2.4 From 5ace22cc53823ec2b704b2098733110805cceafc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:21:22 +0200 Subject: [PATCH 015/166] build(deps): bump org.owasp:dependency-check-maven from 9.0.10 to 9.1.0 (#225) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d868210..279c8483 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 9.0.10 + 9.1.0 true From 8c698401322a5dfbb89ef59a6a666a9d812e8088 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:21:38 +0200 Subject: [PATCH 016/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.1 to 3.2.2 (#224) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 279c8483..957681dd 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.1 + 3.2.2 sign-artifacts From 5583c7c3589084c256386c11cc5a0aee09103915 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:21:57 +0200 Subject: [PATCH 017/166] build(deps-dev): bump org.wiremock:wiremock from 3.4.2 to 3.5.2 (#223) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index aceb475e..22e009be 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.4.2 + 3.5.2 test From 1f84e3334a613eed289f956ce4285ae39885ebc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:06:51 +0200 Subject: [PATCH 018/166] build(deps): bump actions/configure-pages from 4 to 5 (#226) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 44316aef..dcad339d 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/configure-pages@v4 + - uses: actions/configure-pages@v5 - uses: actions/jekyll-build-pages@v1 with: source: ./ From 88ebabbfef4bbfae260a79cc61db0b780dca2230 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:07:22 +0200 Subject: [PATCH 019/166] build(deps): bump com.github.spotbugs:spotbugs-annotations from 4.8.3 to 4.8.4 (#230) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 957681dd..21a8a15d 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.3 + 4.8.4 provided From 9e74b386f1dddd518e59a88ae6fe4e92ea81cea5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:07:37 +0200 Subject: [PATCH 020/166] build(deps): bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#229) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21a8a15d..ad055e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From 528edb0903a313baf3e8f8c2b4970a56cc7762e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:07:55 +0200 Subject: [PATCH 021/166] build(deps): bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 (#228) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad055e1d..37b6a6a5 100644 --- a/pom.xml +++ b/pom.xml @@ -290,7 +290,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 prepare-agent From 1974fe00ccbc943761b993a2e2f1556b58c2889e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:10:26 +0200 Subject: [PATCH 022/166] build(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.0 (#231) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37b6a6a5..6ce2327d 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 org.apache.maven.plugins From c3b3146236a245c6f10864a921bf500e3b962523 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:10:47 +0200 Subject: [PATCH 023/166] build(deps): bump slf4j.version from 2.0.12 to 2.0.13 (#232) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ce2327d..414655da 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.8 ${project.build.outputDirectory}/delombok 1.18.32 - 2.0.12 + 2.0.13 From 20cf3ab29d4ff31f6244befc0f799f0da20f5c08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:11:01 +0200 Subject: [PATCH 024/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.2 to 3.2.3 (#233) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 414655da..1dc46c25 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.2 + 3.2.3 sign-artifacts From c79d837b282d6f83827ef9c696fbd04a89093afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:11:22 +0200 Subject: [PATCH 025/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.3.1 to 4.8.4.0 (#234) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1dc46c25..516531e2 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.3.1 + 4.8.4.0 org.owasp From 93d077dbe8c5f5b8b7dbb6ddb6d22479b9639078 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:27:23 +0200 Subject: [PATCH 026/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.7 to 12.0.8 (#227) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 516531e2..c7d3839e 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.7 + 12.0.8 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 0b36cfcd..de818e0a 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.7 + 12.0.8 test diff --git a/test/pom.xml b/test/pom.xml index 687ce85c..1ae6e78d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.7 + 12.0.8 From 6b72ca67c4dbfd23b30db1277cef6ac8b7573a8c Mon Sep 17 00:00:00 2001 From: Daniel Heid Date: Fri, 19 Apr 2024 19:57:28 +0200 Subject: [PATCH 027/166] Closes #235 Fix tracking parameter name for event value --- .../java/org/matomo/java/tracking/MatomoRequest.java | 2 +- .../org/matomo/java/tracking/QueryCreatorTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java b/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java index ea2ddbfc..d9349836 100644 --- a/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java +++ b/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java @@ -433,7 +433,7 @@ public class MatomoRequest { /** * Some numeric value that represents the event value. */ - @TrackingParameter(name = "e_n") + @TrackingParameter(name = "e_v") private Double eventValue; /** diff --git a/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java b/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java index 1b1cecd4..8611d106 100644 --- a/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java +++ b/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java @@ -538,4 +538,16 @@ void failsIfLongitudeIsGreaterThan180() { .hasRootCauseMessage("Invalid value for long. Must be less or equal than 180"); } + @Test + void tracksEvent() { + matomoRequestBuilder.eventName("Event Name") + .eventValue(23.456) + .eventAction("Event Action") + .eventCategory("Event Category"); + + whenCreatesQuery(); + + assertThat(query).isEqualTo("idsite=42&token_auth=876de1876fb2cda2816c362a61bfc712&rec=1&apiv=1&_id=112210f47de98115&e_c=Event+Category&e_a=Event+Action&e_n=Event+Name&e_v=23.456&send_image=0&rand=random-value"); + } + } From 2d5258a1df488c86987b49e2980a261162c4bbed Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Fri, 19 Apr 2024 18:10:54 +0000 Subject: [PATCH 028/166] [ci skip] prepare release matomo-java-tracker-parent-3.3.1 --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 092b2f28..8a81f824 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index 22e009be..c86981a8 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml matomo-java-tracker-java11 - 3.3.1-SNAPSHOT + 3.3.1 jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index ae6d8733..f2a05a41 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml matomo-java-tracker - 3.3.1-SNAPSHOT + 3.3.1 jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index c7d3839e..3d4e2611 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - HEAD + matomo-java-tracker-parent-3.3.1 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index de818e0a..1093e401 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml matomo-java-tracker-servlet-jakarta - 3.3.1-SNAPSHOT + 3.3.1 jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 9f0c5451..47b3d3dd 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml matomo-java-tracker-servlet-javax - 3.3.1-SNAPSHOT + 3.3.1 jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index e0d3da50..71f97a9d 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 1ae6e78d..14f31cbe 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1-SNAPSHOT + 3.3.1 ../pom.xml From 67c45e926f59cbc0bc5a9602ad758fe142e7cb20 Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Fri, 19 Apr 2024 18:10:55 +0000 Subject: [PATCH 029/166] [ci skip] prepare for next development iteration --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 8a81f824..07d3c099 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index c86981a8..de8a04fb 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml matomo-java-tracker-java11 - 3.3.1 + 3.3.2-SNAPSHOT jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index f2a05a41..96c05b2b 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml matomo-java-tracker - 3.3.1 + 3.3.2-SNAPSHOT jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index 3d4e2611..8a5b0cf6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - matomo-java-tracker-parent-3.3.1 + HEAD diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 1093e401..0679c2e9 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-jakarta - 3.3.1 + 3.3.2-SNAPSHOT jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 47b3d3dd..65511295 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-javax - 3.3.1 + 3.3.2-SNAPSHOT jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index 71f97a9d..89325afb 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 14f31cbe..72e713aa 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.1 + 3.3.2-SNAPSHOT ../pom.xml From c4f8b32ebe0c0d5653ab133e01214ccb498e342c Mon Sep 17 00:00:00 2001 From: Daniel Heid Date: Fri, 19 Apr 2024 20:17:18 +0200 Subject: [PATCH 030/166] #168 Remove synchronization on queries --- README.md | 31 ++++++++++------ core/pom.xml | 2 +- .../matomo/java/tracking/MatomoTracker.java | 25 ++++++------- .../java/org/matomo/java/tracking/Sender.java | 3 +- .../org/matomo/java/tracking/TestSender.java | 2 +- java11/pom.xml | 4 +-- .../matomo/java/tracking/Java11Sender.java | 2 +- java8/pom.xml | 4 +-- .../org/matomo/java/tracking/Java8Sender.java | 36 +++++++++---------- pom.xml | 2 +- servlet-jakarta/pom.xml | 4 +-- .../org/matomo/java/tracking/TestSender.java | 2 +- servlet-javax/pom.xml | 4 +-- .../org/matomo/java/tracking/TestSender.java | 2 +- spring/pom.xml | 2 +- test/pom.xml | 2 +- 16 files changed, 68 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index fe47114d..db941103 100644 --- a/README.md +++ b/README.md @@ -69,13 +69,22 @@ Projects that use Matomo Java Tracker: ## What Is New? +### Version 3.4.x + +We fixed a synchronization issue in the Java 8 sender (https://github.com/matomo-org/matomo-java-tracker/issues/168). +To consume the exact amount of space needed for the queries to send to Matomo, we need the collection size of the incoming +requests. So we changed `Iterable` to `Collection` in some `MatomoTracker`. This could affect users, that use parameters +of type `Iterable` in the tracker. Please use `Collection` instead. + +### Version 3.3.x + Do you still use Matomo Java Tracker 2.x? We created version 3, that is compatible with Matomo 4 and 5 and contains fewer dependencies. Release notes can be found here: https://github.com/matomo-org/matomo-java-tracker/releases Here are the most important changes: -* Matomo Java Tracker 3.3.0 is compatible with Matomo 4 and 5 +* Matomo Java Tracker 3.4.0 is compatible with Matomo 4 and 5 * less dependencies * new dimension parameter * special types allow to provide valid parameters now @@ -140,7 +149,7 @@ Add a dependency on Matomo Java Tracker using Maven. For Java 8: org.piwik.java.tracking matomo-java-tracker - 3.3.0 + 3.4.0 ``` @@ -151,7 +160,7 @@ For Java 11: org.piwik.java.tracking matomo-java-tracker-java11 - 3.3.0 + 3.4.0 ``` @@ -159,7 +168,7 @@ or Gradle (Java 8): ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker:3.3.0") + implementation("org.piwik.java.tracking:matomo-java-tracker:3.4.0") } ``` @@ -167,20 +176,20 @@ or Gradle (Java 11): ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.3.0") + implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.4.0") } ``` or Gradle with Kotlin DSL (Java 8) ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker:3.3.0") +implementation("org.piwik.java.tracking:matomo-java-tracker:3.4.0") ``` or Gradle with Kotlin DSL (Java 11) ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.3.0") +implementation("org.piwik.java.tracking:matomo-java-tracker-java11:3.4.0") ``` ### Spring Boot Module @@ -193,7 +202,7 @@ and allows you to configure the tracker via application properties. Add the foll org.piwik.java.tracking matomo-java-tracker-spring-boot-starter - 3.3.0 + 3.4.0 ``` @@ -201,14 +210,14 @@ or Gradle: ```groovy dependencies { - implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.3.0") + implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.4.0") } ``` or Gradle with Kotlin DSL ```kotlin -implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.3.0") +implementation("org.piwik.java.tracking:matomo-java-tracker-spring-boot-starter:3.4.0") ``` The following properties are supported: @@ -678,7 +687,7 @@ version can be used in your local Maven repository for testing purposes, e.g. org.piwik.java.tracking matomo-java-tracker - 3.3.1-SNAPSHOT + 3.4.1-SNAPSHOT ``` diff --git a/core/pom.xml b/core/pom.xml index 07d3c099..9455a6c0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java b/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java index 84c48271..3c38d017 100644 --- a/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java +++ b/core/src/main/java/org/matomo/java/tracking/MatomoTracker.java @@ -11,6 +11,7 @@ import java.net.URI; import java.time.Duration; import java.util.Arrays; +import java.util.Collection; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import java.util.function.Function; @@ -135,7 +136,7 @@ public MatomoTracker( * *

Use this method if you want to send a single request. If you want to send multiple requests at once, use * {@link #sendBulkRequest(Iterable)} instead. If you want to send multiple requests asynchronously, use - * {@link #sendRequestAsync(MatomoRequest)} or {@link #sendBulkRequestAsync(Iterable)} instead. + * {@link #sendRequestAsync(MatomoRequest)} or {@link #sendBulkRequestAsync(Collection)} instead. * * @param request request to send. must not be null */ @@ -160,7 +161,7 @@ private void initializeSender() { * Send a request asynchronously via HTTP GET. * *

Use this method if you want to send a single request. If you want to send multiple requests at once, use - * {@link #sendBulkRequestAsync(Iterable)} instead. If you want to send multiple requests synchronously, use + * {@link #sendBulkRequestAsync(Collection)} instead. If you want to send multiple requests synchronously, use * {@link #sendRequest(MatomoRequest)} or {@link #sendBulkRequest(Iterable)} instead. * * @param request request to send @@ -176,8 +177,8 @@ public CompletableFuture sendRequestAsync( * Send a request asynchronously via HTTP GET and specify a callback that gets executed when the response arrives. * *

Use this method if you want to send a single request. If you want to send multiple requests at once, use - * {@link #sendBulkRequestAsync(Iterable, Consumer)} instead. If you want to send multiple requests synchronously, use - * {@link #sendRequest(MatomoRequest)} or {@link #sendBulkRequest(Iterable)} instead. + * {@link #sendBulkRequestAsync(Collection, Consumer)} instead. If you want to send multiple requests synchronously, + * use {@link #sendRequest(MatomoRequest)} or {@link #sendBulkRequest(Iterable)} instead. * * @param request request to send * @param callback callback that gets executed when response arrives, must not be null @@ -223,7 +224,7 @@ private void applyGoalIdAndCheckSiteId( * *

More efficient than sending several individual requests. If you want to send a single request, use * {@link #sendRequest(MatomoRequest)} instead. If you want to send multiple requests asynchronously, use - * {@link #sendBulkRequestAsync(Iterable)} instead. + * {@link #sendBulkRequestAsync(Collection)} instead. * * @param requests the requests to send */ @@ -236,7 +237,7 @@ public void sendBulkRequest(MatomoRequest... requests) { * *

More efficient than sending several individual requests. If you want to send a single request, use * {@link #sendRequest(MatomoRequest)} instead. If you want to send multiple requests asynchronously, use - * {@link #sendBulkRequestAsync(Iterable)} instead. + * {@link #sendBulkRequestAsync(Collection)} instead. * * @param requests the requests to send */ @@ -250,7 +251,7 @@ public void sendBulkRequest(@NonNull Iterable requests) * *

Specify the AuthToken if parameters that require an auth token is used. If you want to send a single request, * use {@link #sendRequest(MatomoRequest)} instead. If you want to send multiple requests asynchronously, use - * {@link #sendBulkRequestAsync(Iterable)} instead. + * {@link #sendBulkRequestAsync(Collection)} instead. * * @param requests the requests to send * @param authToken specify if any of the parameters use require AuthToken, if null the default auth token from the @@ -293,7 +294,7 @@ public CompletableFuture sendBulkRequestAsync(MatomoRequest... requests) { * @return completable future to let you know when the request is done */ public CompletableFuture sendBulkRequestAsync( - @NonNull Iterable requests + @NonNull Collection requests ) { return sendBulkRequestAsync(requests, null, null); } @@ -313,7 +314,7 @@ public CompletableFuture sendBulkRequestAsync( */ @Deprecated public CompletableFuture sendBulkRequestAsync( - @NonNull Iterable requests, + @NonNull Collection requests, @Nullable String authToken, @Nullable Consumer callback ) { @@ -342,7 +343,7 @@ public CompletableFuture sendBulkRequestAsync( * @return completable future to let you know when the request is done */ public CompletableFuture sendBulkRequestAsync( - @NonNull Iterable requests, + @NonNull Collection requests, @Nullable Consumer callback ) { return sendBulkRequestAsync(requests, null, callback); @@ -357,10 +358,10 @@ public CompletableFuture sendBulkRequestAsync( * @param authToken specify if any of the parameters use require AuthToken, null allowed * @return completable future to let you know when the request is done * @deprecated Please set the auth token in the tracker configuration or the requests directly and use - * {@link #sendBulkRequestAsync(Iterable)} instead. + * {@link #sendBulkRequestAsync(Collection)} instead. */ public CompletableFuture sendBulkRequestAsync( - @NonNull Iterable requests, @Nullable String authToken + @NonNull Collection requests, @Nullable String authToken ) { return sendBulkRequestAsync(requests, authToken, null); } diff --git a/core/src/main/java/org/matomo/java/tracking/Sender.java b/core/src/main/java/org/matomo/java/tracking/Sender.java index a256335e..7b1df985 100644 --- a/core/src/main/java/org/matomo/java/tracking/Sender.java +++ b/core/src/main/java/org/matomo/java/tracking/Sender.java @@ -2,6 +2,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import java.util.Collection; import java.util.concurrent.CompletableFuture; interface Sender extends AutoCloseable { @@ -20,6 +21,6 @@ void sendBulk( @NonNull CompletableFuture sendBulkAsync( - @NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull Collection requests, @Nullable String overrideAuthToken ); } diff --git a/core/src/test/java/org/matomo/java/tracking/TestSender.java b/core/src/test/java/org/matomo/java/tracking/TestSender.java index 0342cf98..f000bc8d 100644 --- a/core/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/core/src/test/java/org/matomo/java/tracking/TestSender.java @@ -53,7 +53,7 @@ public void sendBulk( @NonNull @Override public CompletableFuture sendBulkAsync( - @NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull Collection requests, @Nullable String overrideAuthToken ) { for (MatomoRequest request : requests) { createQueryAndAddRequest(request, overrideAuthToken); diff --git a/java11/pom.xml b/java11/pom.xml index de8a04fb..def72bd4 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml matomo-java-tracker-java11 - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT jar Matomo Java Tracker Java 11 diff --git a/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java b/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java index 2cff400d..abb6181f 100644 --- a/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java +++ b/java11/src/main/java/org/matomo/java/tracking/Java11Sender.java @@ -115,7 +115,7 @@ private HttpRequest buildHttpPostRequest( @NonNull @Override public CompletableFuture sendBulkAsync( - @NonNull @lombok.NonNull Iterable requests, + @NonNull @lombok.NonNull Collection requests, @Nullable String overrideAuthToken ) { return sendAsyncAndCheckResponse(buildHttpPostRequest(requests, overrideAuthToken), null); diff --git a/java8/pom.xml b/java8/pom.xml index 96c05b2b..5c61634c 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml matomo-java-tracker - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT jar Matomo Java Tracker Java 8 diff --git a/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java b/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java index 849ccda1..9aca209c 100644 --- a/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java +++ b/java8/src/main/java/org/matomo/java/tracking/Java8Sender.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.CompletableFuture; @@ -60,7 +61,6 @@ class Java8Sender implements Sender { private final QueryCreator queryCreator; private final ExecutorService executorService; - private final Collection queries = new ArrayList<>(16); @Override @NonNull @@ -322,39 +322,37 @@ private static void preparePostConnection(HttpURLConnection connection) { @Override @NonNull public CompletableFuture sendBulkAsync( - @NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull Collection requests, @Nullable String overrideAuthToken ) { String authToken = AuthToken.determineAuthToken(overrideAuthToken, requests, trackerConfiguration); Map headers = new LinkedHashMap<>(); String headerUserAgent = findHeaderUserAgent(requests); String sessionId = findSessionId(requests); Map cookies = findCookies(requests); - synchronized (queries) { - for (MatomoRequest request : requests) { - RequestValidator.validate(request, authToken); - if (request.getHeaders() != null && !request.getHeaders().isEmpty()) { - headers.putAll(request.getHeaders()); - } - String query = queryCreator.createQuery(request, null); - queries.add(query); + List queries = new ArrayList<>(requests.size()); + for (MatomoRequest request : requests) { + RequestValidator.validate(request, authToken); + if (request.getHeaders() != null && !request.getHeaders().isEmpty()) { + headers.putAll(request.getHeaders()); } + queries.add(queryCreator.createQuery(request, null)); } return CompletableFuture.supplyAsync(() -> - sendBulkAsync(authToken, headers, headerUserAgent, sessionId, cookies), executorService); + sendBulkAsync(queries, authToken, headers, headerUserAgent, sessionId, cookies), + executorService); } @Nullable private Void sendBulkAsync( - @Nullable String authToken, Map headers, String headerUserAgent, String sessionId, + List queries, + @Nullable String authToken, + Map headers, + String headerUserAgent, + String sessionId, Map cookies ) { - synchronized (queries) { - if (!queries.isEmpty()) { - sendBulk(queries, authToken, headers, headerUserAgent, sessionId, cookies); - queries.clear(); - } - return null; - } + sendBulk(queries, authToken, headers, headerUserAgent, sessionId, cookies); + return null; } @Nullable diff --git a/pom.xml b/pom.xml index 8a5b0cf6..f868b1b8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT pom Matomo Java Tracker Parent diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 0679c2e9..0964d5a4 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-jakarta - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java b/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java index d610ff08..14f8cde6 100644 --- a/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/servlet-jakarta/src/test/java/org/matomo/java/tracking/TestSender.java @@ -46,7 +46,7 @@ public void sendBulk( @NonNull @Override public CompletableFuture sendBulkAsync( - @NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull Collection requests, @Nullable String overrideAuthToken ) { throw new UnsupportedOperationException(); } diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 65511295..0152f0d6 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-javax - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT jar Matomo Java Tracker Servlet Javax diff --git a/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java b/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java index 4d155494..0e1704f1 100644 --- a/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java +++ b/servlet-javax/src/test/java/org/matomo/java/tracking/TestSender.java @@ -46,7 +46,7 @@ public void sendBulk( @NonNull @Override public CompletableFuture sendBulkAsync( - @NonNull Iterable requests, @Nullable String overrideAuthToken + @NonNull Collection requests, @Nullable String overrideAuthToken ) { throw new UnsupportedOperationException(); } diff --git a/spring/pom.xml b/spring/pom.xml index 89325afb..9df6330a 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 72e713aa..a95ba3d8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.3.2-SNAPSHOT + 3.4.0-SNAPSHOT ../pom.xml From 2e12058400723df2d94db9fed06a3aa8315ba21f Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Fri, 19 Apr 2024 18:22:55 +0000 Subject: [PATCH 031/166] [ci skip] prepare release matomo-java-tracker-parent-3.4.0 --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 9455a6c0..0ab47efa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index def72bd4..0dbf947a 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml matomo-java-tracker-java11 - 3.4.0-SNAPSHOT + 3.4.0 jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index 5c61634c..9caeb73d 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml matomo-java-tracker - 3.4.0-SNAPSHOT + 3.4.0 jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index f868b1b8..be87655a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - HEAD + matomo-java-tracker-parent-3.4.0 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 0964d5a4..c30435e0 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml matomo-java-tracker-servlet-jakarta - 3.4.0-SNAPSHOT + 3.4.0 jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 0152f0d6..bd0ca43c 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml matomo-java-tracker-servlet-javax - 3.4.0-SNAPSHOT + 3.4.0 jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index 9df6330a..7b32cf60 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index a95ba3d8..4d473a99 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0-SNAPSHOT + 3.4.0 ../pom.xml From 5542c0fa4185fb6393aff3ecc16eb6a90bed71c1 Mon Sep 17 00:00:00 2001 From: Matomo Java Tracker Date: Fri, 19 Apr 2024 18:22:56 +0000 Subject: [PATCH 032/166] [ci skip] prepare for next development iteration --- core/pom.xml | 2 +- java11/pom.xml | 4 ++-- java8/pom.xml | 4 ++-- pom.xml | 4 ++-- servlet-jakarta/pom.xml | 4 ++-- servlet-javax/pom.xml | 4 ++-- spring/pom.xml | 2 +- test/pom.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0ab47efa..a716cbbb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml diff --git a/java11/pom.xml b/java11/pom.xml index 0dbf947a..60a579a9 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml matomo-java-tracker-java11 - 3.4.0 + 3.4.1-SNAPSHOT jar Matomo Java Tracker Java 11 diff --git a/java8/pom.xml b/java8/pom.xml index 9caeb73d..4b4621ad 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml matomo-java-tracker - 3.4.0 + 3.4.1-SNAPSHOT jar Matomo Java Tracker Java 8 diff --git a/pom.xml b/pom.xml index be87655a..d36bb830 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT pom Matomo Java Tracker Parent @@ -41,7 +41,7 @@ scm:git:https://@github.com/matomo-org/matomo-java-tracker.git scm:git:https://github.com/matomo-org/matomo-java-tracker.git https://github.com/matomo-org/matomo-java-tracker - matomo-java-tracker-parent-3.4.0 + HEAD diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index c30435e0..ae494787 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-jakarta - 3.4.0 + 3.4.1-SNAPSHOT jar Matomo Java Tracker Servlet Jakarta diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index bd0ca43c..498b8534 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -4,12 +4,12 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml matomo-java-tracker-servlet-javax - 3.4.0 + 3.4.1-SNAPSHOT jar Matomo Java Tracker Servlet Javax diff --git a/spring/pom.xml b/spring/pom.xml index 7b32cf60..23f42edd 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index 4d473a99..b90599d7 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ org.piwik.java.tracking matomo-java-tracker-parent - 3.4.0 + 3.4.1-SNAPSHOT ../pom.xml From d3c741e0db1d5f09f75d6cc2918bf89ec771d8e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:12:10 +0200 Subject: [PATCH 033/166] build(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.4.0 to 3.4.1 (#236) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d36bb830..7e3c8af3 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.0 + 3.4.1 org.apache.maven.plugins From e672646c6fce22dac8c792e82e0e6240062757ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:12:20 +0200 Subject: [PATCH 034/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.3 to 3.2.4 (#237) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e3c8af3..5bfe6013 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From 7a7c5a7db4d48a3ca7776cf33e67202f8c518ff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:12:37 +0200 Subject: [PATCH 035/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.2.4 to 3.2.5 (#238) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 23f42edd..e43588d2 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.2.4 + 3.2.5 From e81410c3025e4aa619a944f0db8f1b3f8e18bc90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:12:49 +0200 Subject: [PATCH 036/166] build(deps-dev): bump org.wiremock:wiremock from 3.5.2 to 3.5.3 (#239) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 60a579a9..2f133864 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.5.2 + 3.5.3 test From f1a2f0c2d29d92f92f965cda47ab7fd625cb824b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 23:25:22 +0200 Subject: [PATCH 037/166] build(deps-dev): bump org.wiremock:wiremock from 3.5.3 to 3.5.4 (#240) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 2f133864..829972f8 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.5.3 + 3.5.4 test From 80ce74627c069f013171908dfa58826da519f7ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 09:59:31 +0200 Subject: [PATCH 038/166] build(deps): bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2 (#242) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bfe6013..e415b4dd 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins From 0708b5b049a3afd8ad59acc50122784a9e2070cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 09:59:46 +0200 Subject: [PATCH 039/166] build(deps): bump org.apache.maven.plugins:maven-install-plugin from 3.1.1 to 3.1.2 (#241) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e415b4dd..cba12891 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins From 0b4c690fab7f914fa2111113251f44fdf31470a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 23:45:14 +0200 Subject: [PATCH 040/166] build(deps): bump com.github.spotbugs:spotbugs-annotations from 4.8.4 to 4.8.5 (#244) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cba12891..4cc5a809 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.4 + 4.8.5 provided From 30b601d6c84d7941f99c34bff973fb50f2b40547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 23:47:02 +0200 Subject: [PATCH 041/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.4.0 to 4.8.5.0 (#243) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4cc5a809..d5ff3a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.4.0 + 4.8.5.0 org.owasp From 441f4bdfd4daca5264a894b9561733735d0c8e7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 23:02:41 +0200 Subject: [PATCH 042/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.8 to 12.0.9 (#245) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d5ff3a7f..91c2cd95 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.8 + 12.0.9 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index ae494787..5d30951a 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.8 + 12.0.9 test diff --git a/test/pom.xml b/test/pom.xml index b90599d7..c99e6a1d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.8 + 12.0.9 From bb2d2e2de4b53d424242dcea1eeaa45151c4aa81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 00:27:35 +0200 Subject: [PATCH 043/166] build(deps): bump org.owasp:dependency-check-maven from 9.1.0 to 9.2.0 (#247) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91c2cd95..77461595 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 9.1.0 + 9.2.0 true From 23e70abab94bd97ea137fab67785519eb7978604 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 00:28:27 +0200 Subject: [PATCH 044/166] build(deps-dev): bump org.eclipse.jetty:jetty-servlet from 10.0.20 to 10.0.21 (#246) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-javax/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 498b8534..e6e5ba7b 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 test From c85017060b4adaf82e5a6157e60fa767e5845b5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 06:32:17 +0200 Subject: [PATCH 045/166] build(deps): bump org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.13 to 1.7.0 (#251) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77461595..859cfe87 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh From 49671c2992aa3e77123723f15b705696c25df6f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 06:32:31 +0200 Subject: [PATCH 046/166] build(deps): bump org.assertj:assertj-core from 3.25.3 to 3.26.0 (#249) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 859cfe87..841487f1 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.25.3 + 3.26.0 test From ce0cb550b31a1d171b6dda39f2f7d806b33ac48f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 06:32:42 +0200 Subject: [PATCH 047/166] build(deps-dev): bump org.wiremock:wiremock from 3.5.4 to 3.6.0 (#248) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 829972f8..9981a3dc 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.5.4 + 3.6.0 test From ffc4f46a1b5918f643abe591dc27d19e7ea26a23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 06:33:03 +0200 Subject: [PATCH 048/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.2.5 to 3.3.0 (#250) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index e43588d2..20002f18 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.2.5 + 3.3.0 From 39b64013a2f6fc57107714b7361e49f26819b06b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:16:41 +0200 Subject: [PATCH 049/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.9 to 12.0.10 (#254) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 841487f1..60c47977 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 5d30951a..e3b6698d 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 test diff --git a/test/pom.xml b/test/pom.xml index c99e6a1d..0b20fdc6 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 From cc19fe5c410e75efb0cbd7ee7779aff2ba546ca5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:17:16 +0200 Subject: [PATCH 050/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#252) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60c47977..bd9894ad 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 ${delombok.output} none From 2b5256fa9830679641886027a07a0edfb5c96b6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:17:27 +0200 Subject: [PATCH 051/166] build(deps): bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#253) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd9894ad..83c03eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 enforce-maven From 3003c5183a5e29414248387ca2bfc6c6a19b545a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:19:11 +0200 Subject: [PATCH 052/166] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.3.1 to 3.4.0 (#255) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83c03eaf..3b942b84 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 + 3.4.0 warning checkstyle.xml From 20e38fd170acc6415c3e07854a29fc8ed9bfa3e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 00:11:38 +0200 Subject: [PATCH 053/166] build(deps): bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0 (#259) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index e3b6698d..bcb02355 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -29,7 +29,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 provided From aab6b1e9eb856e3620a8cb5a8f138a6ef898592f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 00:11:47 +0200 Subject: [PATCH 054/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0 (#258) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b942b84..88c1ff59 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 org.apache.maven.plugins From 300d86a5eeb68a811a76205b749b95c58814a9bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 00:11:57 +0200 Subject: [PATCH 055/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.3.0 (#257) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88c1ff59..1db0d4df 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.3.0 From f59f11440cc8d940d14cbc8e7e0fcea38d151456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 00:12:08 +0200 Subject: [PATCH 056/166] build(deps): bump org.apache.maven.plugins:maven-release-plugin from 3.0.1 to 3.1.0 (#256) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1db0d4df..7b99f164 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.1 + 3.1.0 true false From 33a785389f429805dfdd8b142a8d93386ee8591a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:32:59 +0200 Subject: [PATCH 057/166] build(deps): bump com.github.spotbugs:spotbugs-annotations from 4.8.5 to 4.8.6 (#264) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b99f164..98a478d9 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.5 + 4.8.6 provided From d74ca2dd25e64aa802c88f6deb71865c9017ad1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:33:09 +0200 Subject: [PATCH 058/166] build(deps): bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#263) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98a478d9..174bc31a 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 org.apache.maven.plugins From 0097aaa4e74388d1707217d4e2f3f62412ceb4aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:33:17 +0200 Subject: [PATCH 059/166] build(deps): bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0 (#262) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 174bc31a..e9e9311b 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins From c8d0af3a643f4229a96949c6f9354aaecb4c820b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:33:25 +0200 Subject: [PATCH 060/166] build(deps-dev): bump org.wiremock:wiremock from 3.6.0 to 3.7.0 (#261) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 9981a3dc..c53706e7 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.6.0 + 3.7.0 test From b28a6ffd21090b142edc0d5918755bcdf4a019f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:54:32 +0200 Subject: [PATCH 061/166] build(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.5.0 to 3.6.0 (#260) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9e9311b..6c90df9b 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins From bf7cf45415898d09ebb4678eba420c81adbeef1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:37:22 +0200 Subject: [PATCH 062/166] build(deps-dev): bump org.wiremock:wiremock from 3.7.0 to 3.8.0 (#266) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index c53706e7..70eff122 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.7.0 + 3.8.0 test From 02c9fc28bbefa705daee1b64d30bbe87564a139f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:37:33 +0200 Subject: [PATCH 063/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.5.0 to 4.8.6.2 (#269) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c90df9b..48a6cc4f 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.5.0 + 4.8.6.2 org.owasp From 4763ecb76875be04fa49250fa233097fbe5b57fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:37:41 +0200 Subject: [PATCH 064/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.10.2 to 5.10.3 (#268) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48a6cc4f..41736394 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.10.2 + 5.10.3 test From 162f7e910584cfc166e193fa23020720f4092bf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:37:50 +0200 Subject: [PATCH 065/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.0 to 3.3.1 (#267) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 20002f18..69b99615 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.0 + 3.3.1 From cfae546fc5e131734c8afa485787029537ca78b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 23:38:00 +0200 Subject: [PATCH 066/166] build(deps-dev): bump org.eclipse.jetty:jetty-servlet from 10.0.21 to 10.0.22 (#265) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-javax/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index e6e5ba7b..52e05711 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 10.0.21 + 10.0.22 test From 8a185fa348aeb07d6a90675c5750b080a565b6c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:44:24 +0200 Subject: [PATCH 067/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.10 to 12.0.11 (#274) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 41736394..ee1e7b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.11 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index bcb02355..e574ddf1 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.11 test diff --git a/test/pom.xml b/test/pom.xml index 0b20fdc6..df1068db 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.11 From 8dff063a5ce280269eae081e1f6df20c0bcee606 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:55:24 +0200 Subject: [PATCH 068/166] build(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.6.0 to 3.6.2 (#273) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee1e7b2b..2aefdc40 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.0 + 3.6.2 org.apache.maven.plugins From 7ac5a39acdcc4ffc15f016325e98af82bb99c22f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:55:35 +0200 Subject: [PATCH 069/166] build(deps): bump org.apache.maven.plugins:maven-release-plugin from 3.1.0 to 3.1.1 (#272) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2aefdc40..950ecd84 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.0 + 3.1.1 true false From aeb1b4e5300686b73d7dde21ecdf7398f176bb27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:55:43 +0200 Subject: [PATCH 070/166] build(deps): bump org.projectlombok:lombok from 1.18.32 to 1.18.34 (#271) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 950ecd84..c7a72ca1 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.8 1.8 ${project.build.outputDirectory}/delombok - 1.18.32 + 1.18.34 2.0.13 From af7d90b39f04abdfbcc81ef67d6088ff9236db75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 23:55:59 +0200 Subject: [PATCH 071/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1 (#270) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7a72ca1..ab8e401e 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins From 8d239b6d8f10d8864f358634384b5c036a9f05d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:17:43 +0200 Subject: [PATCH 072/166] build(deps): bump org.assertj:assertj-core from 3.26.0 to 3.26.3 (#279) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab8e401e..d3e59107 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 test From 93ae170d62ea918414ebcf55bb40db0f0a3efe64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:06 +0200 Subject: [PATCH 073/166] build(deps): bump org.owasp:dependency-check-maven from 9.2.0 to 10.0.3 (#278) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3e59107..37ab1cde 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 9.2.0 + 10.0.3 true From 558b2e0fcc9008b3b4dbaeee9750008ac7cab439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:16 +0200 Subject: [PATCH 074/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.7.0 to 3.8.0 (#277) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37ab1cde..75d84ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 ${delombok.output} none From a005f04b572500e000984d1ef49ef32015ac65c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:27 +0200 Subject: [PATCH 075/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.1 to 3.3.2 (#276) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 69b99615..b0626dc8 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.1 + 3.3.2 From 187d745f1e9267516d4c5955d33d7d54d93d22cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:21:36 +0200 Subject: [PATCH 076/166] build(deps-dev): bump org.wiremock:wiremock from 3.8.0 to 3.9.0 (#275) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 70eff122..3f60cf5f 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.8.0 + 3.9.0 test From 771e679e58d804778d9aba04efee25af63c3a868 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:55:16 +0200 Subject: [PATCH 077/166] build(deps-dev): bump org.wiremock:wiremock from 3.9.0 to 3.9.1 (#281) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 3f60cf5f..d05e8443 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.9.0 + 3.9.1 test From 3a1bf69844395ec483152fb1084aec96191bb90b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:55:27 +0200 Subject: [PATCH 078/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.0 to 3.3.1 (#280) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75d84ca3..76983919 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.0 + 3.3.1 From d02047fdf5047576b60d3fcee113b63bfc49a57e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 23:38:55 +0200 Subject: [PATCH 079/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.11 to 12.0.12 (#282) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 76983919..967941f0 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.11 + 12.0.12 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index e574ddf1..a3dd22ea 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.11 + 12.0.12 test diff --git a/test/pom.xml b/test/pom.xml index df1068db..5430caf2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.11 + 12.0.12 From eabce239df7225f24013e43a085116d7f255c25a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:02:35 +0200 Subject: [PATCH 080/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.4 to 3.2.5 (#284) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 967941f0..c65b3b42 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.5 sign-artifacts From 15e7bab95e65c3d820f55cf71220f3f4116559f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:02:51 +0200 Subject: [PATCH 081/166] build(deps): bump slf4j.version from 2.0.13 to 2.0.16 (#283) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c65b3b42..c266a36c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.8 ${project.build.outputDirectory}/delombok 1.18.34 - 2.0.13 + 2.0.16 From c3fccea2487341eb74473630ea3c439f938cc54a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:04:36 +0200 Subject: [PATCH 082/166] build(deps): bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.2 to 3.1.3 (#289) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c266a36c..9b3b46d4 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From 06249e9cc841924298aa8c99e603dd77498ac497 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:04:45 +0200 Subject: [PATCH 083/166] build(deps): bump org.apache.maven.plugins:maven-install-plugin from 3.1.2 to 3.1.3 (#288) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b3b46d4..d6d69fa3 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins From 1c4c10e90ca05feb06ee7fe65ea2d9056b8db09f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:04:54 +0200 Subject: [PATCH 084/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.1 to 3.4.0 (#287) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6d69fa3..f92cf9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.1 + 3.4.0 org.apache.maven.plugins From df06d271a68309bf9479a86b305a40ccccf5acb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:05:02 +0200 Subject: [PATCH 085/166] build(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 (#286) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f92cf9fa..c6e4de01 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.20.0 org.apache.maven.plugins From 6e2d7c221e4c74d070053b8f2826089b33276477 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:05:10 +0200 Subject: [PATCH 086/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.4.0 (#285) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6e4de01..4d7d04fc 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.3.1 + 3.4.0 From b060dc265bc35e09eeb5fd4afdefeb2e84c24fad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:13:12 +0200 Subject: [PATCH 087/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.2 to 3.3.3 (#294) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index b0626dc8..6b3567e3 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.2 + 3.3.3 From 66e7e1c04543c2520e44f01c9417f3bf990c7a7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:13:22 +0200 Subject: [PATCH 088/166] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.4.0 to 3.5.0 (#292) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d7d04fc..f8967970 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + 3.5.0 warning checkstyle.xml From be2883d30a9def19b0c9cd8f4daa971cac7bef3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:13:29 +0200 Subject: [PATCH 089/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.10.3 to 5.11.0 (#291) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8967970..adc08d17 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.10.3 + 5.11.0 test From 61f255d2f05af2152ab7045e4f26c6d381a14646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:13:33 +0200 Subject: [PATCH 090/166] build(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.6.2 to 3.7.0 (#290) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adc08d17..bf9b9d67 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.2 + 3.7.0 org.apache.maven.plugins From afe60198c6d03c290d7e87221f3b9d3e51dc4448 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:13:45 +0200 Subject: [PATCH 091/166] build(deps-dev): bump org.eclipse.jetty:jetty-servlet from 10.0.22 to 10.0.23 (#293) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-javax/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 52e05711..ab084815 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 10.0.22 + 10.0.23 test From 2ae527eaf204737732aaee05f486f04c594961de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:36:39 +0200 Subject: [PATCH 092/166] build(deps): bump org.owasp:dependency-check-maven from 10.0.3 to 10.0.4 (#296) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf9b9d67..0d18efdb 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 10.0.3 + 10.0.4 true From 2852de78a1746c43a5e9c65257f774fa0a937fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:36:49 +0200 Subject: [PATCH 093/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.0 (#298) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d18efdb..579d4aef 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 ${delombok.output} none From 4639459a84df1fcef5beffb155451fd71d2bf8c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:36:55 +0200 Subject: [PATCH 094/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.4.0 to 3.5.0 (#297) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 579d4aef..0945c228 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.4.0 + 3.5.0 org.apache.maven.plugins From 065ebfd8a42708784f0e715a9cdd0cc2980e09d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:37:03 +0200 Subject: [PATCH 095/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.4.0 to 3.5.0 (#295) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0945c228..c18d3836 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.4.0 + 3.5.0 From 95559149836bc53e6074494eba74060c804b792c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 00:41:28 +0200 Subject: [PATCH 096/166] build(deps): bump madrapps/jacoco-report from 1.6.1 to 1.7.0 (#299) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c79ce42..886981a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: distribution: 'temurin' cache: maven - run: mvn -B verify - - uses: madrapps/jacoco-report@v1.6.1 + - uses: madrapps/jacoco-report@v1.7.0 with: paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} From 830fb665c2b30e81a6b4929b939d178939f1fed7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 06:24:18 +0200 Subject: [PATCH 097/166] build(deps-dev): bump org.eclipse.jetty:jetty-servlet from 10.0.23 to 10.0.24 (#302) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-javax/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index ab084815..7e76f0a5 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 10.0.23 + 10.0.24 test From d169f29015dde31a4e938a77c80f926d5a62cb66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 06:34:49 +0200 Subject: [PATCH 098/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.2 to 4.8.6.3 (#301) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c18d3836..46de61ec 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.2 + 4.8.6.3 org.owasp From f9584f74b1b8ebe88735869b049718ae0c814f27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 06:34:57 +0200 Subject: [PATCH 099/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.12 to 12.0.13 (#300) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 46de61ec..ea52fe94 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.12 + 12.0.13 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index a3dd22ea..95ad6f16 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.12 + 12.0.13 test diff --git a/test/pom.xml b/test/pom.xml index 5430caf2..41239feb 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.12 + 12.0.13 From eaf21e77bb0f19f2adb08b57300644528977595c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:44:15 +0200 Subject: [PATCH 100/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.5 to 3.2.6 (#304) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea52fe94..d77f79fb 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.6 sign-artifacts From fe522f147d635cc0876562fa488b60461e99bbbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:44:26 +0200 Subject: [PATCH 101/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.3 to 3.3.4 (#306) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 6b3567e3..d90e1b1e 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.3 + 3.3.4 From a1b912f4d6787fe187f505f56730a5d486b2a947 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:44:39 +0200 Subject: [PATCH 102/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.3 to 4.8.6.4 (#305) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d77f79fb..59559d15 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.3 + 4.8.6.4 org.owasp From 845ec3545530f2987ec647dd00cd2bc3a23cefab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:44:50 +0200 Subject: [PATCH 103/166] build(deps): bump madrapps/jacoco-report from 1.7.0 to 1.7.1 (#303) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 886981a6..75e2ff95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: distribution: 'temurin' cache: maven - run: mvn -B verify - - uses: madrapps/jacoco-report@v1.7.0 + - uses: madrapps/jacoco-report@v1.7.1 with: paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} From 31ab1266cad2c40afab9a0b3ee4932c23708418a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 23:32:09 +0200 Subject: [PATCH 104/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.6 to 3.2.7 (#308) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59559d15..a65589e6 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.6 + 3.2.7 sign-artifacts From 21bfd23f1b160463579d6601c9822578dc643536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 23:32:19 +0200 Subject: [PATCH 105/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.0 to 5.11.1 (#307) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a65589e6..0c4f49f2 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test From ee2529a502ddb66d75aeaae3bbbaf0811ab9172d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:07:53 +0200 Subject: [PATCH 106/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.1 to 5.11.2 (#313) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c4f49f2..d35b5233 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.11.1 + 5.11.2 test From abc38e8d915bd1e8dd27b6319bdd5ccf44f7c773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:08:00 +0200 Subject: [PATCH 107/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.13 to 12.0.14 (#311) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d35b5233..1640bcd4 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 95ad6f16..b3062ba0 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 test diff --git a/test/pom.xml b/test/pom.xml index 41239feb..235f918f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 From dc10652a14482e1b0377408d226367d77e08d434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:08:06 +0200 Subject: [PATCH 108/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 (#310) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1640bcd4..273d9147 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 ${delombok.output} none From 9d6b0e0b387311558f8ef35ea7c3168ad3c8ac0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:08:14 +0200 Subject: [PATCH 109/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.0 to 3.5.1 (#309) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 273d9147..e2b8fc46 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.0 + 3.5.1 From f2e2da3d843569f4e21fee1190b7e374051b0feb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:09:28 +0200 Subject: [PATCH 110/166] build(deps-dev): bump org.eclipse.jetty:jetty-servlet from 10.0.24 to 11.0.0 (#312) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- servlet-javax/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 7e76f0a5..26c169b5 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 10.0.24 + 11.0.0 test From 91c3ffd937a3086e5b6caa9c87458984fa8d51fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 23:25:27 +0200 Subject: [PATCH 111/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1 (#314) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2b8fc46..ae932085 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 org.apache.maven.plugins From b9a9ee84245b2c4d33222f84daae2b07949f8f73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 23:23:48 +0200 Subject: [PATCH 112/166] build(deps): bump org.apache.maven.plugins:maven-project-info-reports-plugin from 3.7.0 to 3.8.0 (#317) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae932085..f7b3bedd 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.7.0 + 3.8.0 org.apache.maven.plugins From cf988b3dce976d55810a8e98624cf7e657a15d2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 23:23:57 +0200 Subject: [PATCH 113/166] build(deps): bump org.owasp:dependency-check-maven from 10.0.4 to 11.0.0 (#316) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7b3bedd..9207b725 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 10.0.4 + 11.0.0 true From 7546123f01c5b2fca3472f804dd61343b69acd44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 23:24:05 +0200 Subject: [PATCH 114/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.2 to 5.11.3 (#315) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9207b725..22b2b8cc 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.11.2 + 5.11.3 test From 531c7406bd0e3813983185cd128fa66ae6a75f61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:36:00 +0100 Subject: [PATCH 115/166] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.5.0 to 3.6.0 (#322) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22b2b8cc..16ac252b 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.5.0 + 3.6.0 warning checkstyle.xml From 2f3e42a92a85d8b185fd88e6df4f635c3c9cd138 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:36:10 +0100 Subject: [PATCH 116/166] build(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.20.0 to 3.21.0 (#321) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16ac252b..3acbdd9f 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-site-plugin - 3.20.0 + 3.21.0 org.apache.maven.plugins From a47e6b2b44f23a657c6682003e36f4ec68a1e86d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:36:20 +0100 Subject: [PATCH 117/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.4 to 3.3.5 (#320) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index d90e1b1e..c8ea6e21 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.4 + 3.3.5 From 96cb800ddcfe4e239b3f0f23aab4af9e7d7e0dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:36:27 +0100 Subject: [PATCH 118/166] build(deps-dev): bump org.wiremock:wiremock from 3.9.1 to 3.9.2 (#319) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index d05e8443..cf9708fc 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.9.1 + 3.9.2 test From 2d37ea4661ca6759a02f53b9a4856dd7d10a5bf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:36:35 +0100 Subject: [PATCH 119/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.4 to 4.8.6.5 (#318) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3acbdd9f..836746e1 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.4 + 4.8.6.5 org.owasp From 41ceb027f299d45fa62f9ad0399c63a3036efa8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:22:59 +0100 Subject: [PATCH 120/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.1 to 3.5.2 (#326) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 836746e1..94c1a150 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.1 + 3.5.2 From 7686dc31053244aff6cae14f630dc06cc17c0095 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:23:05 +0100 Subject: [PATCH 121/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#325) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94c1a150..defaf7d4 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 ${delombok.output} none From 17922a22266f3538d6495f81d9d33d3a3a34e444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:23:13 +0100 Subject: [PATCH 122/166] build(deps): bump org.owasp:dependency-check-maven from 11.0.0 to 11.1.0 (#324) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index defaf7d4..6ab40282 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 11.0.0 + 11.1.0 true From 5d715e53658c3088e55de63710649008d4281e56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:23:19 +0100 Subject: [PATCH 123/166] build(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 (#323) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ab40282..5d808e45 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.1 + 3.5.2 org.apache.maven.plugins From 5e4b0de0f7de4f945f393913b627e376d6b5b343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 23:31:20 +0100 Subject: [PATCH 124/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.14 to 12.0.15 (#327) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5d808e45..75fa8bc2 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index b3062ba0..1e641606 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 test diff --git a/test/pom.xml b/test/pom.xml index 235f918f..84d56aa2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 From b13f9ae8a62137e0fbe2c86e94be24335ea28fa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:08:57 +0100 Subject: [PATCH 125/166] build(deps): bump org.projectlombok:lombok from 1.18.34 to 1.18.36 (#329) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75fa8bc2..03b4c6ac 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 1.8 1.8 ${project.build.outputDirectory}/delombok - 1.18.34 + 1.18.36 2.0.16 From 8baba81240c829ab096faf370064d8719202753a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 23:09:11 +0100 Subject: [PATCH 126/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.5 to 4.8.6.6 (#328) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03b4c6ac..792cc063 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.5 + 4.8.6.6 org.owasp From b681f17aba9ff16e752e6e4507c962e7fcf58e8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:44:59 +0100 Subject: [PATCH 127/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.5 to 3.4.0 (#330) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index c8ea6e21..733ff5b3 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.3.5 + 3.4.0 From a9792131b15eb8b3cf6937e8a4aa5d909e7062d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 23:07:33 +0100 Subject: [PATCH 128/166] build(deps-dev): bump org.wiremock:wiremock from 3.9.2 to 3.10.0 (#331) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index cf9708fc..35245095 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.9.2 + 3.10.0 test From 56a1c0d522cc86ac62b6ace3990e2e9ce8aaf4a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:21:49 +0100 Subject: [PATCH 129/166] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 (#333) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 792cc063..ef9e164f 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 ${delombok.output} none From ee9454a4e0cd9e1935b62765dd39c61e0a067e15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:22:34 +0100 Subject: [PATCH 130/166] build(deps): bump org.owasp:dependency-check-maven from 11.1.0 to 11.1.1 (#332) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef9e164f..b06bc7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 11.1.0 + 11.1.1 true From 98f87436b4ab1b9092ca52b6e5cd18af21d2da07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 22:13:45 +0100 Subject: [PATCH 131/166] build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.3 to 5.11.4 (#335) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b06bc7ba..9f238bca 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ org.junit.jupiter junit-jupiter - 5.11.3 + 5.11.4 test From 8779d8c0c54729db06534f4c525a175e29e77715 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 22:17:56 +0100 Subject: [PATCH 132/166] build(deps-dev): bump org.eclipse.jetty.ee10:jetty-ee10-servlet from 12.0.15 to 12.0.16 (#334) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- servlet-jakarta/pom.xml | 2 +- test/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9f238bca..62f632b2 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 diff --git a/servlet-jakarta/pom.xml b/servlet-jakarta/pom.xml index 1e641606..0c31328f 100644 --- a/servlet-jakarta/pom.xml +++ b/servlet-jakarta/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 test diff --git a/test/pom.xml b/test/pom.xml index 84d56aa2..7a2eb183 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -46,7 +46,7 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 From 34e42cd6f93a1d6b333b8c7fe15976c32840aa76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:24:45 +0100 Subject: [PATCH 133/166] build(deps): bump org.assertj:assertj-core from 3.26.3 to 3.27.0 (#336) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62f632b2..fee95c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.26.3 + 3.27.0 test From b2ba92630668b64cd8ac48310feea86ad3bd8a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:25:19 +0100 Subject: [PATCH 134/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.4.0 to 3.4.1 (#337) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index 733ff5b3..f94a448e 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.4.0 + 3.4.1 From 70e3c6fe2365479b48d9c2b0e47c75ed30c1687e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 23:29:24 +0100 Subject: [PATCH 135/166] build(deps): bump org.assertj:assertj-core from 3.27.0 to 3.27.2 (#338) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fee95c2f..378c5981 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.27.0 + 3.27.2 test From 6b2e9564d86a4c57e79e6f96e4d54bee173d8b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:56:05 +0100 Subject: [PATCH 136/166] build(deps): bump scacap/action-surefire-report from 1.8.0 to 1.9.0 (#339) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75e2ff95..607838f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} min-coverage-overall: 80 min-coverage-changed-files: 80 - - uses: scacap/action-surefire-report@v1.8.0 \ No newline at end of file + - uses: scacap/action-surefire-report@v1.9.0 \ No newline at end of file From 42bf987fc404994335c156543b52d8596e7729ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 23:00:43 +0100 Subject: [PATCH 137/166] build(deps): bump org.owasp:dependency-check-maven from 11.1.1 to 12.0.0 (#340) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 378c5981..c531dd29 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 11.1.1 + 12.0.0 true From 2fc21c4c6f64ab78430aa486a4264a1d749cf746 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 22:14:43 +0100 Subject: [PATCH 138/166] build(deps): bump org.assertj:assertj-core from 3.27.2 to 3.27.3 (#343) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c531dd29..3b967745 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.27.2 + 3.27.3 test From 9052afd0efb1b7cdc538c17040adc3024b3b14ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 22:15:01 +0100 Subject: [PATCH 139/166] build(deps): bump org.owasp:dependency-check-maven from 12.0.0 to 12.0.1 (#342) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b967745..8d0d6c85 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 12.0.0 + 12.0.1 true From 4e472459623ef126e43924848501686c32e6d493 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 22:15:11 +0100 Subject: [PATCH 140/166] build(deps): bump com.github.spotbugs:spotbugs-annotations from 4.8.6 to 4.9.0 (#341) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d0d6c85..52897e7e 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.github.spotbugs spotbugs-annotations - 4.8.6 + 4.9.0 provided From e5808ec0a71c1180c2aa720286fff319e2fdba52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:05:05 +0100 Subject: [PATCH 141/166] build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.4.1 to 3.4.2 (#344) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring/pom.xml b/spring/pom.xml index f94a448e..c55f8c43 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -17,7 +17,7 @@ 17 17 - 3.4.1 + 3.4.2 From c276d202459a0438533e106e22397fbedee1bcb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 22:04:21 +0100 Subject: [PATCH 142/166] build(deps-dev): bump org.wiremock:wiremock from 3.10.0 to 3.11.0 (#346) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 35245095..677f0c18 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.10.0 + 3.11.0 test From 8dee99e6eddec1f89d0414924c58db8efc43a4e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 22:04:37 +0100 Subject: [PATCH 143/166] build(deps): bump org.owasp:dependency-check-maven from 12.0.1 to 12.0.2 (#345) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52897e7e..d28931b9 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 12.0.1 + 12.0.2 true From 57e40d5b0c4114e4a4531da2b53e490e2eaa19db Mon Sep 17 00:00:00 2001 From: Alex Imenes <132364326+aleximenes@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:36:35 +0100 Subject: [PATCH 144/166] Allow zero as value to certain tracking parameters (#362) --- .../matomo/java/tracking/MatomoRequest.java | 12 ++--- .../java/tracking/QueryCreatorTest.java | 53 ++++++++++++++++++- servlet-javax/pom.xml | 2 +- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java b/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java index d9349836..42ef0c29 100644 --- a/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java +++ b/core/src/main/java/org/matomo/java/tracking/MatomoRequest.java @@ -355,7 +355,7 @@ public class MatomoRequest { /** * The grand total for the ecommerce order (required when tracking an ecommerce order). */ - @TrackingParameter(name = "revenue") + @TrackingParameter(name = "revenue", min = 0) private Double ecommerceRevenue; /** @@ -433,7 +433,7 @@ public class MatomoRequest { /** * Some numeric value that represents the event value. */ - @TrackingParameter(name = "e_v") + @TrackingParameter(name = "e_v", min = 0) private Double eventValue; /** @@ -476,25 +476,25 @@ public class MatomoRequest { /** * The subtotal of the order; excludes shipping. */ - @TrackingParameter(name = "ec_st") + @TrackingParameter(name = "ec_st", min = 0) private Double ecommerceSubtotal; /** * Tax amount of the order. */ - @TrackingParameter(name = "ec_tx") + @TrackingParameter(name = "ec_tx", min = 0) private Double ecommerceTax; /** * Shipping cost of the order. */ - @TrackingParameter(name = "ec_sh") + @TrackingParameter(name = "ec_sh", min = 0) private Double ecommerceShippingCost; /** * Discount offered. */ - @TrackingParameter(name = "ec_dt") + @TrackingParameter(name = "ec_dt", min = 0) private Double ecommerceDiscount; /** diff --git a/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java b/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java index 8611d106..a4e87e5b 100644 --- a/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java +++ b/core/src/test/java/org/matomo/java/tracking/QueryCreatorTest.java @@ -550,4 +550,55 @@ void tracksEvent() { assertThat(query).isEqualTo("idsite=42&token_auth=876de1876fb2cda2816c362a61bfc712&rec=1&apiv=1&_id=112210f47de98115&e_c=Event+Category&e_a=Event+Action&e_n=Event+Name&e_v=23.456&send_image=0&rand=random-value"); } -} + @Test + void allowsZeroForEventValue() { + matomoRequestBuilder.eventName("Event Name") + .eventValue(0.0) + .eventAction("Event Action") + .eventCategory("Event Category"); + + whenCreatesQuery(); + + assertThat(query) + .isEqualTo("idsite=42&" + + "token_auth=876de1876fb2cda2816c362a61bfc712&" + + "rec=1&" + + "apiv=1&" + + "_id=112210f47de98115&" + + "e_c=Event+Category&" + + "e_a=Event+Action&" + + "e_n=Event+Name&" + + "e_v=0.0&" + + "send_image=0&" + + "rand=random-value" + ); + } + + @Test + void allowsZeroForEcommerceValues() { + matomoRequestBuilder + .ecommerceRevenue(0.0) + .ecommerceSubtotal(0.0) + .ecommerceTax(0.0) + .ecommerceShippingCost(0.0) + .ecommerceDiscount(0.0); + + whenCreatesQuery(); + + assertThat(query) + .isEqualTo("idsite=42&" + + "token_auth=876de1876fb2cda2816c362a61bfc712&" + + "rec=1&" + + "apiv=1&" + + "_id=112210f47de98115&" + + "revenue=0.0&" + + "ec_st=0.0&" + + "ec_tx=0.0&" + + "ec_sh=0.0&" + + "ec_dt=0.0&" + + "send_image=0&" + + "rand=random-value" + ); + } + +} \ No newline at end of file diff --git a/servlet-javax/pom.xml b/servlet-javax/pom.xml index 26c169b5..7e76f0a5 100644 --- a/servlet-javax/pom.xml +++ b/servlet-javax/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jetty jetty-servlet - 11.0.0 + 10.0.24 test From 970e2f043e49c544dc796bb0d532f55fa45f8d36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:51:18 +0100 Subject: [PATCH 145/166] build(deps): bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1 (#351) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d28931b9..ee204290 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.5.0 org.apache.maven.plugins From 40fe3f0e34aba0c7dae9440fb67e0d8182aebe9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:51:30 +0100 Subject: [PATCH 146/166] build(deps): bump com.github.spotbugs:spotbugs-annotations from 4.9.0 to 4.9.3 (#355) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee204290..e481ba3d 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ com.github.spotbugs spotbugs-annotations - 4.9.0 + 4.9.8 provided From fec2e5fbe9f8a880abf7fd57a61881c4a1dfaebf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:51:45 +0100 Subject: [PATCH 147/166] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.6 to 4.9.3.0 (#356) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e481ba3d..3aac5f84 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.6 + 4.9.8.2 org.owasp From bea60d5289fe5a1047c5c6c6f4a2644ebb1af851 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:51:59 +0100 Subject: [PATCH 148/166] build(deps): bump org.owasp:dependency-check-maven from 12.0.2 to 12.1.1 (#357) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3aac5f84..28e7248d 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ org.owasp dependency-check-maven - 12.0.2 + 12.2.0 true From 2143624c829f046ed32edabc3ed5d93a198c1b2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:52:13 +0100 Subject: [PATCH 149/166] build(deps-dev): bump org.wiremock:wiremock from 3.11.0 to 3.13.0 (#359) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java11/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java11/pom.xml b/java11/pom.xml index 677f0c18..fb03eedf 100644 --- a/java11/pom.xml +++ b/java11/pom.xml @@ -48,7 +48,7 @@ org.wiremock wiremock - 3.11.0 + 3.13.2 test From b66ef234580703a36aa7002ee92cdd35b1b18b45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 09:59:34 +0100 Subject: [PATCH 150/166] build(deps): bump org.assertj:assertj-core from 3.27.3 to 3.27.7 (#363) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28e7248d..6d23254f 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.assertj assertj-core - 3.27.3 + 3.27.7 test From 5700bf42ee8688f8ee26a2ca2840c0064e15e1cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2026 10:00:53 +0100 Subject: [PATCH 151/166] build(deps): bump madrapps/jacoco-report from 1.7.1 to 1.7.2 (#360) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 607838f4..d8f4898a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: distribution: 'temurin' cache: maven - run: mvn -B verify - - uses: madrapps/jacoco-report@v1.7.1 + - uses: madrapps/jacoco-report@v1.7.2 with: paths: ${{ github.workspace }}/target/site/jacoco/jacoco.xml token: ${{ secrets.GITHUB_TOKEN }} From 60cee9f757c4c2046fb8913920c7fd11e03d0fa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:37:25 +0100 Subject: [PATCH 152/166] build(deps): bump actions/setup-java from 4 to 5 (#373) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8f4898a..aaad7c01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: contents: read steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f6ad8c52..d1cf4457 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69ce43c6..ea458515 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' From c0ad294136ffd45cfb850d0a98ed03e3a4bdcec5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:38:12 +0100 Subject: [PATCH 153/166] build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.2 to 3.5.5 (#368) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d23254f..cafc547d 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.5.2 + 3.5.5 From e67ebdf681e15d7fd593300aaeb4c771663cfd7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:38:28 +0100 Subject: [PATCH 154/166] build(deps-dev): bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.3 to 3.1.4 (#367) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cafc547d..75c7f967 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 org.apache.maven.plugins From d25bcd97a22cb05aa924f07179bc54a84c43ee29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:38:47 +0100 Subject: [PATCH 155/166] build(deps-dev): bump org.apache.maven.plugins:maven-release-plugin from 3.1.1 to 3.3.1 (#364) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75c7f967..f1ba8c43 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.1 + 3.3.1 true false From e42028d26211b5a5159b9d2a46f44efcbb508c01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:40:49 +0100 Subject: [PATCH 156/166] build(deps-dev): bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.15.0 (#365) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1ba8c43..b9bea5ff 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.15.0 org.apache.maven.plugins From 160228ef4c3801b084f10902062836358f516a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:41:09 +0100 Subject: [PATCH 157/166] build(deps-dev): bump org.jacoco:jacoco-maven-plugin from 0.8.12 to 0.8.14 (#366) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9bea5ff..14a14d62 100644 --- a/pom.xml +++ b/pom.xml @@ -290,7 +290,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + 0.8.14 prepare-agent From 0a4521f38b45ca181f83122131c597b3cb23ea37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:41:39 +0100 Subject: [PATCH 158/166] build(deps): bump scacap/action-surefire-report from 1.9.0 to 1.9.1 (#369) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aaad7c01..fc160921 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} min-coverage-overall: 80 min-coverage-changed-files: 80 - - uses: scacap/action-surefire-report@v1.9.0 \ No newline at end of file + - uses: scacap/action-surefire-report@v1.9.1 \ No newline at end of file From daeaf00605d34a11856daa3d1bd95802e00c2a35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:41:50 +0100 Subject: [PATCH 159/166] build(deps): bump actions/upload-pages-artifact from 3 to 4 (#370) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index dcad339d..c9d5cbf8 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -20,7 +20,7 @@ jobs: with: source: ./ destination: ./_site - - uses: actions/upload-pages-artifact@v3 + - uses: actions/upload-pages-artifact@v4 deploy: environment: name: github-pages From 5362c0a0e350fb8c6add571b28d7d2a239668074 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:43:33 +0100 Subject: [PATCH 160/166] build(deps): bump github/codeql-action from 3 to 4 (#371) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d1cf4457..cc940fba 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,8 +29,8 @@ jobs: java-version: '17' distribution: 'temurin' cache: maven - - uses: github/codeql-action/init@v3 + - uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} - - uses: github/codeql-action/autobuild@v3 - - uses: github/codeql-action/analyze@v3 + - uses: github/codeql-action/autobuild@v4 + - uses: github/codeql-action/analyze@v4 From 3064425ab9115264a18768bc00616ec838227174 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:43:44 +0100 Subject: [PATCH 161/166] build(deps): bump actions/checkout from 4 to 6 (#372) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc160921..1711ae4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: checks: write contents: read steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: java-version: '17' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cc940fba..c00ed329 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ jobs: language: [ 'java' ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: java-version: '17' diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c9d5cbf8..ace69696 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/configure-pages@v5 - uses: actions/jekyll-build-pages@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea458515..1697b03b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: java-version: '17' From 2640b7464560fbebe0567aa263e08d5864aae9b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:17:43 +0100 Subject: [PATCH 162/166] build(deps): bump release-drafter/release-drafter from 6 to 7 (#379) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1697b03b..3ab20fb0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - uses: release-drafter/release-drafter@v6 + - uses: release-drafter/release-drafter@v7 with: version: ${{ steps.version.outputs.version }} publish: true From 16b153779ffe3ead1ce8d8a3b8bd80a055d4429a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:17:58 +0100 Subject: [PATCH 163/166] build(deps): bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.7 to 3.2.8 (#378) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14a14d62..570fdffc 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.7 + 3.2.8 sign-artifacts From 12dbcb9fcc28134acfdcd42e08a085a68f8087e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:18:08 +0100 Subject: [PATCH 164/166] build(deps-dev): bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.5 (#376) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 570fdffc..bb102d9b 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 + 3.5.5 org.apache.maven.plugins From 433ed938fd8c5bb286f4035d3e8db9ce4fd6aeaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:18:26 +0100 Subject: [PATCH 165/166] build(deps): bump slf4j.version from 2.0.16 to 2.0.17 (#377) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb102d9b..79fd170e 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 1.8 ${project.build.outputDirectory}/delombok 1.18.36 - 2.0.16 + 2.0.17 From 267b9cffbb0e62e79306bbd4e5af462f7a5f4608 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2026 10:18:40 +0100 Subject: [PATCH 166/166] build(deps-dev): bump org.apache.maven.plugins:maven-resources-plugin from 3.3.1 to 3.5.0 (#375) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79fd170e..f4c62914 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.3.1 + 3.5.0 org.apache.maven.plugins