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/ 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: diff --git a/parallel-consumer-core/pom.xml b/parallel-consumer-core/pom.xml index 5970f43b4..8b4278622 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 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 @@