From d155793466c676b87f5070e5216765ceac5bed2f Mon Sep 17 00:00:00 2001 From: Arti Kumari Date: Tue, 14 Oct 2025 18:22:50 +0530 Subject: [PATCH] Revert " Merge branch '5.3.x' into 5.4.x" This reverts commit 675e6b364d4e53887f7998737d886b09e812cf44, reversing changes made to 9a5e806315a583caec467340dabf9c682f58ead2. --- .semaphore/semaphore.yml | 4 ++-- .../java/io/confluent/connect/jdbc/source/JdbcSourceTask.java | 3 ++- .../connect/jdbc/source/integration/PauseResumeIT.java | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index e1ae174bc4..9a737e9a65 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -7,7 +7,7 @@ version: v1.0 name: build-test-release agent: machine: - type: s1-prod-ubuntu24-04-amd64-1 + type: s1-prod-ubuntu20-04-amd64-1 fail_fast: cancel: @@ -39,7 +39,7 @@ blocks: commands: - pip install confluent-release-tools -q - . sem-pint - - sudo apt-get --assume-yes install libncurses6 + - sudo apt-get --assume-yes install libncurses5 - mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 -Ddependency.check.skip=true --batch-mode --no-transfer-progress clean verify install dependency:analyze validate - . cve-scan - . cache-maven store diff --git a/src/main/java/io/confluent/connect/jdbc/source/JdbcSourceTask.java b/src/main/java/io/confluent/connect/jdbc/source/JdbcSourceTask.java index ca6e0f15e9..ac52fc6aa1 100644 --- a/src/main/java/io/confluent/connect/jdbc/source/JdbcSourceTask.java +++ b/src/main/java/io/confluent/connect/jdbc/source/JdbcSourceTask.java @@ -17,6 +17,7 @@ import java.util.TimeZone; import org.apache.kafka.common.config.ConfigException; +import org.apache.kafka.common.utils.SystemTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.SourceRecord; @@ -66,7 +67,7 @@ public class JdbcSourceTask extends SourceTask { private final AtomicBoolean running = new AtomicBoolean(false); public JdbcSourceTask() { - this.time = Time.SYSTEM; + this.time = new SystemTime(); } public JdbcSourceTask(Time time) { diff --git a/src/test/java/io/confluent/connect/jdbc/source/integration/PauseResumeIT.java b/src/test/java/io/confluent/connect/jdbc/source/integration/PauseResumeIT.java index 913cdf793d..bee3ca2710 100644 --- a/src/test/java/io/confluent/connect/jdbc/source/integration/PauseResumeIT.java +++ b/src/test/java/io/confluent/connect/jdbc/source/integration/PauseResumeIT.java @@ -10,7 +10,6 @@ import org.apache.kafka.test.TestUtils; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -80,7 +79,6 @@ public void after() { } } - @Ignore @Test public void testPauseResume() throws Exception { try (Connection conn = getConnection(); Statement stmt = conn.createStatement()) {