From 2ee5b53af5da12c3a00f77210415f09df76b1d32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 16:50:19 +0000 Subject: [PATCH 1/4] build(deps-dev): bump org.threeten:threeten-extra from 1.7.2 to 1.8.0 Bumps [org.threeten:threeten-extra](https://github.com/ThreeTen/threeten-extra) from 1.7.2 to 1.8.0. - [Release notes](https://github.com/ThreeTen/threeten-extra/releases) - [Commits](https://github.com/ThreeTen/threeten-extra/compare/v1.7.2...v1.8.0) --- updated-dependencies: - dependency-name: org.threeten:threeten-extra dependency-version: 1.8.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parallel-consumer-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parallel-consumer-core/pom.xml b/parallel-consumer-core/pom.xml index 74e961e82..022e60c8b 100644 --- a/parallel-consumer-core/pom.xml +++ b/parallel-consumer-core/pom.xml @@ -101,7 +101,7 @@ org.threeten threeten-extra - 1.7.2 + 1.8.0 test From e775367537aaf73de75cba649d3a13b21ed35f31 Mon Sep 17 00:00:00 2001 From: johnbyrne Date: Mon, 27 Oct 2025 21:03:33 +0000 Subject: [PATCH 2/4] Updated the gitignore file --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e7ef34e89..19856e1f1 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,6 @@ release.properties /.idea/inspectionProfiles/Project_Default.xml /.idea/uiDesigner.xml /.idea/vcs.xml + +# VS Code +.vscode/ From 821ccf6d650981c471372f623510049509d715c2 Mon Sep 17 00:00:00 2001 From: johnbyrne Date: Mon, 27 Oct 2025 21:08:57 +0000 Subject: [PATCH 3/4] Add missing license headers --- .../parallelconsumer/internal/ConsumerOffsetCommitter.java | 2 +- .../io/confluent/parallelconsumer/state/PartitionState.java | 2 +- .../confluent/parallelconsumer/mutiny/MutinyUnitTestBase.java | 2 +- parallel-consumer-mutiny/src/test/resources/logback-test.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/internal/ConsumerOffsetCommitter.java b/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/internal/ConsumerOffsetCommitter.java index b0464b138..7281b6c1d 100644 --- a/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/internal/ConsumerOffsetCommitter.java +++ b/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/internal/ConsumerOffsetCommitter.java @@ -1,7 +1,7 @@ package io.confluent.parallelconsumer.internal; /*- - * Copyright (C) 2020-2024 Confluent, Inc. + * Copyright (C) 2020-2025 Confluent, Inc. */ import io.confluent.parallelconsumer.ParallelConsumerOptions; diff --git a/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/state/PartitionState.java b/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/state/PartitionState.java index 5f2e036fe..83e80080c 100644 --- a/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/state/PartitionState.java +++ b/parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/state/PartitionState.java @@ -1,7 +1,7 @@ package io.confluent.parallelconsumer.state; /*- - * Copyright (C) 2020-2024 Confluent, Inc. + * Copyright (C) 2020-2025 Confluent, Inc. */ import io.confluent.parallelconsumer.internal.BrokerPollSystem; diff --git a/parallel-consumer-mutiny/src/test/java/io/confluent/parallelconsumer/mutiny/MutinyUnitTestBase.java b/parallel-consumer-mutiny/src/test/java/io/confluent/parallelconsumer/mutiny/MutinyUnitTestBase.java index ce92b03f7..68dc8a9da 100644 --- a/parallel-consumer-mutiny/src/test/java/io/confluent/parallelconsumer/mutiny/MutinyUnitTestBase.java +++ b/parallel-consumer-mutiny/src/test/java/io/confluent/parallelconsumer/mutiny/MutinyUnitTestBase.java @@ -1,7 +1,7 @@ package io.confluent.parallelconsumer.mutiny; /*- - * Copyright (C) 2020-2022 Confluent, Inc. + * Copyright (C) 2020-2025 Confluent, Inc. */ import io.confluent.parallelconsumer.ParallelConsumerOptions; diff --git a/parallel-consumer-mutiny/src/test/resources/logback-test.xml b/parallel-consumer-mutiny/src/test/resources/logback-test.xml index 3aec1d52e..d0456fe1d 100644 --- a/parallel-consumer-mutiny/src/test/resources/logback-test.xml +++ b/parallel-consumer-mutiny/src/test/resources/logback-test.xml @@ -1,6 +1,6 @@ From 5bbfea7835644c5d299c14c754a54dfaed259d13 Mon Sep 17 00:00:00 2001 From: johnbyrne Date: Mon, 27 Oct 2025 21:19:17 +0000 Subject: [PATCH 4/4] Updated the semaphore yaml file to explicitly set java home version --- .semaphore/semaphore.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 66416f15c..d3326de07 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -28,9 +28,12 @@ global_job_config: prologue: commands: - sem-version java 17 + - export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac)))) + - echo "JAVA_HOME set to $JAVA_HOME" - checkout - git fetch --unshallow + blocks: - name: Build dependencies: [] @@ -38,6 +41,7 @@ blocks: jobs: - name: Build and Test commands: + - rm -rf .m2/io/confluent - ./mvnw --batch-mode -q -Pci -U clean install -DskipTests - ./mvnw --batch-mode -Pci verify epilogue: