Skip to content

Fixes - 11.1.x [DO NOT MERGE] #833

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

Draft
wants to merge 4 commits into
base: 11.1.x
Choose a base branch
from
Draft

Fixes - 11.1.x [DO NOT MERGE] #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cb7805
Fixes
sp-gupta Jan 7, 2025
f5160dc
Resolve pom.xml
100maygupta Jan 31, 2025
2d7cc0a
Update pom.xml
100maygupta Jan 31, 2025
a9c90e8
Update test.containers version
100maygupta Feb 3, 2025
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
44 changes: 18 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.confluent</groupId>
<artifactId>common</artifactId>
<version>6.0.3</version>
<version>[7.9.0,7.9.1)</version>
</parent>

<groupId>io.confluent</groupId>
Expand Down Expand Up @@ -40,9 +40,8 @@
<properties>
<es.version>7.9.3</es.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.28.2</mockito.version>
<gson.version>2.8.6</gson.version>
<test.containers.version>1.15.3</test.containers.version>
<test.containers.version>1.16.3</test.containers.version>
<kafka.connect.maven.plugin.version>0.11.1</kafka.connect.maven.plugin.version>
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
<hadoop.version>3.3.0</hadoop.version>
Expand All @@ -55,6 +54,8 @@
<dependency.check.version>6.1.6</dependency.check.version>
<confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>
<commons.codec.version>1.15</commons.codec.version>
<confluent.version>[7.9.0,7.9.1)</confluent.version>
<kafka.test.version>7.8.0-ccs</kafka.test.version>
<jackson.version>2.16.0</jackson.version>
<dependency.check.skip>true</dependency.check.skip>
</properties>
Expand Down Expand Up @@ -105,11 +106,6 @@
<artifactId>jackson-dataformat-cbor</artifactId>
</dependency>
<!-- pin commons-codec for CVE -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -121,17 +117,6 @@
<version>${gson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<!-- Force commons-codec (httpclient transitive dependency) version to address CVE CCMSG-835 -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -161,6 +146,11 @@
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
Expand All @@ -169,12 +159,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- Use a repackaged version of log4j with security patches. Default log4j v1.2 is a transitive dependency of connect-runtime, but it is excluded in common/pom.xml -->
<dependency>
<groupId>io.confluent</groupId>
<artifactId>confluent-log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
Expand All @@ -184,7 +168,15 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka.version}</version>
<version>${kafka.test.version}</version>
<classifier>test</classifier>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-server-common</artifactId>
<version>${kafka.test.version}</version>
<classifier>test</classifier>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/confluent/connect/elasticsearch/ConfigCallbackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.nio.reactor.IOReactorException;
import org.apache.kafka.common.network.Mode;
import org.apache.kafka.common.network.ConnectionMode;
import org.apache.kafka.common.security.ssl.SslFactory;
import org.apache.kafka.connect.errors.ConnectException;
import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
Expand Down Expand Up @@ -258,7 +258,7 @@ private void configureSslContext(HttpAsyncClientBuilder builder) {
* Gets the SslContext for the client.
*/
private SSLContext sslContext() {
SslFactory sslFactory = new SslFactory(Mode.CLIENT, null, false);
SslFactory sslFactory = new SslFactory(ConnectionMode.CLIENT, null, false);
sslFactory.configure(config.sslConfigs());

try {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/confluent/connect/elasticsearch/ElasticsearchClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ public void testSsl() throws Exception {
helperClient = null;

container.close();
container = ElasticsearchContainer.fromSystemProperties();
container = ElasticsearchContainer.fromSystemProperties().withSslEnabled(false);
container.start();
}

Expand Down
6 changes: 5 additions & 1 deletion src/test/java/io/confluent/connect/elasticsearch/integration/BaseConnectorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

package io.confluent.connect.elasticsearch.integration;

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.TimeUnit;

Expand All @@ -41,8 +43,10 @@ public abstract class BaseConnectorIT {
protected RestApp restApp;

protected void startConnect() {
Map<String, String> workerProps = new HashMap<>();
workerProps.put("plugin.discovery","hybrid_warn");
connect = new EmbeddedConnectCluster.Builder()
.name("elasticsearch-it-connect-cluster")
.name("elasticsearch-it-connect-cluster").workerProps(workerProps)
.build();

// start the clusters
Expand Down