Skip to content
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.

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

Fix incompatibility with Apicurio Registry 2.x #161

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:

schema_registry:
image: apicurio/apicurio-registry:3.0.2
hostname: schema_registry
hostname: schema-registry
depends_on:
broker:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion examples/ksml-data-generator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ksml:
type: apicurio_avro # For AVRO there are two implementations: apicurio_avro and confluent_avro
## Below this line, specify properties to be passed into Apicurio's AvroKafkaSerializer and AvroKafkaDeserializer
config:
apicurio.registry.url: http://schema_registry:8081/apis/registry/v3
apicurio.registry.url: http://schema-registry:8081/apis/registry/v2
# Register schema if it does not exist
apicurio.registry.auto-register: "true"
# Apicurio Avro serialisation settings
Expand Down
2 changes: 1 addition & 1 deletion examples/ksml-runner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ksml:
type: apicurio_avro # For AVRO there are two implementations: apicurio_avro and confluent_avro
## Below this line, specify properties to be passed into Apicurio's AvroKafkaSerializer and AvroKafkaDeserializer
config:
apicurio.registry.url: http://schema_registry:8081/apis/registry/v3
apicurio.registry.url: http://schema-registry:8081/apis/registry/v2
# Register schema if it does not exist
apicurio.registry.auto-register: "true"
# Apicurio Avro serialisation settings
Expand Down
49 changes: 8 additions & 41 deletions ksml-data-avro/NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Lists of 74 third-party dependencies.
Lists of 41 third-party dependencies.
(MIT License) minimal-json (com.eclipsesource.minimal-json:minimal-json:0.9.5 - https://github.com/ralfstx/minimal-json)
(The Apache Software License, Version 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.17.1 - https://github.com/FasterXML/jackson)
(The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.17.1 - https://github.com/FasterXML/jackson-core)
Expand All @@ -14,61 +14,28 @@ Lists of 74 third-party dependencies.
(The Apache Software License, Version 2.0) Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
(Apache License, Version 2.0) J2ObjC Annotations (com.google.j2objc:j2objc-annotations:3.0.0 - https://github.com/google/j2objc/)
(Go License) RE2/J (com.google.re2j:re2j:1.6 - http://github.com/google/re2j)
(MIT License) Microsoft Kiota-Java Abstractions (com.microsoft.kiota:microsoft-kiota-abstractions:1.7.0 - https://github.com/microsoft/kiota-java)
(MIT License) Microsoft Kiota-Java Serialization-Form (com.microsoft.kiota:microsoft-kiota-serialization-form:1.7.0 - https://github.com/microsoft/kiota-java)
(MIT License) Microsoft Kiota-Java Serialization-Multipart (com.microsoft.kiota:microsoft-kiota-serialization-multipart:1.7.0 - https://github.com/microsoft/kiota-java)
(MIT License) Microsoft Kiota-Java Serialization-Text (com.microsoft.kiota:microsoft-kiota-serialization-text:1.7.0 - https://github.com/microsoft/kiota-java)
(Apache-2.0) Apache Commons Codec (commons-codec:commons-codec:1.17.0 - https://commons.apache.org/proper/commons-codec/)
(Apache-2.0) Apache Commons IO (commons-io:commons-io:2.16.1 - https://commons.apache.org/proper/commons-io/)
(Apache License Version 2.0) apicurio-registry-avro-serde-kafka (io.apicurio:apicurio-registry-avro-serde-kafka:3.0.2 - https://www.apicur.io/apicurio-registry-avro-serde-kafka/)
(Apache License Version 2.0) apicurio-registry-common (io.apicurio:apicurio-registry-common:3.0.2 - https://www.apicur.io/apicurio-registry-common/)
(Apache License Version 2.0) apicurio-registry-java-sdk (io.apicurio:apicurio-registry-java-sdk:3.0.2 - https://www.apicur.io/apicurio-registry-java-sdk/)
(Apache License Version 2.0) apicurio-registry-schema-resolver (io.apicurio:apicurio-registry-schema-resolver:3.0.2 - https://www.apicur.io/apicurio-registry-schema-resolver/)
(Apache License Version 2.0) apicurio-registry-serde-common (io.apicurio:apicurio-registry-serde-common:3.0.2 - https://www.apicur.io/apicurio-registry-serde-common/)
(Apache License Version 2.0) apicurio-registry-serde-avro-common (io.apicurio:apicurio-registry-serde-common-avro:3.0.2 - https://www.apicur.io/apicurio-registry-serde-common-avro/)
(Apache License Version 2.0) apicurio-registry-serde-kafka-common (io.apicurio:apicurio-registry-serde-kafka-common:3.0.2 - https://www.apicur.io/apicurio-registry-serde-kafka-common/)
(Apache License Version 2.0) apicurio-common-rest-client-common (io.apicurio:apicurio-common-rest-client-common:0.1.18.Final - https://www.apicur.io/apicurio-common-rest-client-common/)
(Apache License Version 2.0) apicurio-common-rest-client-jdk (io.apicurio:apicurio-common-rest-client-jdk:0.1.18.Final - https://www.apicur.io/apicurio-common-rest-client-jdk/)
(Apache License Version 2.0) apicurio-registry-client (io.apicurio:apicurio-registry-client:2.6.5.Final - https://www.apicur.io/apicurio-registry-client/)
(Apache License Version 2.0) apicurio-registry-common (io.apicurio:apicurio-registry-common:2.6.5.Final - https://www.apicur.io/apicurio-registry-common/)
(Apache License Version 2.0) apicurio-registry-schema-resolver (io.apicurio:apicurio-registry-schema-resolver:2.6.5.Final - https://www.apicur.io/apicurio-registry-schema-resolver/)
(Apache License Version 2.0) apicurio-registry-serde-common (io.apicurio:apicurio-registry-serde-common:2.6.5.Final - https://www.apicur.io/apicurio-registry-serde-common/)
(Apache License Version 2.0) apicurio-registry-serdes-avro-serde (io.apicurio:apicurio-registry-serdes-avro-serde:2.6.5.Final - https://www.apicur.io/apicurio-registry-serdes-avro-serde/)
(Apache 2.0) KSML Data Library (io.axual.ksml:ksml-data:1.1.0-SNAPSHOT - https://github.com/Axual/ksml/ksml-data)
(Apache License 2.0) utils (io.confluent:common-utils:7.6.1 - https://confluent.io/common-utils)
(Apache License 2.0) kafka-avro-serializer (io.confluent:kafka-avro-serializer:7.6.1 - http://confluent.io/kafka-avro-serializer)
(Apache License 2.0) kafka-schema-registry-client (io.confluent:kafka-schema-registry-client:7.6.1 - http://confluent.io/kafka-schema-registry-client)
(Apache License 2.0) kafka-schema-serializer (io.confluent:kafka-schema-serializer:7.6.1 - http://confluent.io/kafka-schema-serializer)
(The Apache Software License, Version 2.0) Log Redactor (io.confluent:logredactor:1.0.12 - https://github.com/confluentinc/logredactor)
(The Apache Software License, Version 2.0) Log Redactor Metrics (io.confluent:logredactor-metrics:1.0.12 - https://github.com/confluentinc/logredactor)
(Apache License, Version 2.0) Standard Uri Template (io.github.std-uritemplate:std-uritemplate:2.0.0 - https://std-uritemplate.github.io/)
(Apache-2.0) Kiota - Http - Vert.X (io.kiota:kiota-http-vertx:0.0.18 - https://github.com/kiota-community/kiota-java-extra/kiota-libraries-parent/kiota-http-vertx)
(Apache-2.0) Kiota - Serialization - Jackson (io.kiota:kiota-serialization-jackson:0.0.18 - https://github.com/kiota-community/kiota-java-extra/kiota-libraries-parent/kiota-serialization-jackson-parent/kiota-serialization-jackson)
(Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.108.Final - https://netty.io/netty-buffer/)
(Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.108.Final - https://netty.io/netty-codec/)
(Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.108.Final - https://netty.io/netty-codec-dns/)
(Apache License, Version 2.0) Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.108.Final - https://netty.io/netty-codec-http/)
(Apache License, Version 2.0) Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.108.Final - https://netty.io/netty-codec-http2/)
(Apache License, Version 2.0) Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.108.Final - https://netty.io/netty-codec-socks/)
(Apache License, Version 2.0) Netty/Common (io.netty:netty-common:4.1.108.Final - https://netty.io/netty-common/)
(Apache License, Version 2.0) Netty/Handler (io.netty:netty-handler:4.1.108.Final - https://netty.io/netty-handler/)
(Apache License, Version 2.0) Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.108.Final - https://netty.io/netty-handler-proxy/)
(Apache License, Version 2.0) Netty/Resolver (io.netty:netty-resolver:4.1.108.Final - https://netty.io/netty-resolver/)
(Apache License, Version 2.0) Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.108.Final - https://netty.io/netty-resolver-dns/)
(Apache License, Version 2.0) Netty/Transport (io.netty:netty-transport:4.1.108.Final - https://netty.io/netty-transport/)
(Apache License, Version 2.0) Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.108.Final - https://netty.io/netty-transport-native-unix-common/)
(The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-api:1.42.1 - https://github.com/open-telemetry/opentelemetry-java)
(The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-context:1.42.1 - https://github.com/open-telemetry/opentelemetry-java)
(Apache License 2.0) swagger-annotations (io.swagger.core.v3:swagger-annotations:2.1.10 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
(Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-auth-common (io.vertx:vertx-auth-common:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth-parent/vertx-auth-common)
(Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-auth-oauth2 (io.vertx:vertx-auth-oauth2:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth-parent/vertx-auth-oauth2)
(Eclipse Public License - v 2.0) (The Apache Software License, Version 2.0) Vert.x Core (io.vertx:vertx-core:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core)
(Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x URI Template (io.vertx:vertx-uri-template:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-uri-template)
(Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-client (io.vertx:vertx-web-client:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-client)
(Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-common (io.vertx:vertx-web-common:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-common)
(EPL 2.0) (GPL2 w/ CPE) Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:3.0.0 - https://projects.eclipse.org/projects/ee4j.ca)
(Apache License 2.0) Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:3.0.2 - https://beanvalidation.org)
(EPL-2.0) (GPL-2.0-with-classpath-exception) Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 - https://github.com/eclipse-ee4j/jaxrs-api)
(Apache-2.0) Apache Avro (org.apache.avro:avro:1.12.0 - https://avro.apache.org)
(Apache-2.0) Apache Commons Compress (org.apache.commons:commons-compress:1.26.2 - https://commons.apache.org/proper/commons-compress/)
(Apache-2.0) Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/)
(The Apache License, Version 2.0) Apache Kafka (org.apache.kafka:kafka-clients:3.8.0 - https://kafka.apache.org)
(The MIT License) Checker Qual (org.checkerframework:checker-qual:3.42.0 - https://checkerframework.org/)
(Apache License, version 2.0) JBoss Logging 3 (org.jboss.logging:jboss-logging:3.4.1.Final - http://www.jboss.org)
(Apache License 2.0) slf4j to JBoss Logging Adapter (org.jboss.slf4j:slf4j-jboss-logging:1.2.1.Final - http://www.jboss.org)
(The Apache Software License, Version 2.0) LZ4 and xxHash (org.lz4:lz4-java:1.8.0 - https://github.com/lz4/lz4-java)
(The MIT License) Project Lombok (org.projectlombok:lombok:1.18.32 - https://projectlombok.org)
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:2.0.13 - http://www.slf4j.org)
Expand Down
2 changes: 1 addition & 1 deletion ksml-data-avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-avro-serde-kafka</artifactId>
<artifactId>apicurio-registry-serdes-avro-serde</artifactId>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<apache.commons.text.version>1.12.0</apache.commons.text.version>
<apache.commons.compress.version>1.26.2</apache.commons.compress.version>
<apache.kafka.version>3.8.0</apache.kafka.version>
<apicurio.avro.version>3.0.2</apicurio.avro.version>
<apicurio.avro.version>2.6.5.Final</apicurio.avro.version>
<confluent.version>7.6.1</confluent.version>
<graalvm.version>23.1.2</graalvm.version>
<graalvm.polyglot.version>23.1.2</graalvm.polyglot.version>
Expand Down Expand Up @@ -231,7 +231,7 @@

<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-avro-serde-kafka</artifactId>
<artifactId>apicurio-registry-serdes-avro-serde</artifactId>
<version>${apicurio.avro.version}</version>
</dependency>
<dependency>
Expand Down