Skip to content

Revert unnecessary pint merge changes #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 5.4.x
Choose a base branch
from
Open

Revert unnecessary pint merge changes #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/confluent/connect/jdbc/source/JdbcSourceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/io/confluent/connect/jdbc/source/integration/PauseResumeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -80,7 +79,6 @@ public void after() {
}
}

@Ignore
@Test
public void testPauseResume() throws Exception {
try (Connection conn = getConnection(); Statement stmt = conn.createStatement()) {
Expand Down