Skip to content

Commit

Permalink
update confluent's dependencies to common, supported version (apache#…
Browse files Browse the repository at this point in the history
…15441)

* update confluent's dependencies to common, supported version

  Update io.confluent.* dependencies to common, updated version 6.2.12
currently used versions are EOL

* move version definition to the top level pom
  • Loading branch information
janjwerner-confluent committed Nov 29, 2023
1 parent 97623b4 commit ee6ad36
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 11 deletions.
1 change: 0 additions & 1 deletion extensions-core/avro-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@

<properties>
<schemarepo.version>0.1.3</schemarepo.version>
<confluent.version>5.5.12</confluent.version>
</properties>

<repositories>
Expand Down
1 change: 0 additions & 1 deletion extensions-core/protobuf-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
</parent>

<properties>
<confluent.version>6.0.1</confluent.version>
<commons-io.version>2.11.0</commons-io.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-schema-registry-client</artifactId>
<version>5.5.12</version>
<version>6.2.12</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -398,7 +398,7 @@
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-protobuf-provider</artifactId>
<version>5.5.12</version>
<version>6.2.12</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -592,7 +592,7 @@
<DRUID_INTEGRATION_TEST_INDEXER>${it.indexer}</DRUID_INTEGRATION_TEST_INDEXER>
<MYSQL_VERSION>${mysql.version}</MYSQL_VERSION>
<MARIA_VERSION>2.7.3</MARIA_VERSION>
<CONFLUENT_VERSION>5.5.1</CONFLUENT_VERSION>
<CONFLUENT_VERSION>6.2.12</CONFLUENT_VERSION>
<KAFKA_VERSION>${apache.kafka.version}</KAFKA_VERSION>
<ZK_VERSION>${zookeeper.version}</ZK_VERSION>
<HADOOP_VERSION>${hadoop.compile.version}</HADOOP_VERSION>
Expand Down
35 changes: 29 additions & 6 deletions licenses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3184,7 +3184,7 @@ libraries:
---

name: Kafka clients
version: 5.5.12-ccs
version: 6.2.12-ccs
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
Expand All @@ -3193,7 +3193,7 @@ libraries:

---
name: Kafka-schema-registry-client
version: 5.5.12
version: 6.2.12
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
Expand Down Expand Up @@ -3315,8 +3315,19 @@ libraries:

---

name: Kafka Schema Registry Client 6.0.1
version: 6.0.1
name: swagger-annotations
version: 2.1.10
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
libraries:
- io.swagger: swagger-annotations
- io.swagger.core.v3: swagger-annotations

---

name: Kafka Schema Registry Client
version: 6.2.12
license_category: binary
module: extensions/druid-protobuf-extensions
license_name: Apache License version 2.0
Expand All @@ -3327,13 +3338,25 @@ libraries:
---

name: Confluent Kafka Client
version: 6.0.1-ccs
version: 6.2.12-ccs
license_category: binary
module: extensions/druid-protobuf-extensions
license_name: Apache License version 2.0
libraries:
- org.apache.kafka: kafka-clients


---

name: swagger-annotations
version: 2.1.10
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
libraries:
- io.swagger: swagger-annotations
- io.swagger.core.v3: swagger-annotations

---

name: Apache Velocity Engine
Expand Down Expand Up @@ -4686,7 +4709,7 @@ libraries:

---

name: Apache Lucene
name: Apache Lucene
license_category: binary
version: 8.4.0
module: druid-ranger-security
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
default_config.fmpp
-->
<calcite.version>1.35.0</calcite.version>
<confluent.version>6.2.12</confluent.version>
<datasketches.version>4.2.0</datasketches.version>
<datasketches.memory.version>2.2.0</datasketches.memory.version>
<derby.version>10.14.2.0</derby.version>
Expand Down Expand Up @@ -253,6 +254,14 @@
<enabled>false</enabled>
</snapshots>
</repository>

<repository>
<id>cflt-public</id>
<url>https://packages.confluent.io/maven/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
Expand Down

0 comments on commit ee6ad36

Please sign in to comment.