Skip to content

Commit

Permalink
Merge branch 'confluentinc:master' into feature-external-version-header
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjosal-indeed
rjosal-indeed committed Nov 27, 2023
2 parents c4c2c62 + 54907ef commit ee17b6e
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 21 deletions.
Binary file added logos/elasticlogo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed logos/elasticsearch.jpg
View file
Binary file not shown.
124 changes: 103 additions & 21 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.confluent</groupId>
<artifactId>common</artifactId>
<version>6.2.3</version>
<version>7.0.12</version>
</parent>

<artifactId>kafka-connect-elasticsearch</artifactId>
Expand Down Expand Up @@ -37,7 +37,7 @@
</scm>

<properties>
<es.version>7.17.3</es.version>
<es.version>7.17.13</es.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>2.28.2</mockito.version>
<gson.version>2.9.0</gson.version>
Expand All @@ -47,8 +47,8 @@
<hadoop.version>3.3.1</hadoop.version>
<apacheds-jdbm1.version>2.0.0-M2</apacheds-jdbm1.version>
<!-- TODO: Remove the version pin after releasing https://github.com/confluentinc/common/pull/494 -->
<jackson.databind.version>2.14.0</jackson.databind.version>
<jackson.version>2.14.0</jackson.version>
<jackson.databind.version>2.15.2</jackson.databind.version>
<jackson.version>2.15.2</jackson.version>
<!-- temporary fix by pinning the version until we upgrade to a version of common that contains this or newer version.
See https://github.com/confluentinc/common/pull/332 for details (common-parent 7.0.0-0) -->
<dependency.check.version>6.1.6</dependency.check.version>
Expand Down Expand Up @@ -102,12 +102,7 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<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>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
Expand All @@ -125,12 +120,6 @@
<version>${gson.version}</version>
<scope>test</scope>
</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 @@ -172,10 +161,9 @@
<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>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -303,6 +291,100 @@

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>prepare-agent-it</id>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<phase>pre-integration-test</phase>
</execution>
<execution>
<id>merge-coverage-reports</id>
<phase>verify</phase>
<goals>
<goal>merge</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>/target/jacoco.exec</include>
<include>/target/jacoco-it.exec</include>
</includes>
</fileSet>
</fileSets>
<destFile>${project.basedir}/target/jacoco-aggregate.exec</destFile>
</configuration>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.60</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>0.45</minimum>
</limit>
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.50</minimum>
</limit>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.50</minimum>
</limit>
<limit>
<counter>METHOD</counter>
<value>COVEREDRATIO</value>
<minimum>0.80</minimum>
</limit>
<limit>
<counter>CLASS</counter>
<value>COVEREDRATIO</value>
<minimum>0.80</minimum>
</limit>
</limits>
</rule>
</rules>
<dataFile>${project.basedir}/target/jacoco-aggregate.exec</dataFile>
</configuration>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<dataFile>${project.basedir}/target/jacoco-aggregate.exec</dataFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -321,7 +403,7 @@
<title>Kafka Connect Elasticsearch</title>
<documentationUrl>https://docs.confluent.io/kafka-connect-elasticsearch/current/index.html</documentationUrl>
<description>
The Elasticsearch connector allows moving data from Kafka to Elasticsearch 2.x, 5.x, 6.x, and 7.x. It writes data from a topic in Kafka to an index in Elasticsearch and all data for a topic have the same type.
The Elasticsearch connector allows moving data from Kafka to Elasticsearch. It writes data from a topic in Kafka to an index in Elasticsearch and all data for a topic have the same type. Please refer to the documentation for more details on supported versions of elasticsearch for each connector version.

Elasticsearch is often used for text queries, analytics and as an key-value store (use cases). The connector covers both the analytics and key-value store use cases. For the analytics use case, each message is in Kafka is treated as an event and the connector uses topic+partition+offset as a unique identifier for events, which then converted to unique documents in Elasticsearch. For the key-value store use case, it supports using keys from Kafka messages as document ids in Elasticsearch and provides configurations ensuring that updates to a key are written to Elasticsearch in order. For both use cases, Elasticsearch’s idempotent write semantics guarantees exactly once delivery.

Expand Down Expand Up @@ -595,4 +677,4 @@
</build>
</profile>
</profiles>
</project>
</project>

0 comments on commit ee17b6e

Please sign in to comment.