Enable ci for branch 2.6.x (#4672)

* Enable ci for branch 2.6.x * Fix examples version
Apicurio · May 15, 2024 · 7bd0e3d · 7bd0e3d
1 parent 3102a25
commit 7bd0e3d
Show file tree

Hide file tree

Showing 32 changed files with 220 additions and 178 deletions.
diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -7,7 +7,7 @@ on:
       - 'README*'
       - 'docs/**'
       - '.github/workflows/**'
-    branches: [main, '[1-9].[1-9].x', 2.4.x, 2.5.x]
+    branches: [main, '[1-9].[1-9].x', 2.4.x, 2.5.x, 2.6.x]
   pull_request:
     paths-ignore:
       - '.gitignore'

diff --git a/examples/README.md b/examples/README.md
@@ -1,7 +1,3 @@
-The examples on this repository have been moved to the [main Apicurio Registry Repository](https://github.com/Apicurio/apicurio-registry/examples).
-
-
-
 # Apicurio Registry Example Applications
 This repository contains a set of example applications (mostly Kafka applications) that use the
 Apicurio Registry as part of their workflow.  The registry is typically used to store schemas 
@@ -13,6 +9,16 @@ Each example in this repository attempts to demonstrate some specific use-case o
 There are numerous options available when integrating with the registry, and therefore the set
 of examples found here may not cover every configuration permutation.
 
+These examples rely on an Apicurio Registry server being available, you can start one with the latest build by running:
+``
+docker run -p 8080:8080 -it apicurio/apicurio-registry:latest-snapshot
+``
+This command will start an Apicurio Registry server and make it available at the port 8080 of localhost.
+
+Some examples also require a Kafka Cluster available, you can very easily run one using the [docker-compose resources available in the tools folder](/tools/kafka-compose/kafka-compose.yaml)
+
+Simply run ``docker-compose  -f examples/tools/kafka-compose/kafka-compose.yaml up`` and you'll have a Kafka broker available at the port 9092.
+
 # List of Examples
 A list of examples is included below, with descriptions and explanations of each covered use-case.
 
@@ -25,7 +31,7 @@ and deserialize message payloads.
 This example application demonstrates the basics of using the registry in a very simple Kafka 
 publish/subscribe application using JSON Schema to validate message payloads when both producing 
 and consuming them.  JSON Schema is not a serialization technology, but rather is only used for
-validation.  Therefore it can be enabled or disabled in the serializer and deserializer.
+validation. Therefore, it can be enabled or disabled in the serializer and deserializer.
 
 ## Confluent Serdes Integration
 This example shows how Apicurio Registry serdes classes can be used along with Confluent serdes
@@ -52,7 +58,7 @@ Registry Global ID strategies, it uses a custom one.
 This example application demonstrates how to use the Apicurio Registry maven plugin to 
 pre-register an Avro schema so that it does not need to be embedded within the producer
 application.  Note that this example will fail unless the maven plugin is executed before
-the Java application.  See the javadoc in the example for details.
+the Java application. See the javadoc in the example for details.
 
 ## Rest Client example
 This example application demonstrates how to use the Apicurio Registry rest client to create, 
@@ -63,9 +69,4 @@ use the client.
 ## Mix Avro Schemas Example
 This example application showcases an scenario where Apache Avro messages are published to the same
 Kafka topic using different Avro schemas. This example uses the Apicurio Registry serdes classes to serialize
-and deserialize Apache Avro messages using different schemas, even if received in the same Kafka topic.
-
-## Cloud Events PoC
-This is an example application that implements a REST API that consumes and produces CloudEvents.
-This example application showcases an experimental library from apicurio-registry project. This library is used to validate incoming and outgoing CloudEvents messages in the REST API.
-The validation is performed against json schemas that are stored in Apicurio Registry. For a more detailed explanation go [here](../apicurio-registry/examples/cloudevents/README.md).
+and deserialize Apache Avro messages using different schemas, even if received in the same Kafka topic.
diff --git a/examples/avro-bean/pom.xml b/examples/avro-bean/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.8.1</version>
+            <version>0.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/examples/avro-maven-with-references-auto/pom.xml b/examples/avro-maven-with-references-auto/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apicurio-registry-examples</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>2.5.12-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
             <plugin>
                 <groupId>io.apicurio</groupId>
                 <artifactId>apicurio-registry-maven-plugin</artifactId>
-                <version>${apicurio-registry.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>register-artifact</id>

diff --git a/examples/avro-maven-with-references/pom.xml b/examples/avro-maven-with-references/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apicurio-registry-examples</artifactId>
         <groupId>io.apicurio</groupId>
-        <version>2.5.12-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
             <plugin>
                 <groupId>io.apicurio</groupId>
                 <artifactId>apicurio-registry-maven-plugin</artifactId>
-                <version>${apicurio-registry.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>register-artifact</id>

diff --git a/examples/camel-quarkus-kafka/kafka-registry-consumer/pom.xml b/examples/camel-quarkus-kafka/kafka-registry-consumer/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
 	    <groupId>io.apicurio</groupId>
 	    <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- For oauth use case -->

diff --git a/examples/camel-quarkus-kafka/kafka-registry-producer/pom.xml b/examples/camel-quarkus-kafka/kafka-registry-producer/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
 	    <groupId>io.apicurio</groupId>
 	    <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- For oauth use case -->

diff --git a/examples/cloudevents/pom.xml b/examples/cloudevents/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-utils-cloud-events-provider</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/examples/confluent-serdes/pom.xml b/examples/confluent-serdes/pom.xml
@@ -16,12 +16,17 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-schema-registry-client</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
-            <version>${confluent.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -31,7 +36,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.8.1</version>
+            <version>0.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.8.1</version>
+            <version>0.15.0</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/custom-strategy/pom.xml b/examples/custom-strategy/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.8.1</version>
+            <version>0.15.0</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/debezium-openshift/pom.xml b/examples/debezium-openshift/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.apicurio</groupId>
         <artifactId>apicurio-registry-examples</artifactId>
-        <version>2.5.12-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>io.apicurio</groupId>
                 <artifactId>apicurio-registry-maven-plugin</artifactId>
-                <version>${apicurio-registry.version}</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>

diff --git a/examples/mix-avro/pom.xml b/examples/mix-avro/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.apicurio</groupId>
             <artifactId>apicurio-registry-serdes-avro-serde</artifactId>
-            <version>${apicurio-registry.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.8.1</version>
+            <version>0.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.apicurio</groupId>
     <artifactId>apicurio-registry-examples</artifactId>
     <version>2.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>io.apicurio</groupId>
+        <artifactId>apicurio-registry</artifactId>
+        <version>2.6.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <url>https://www.apicur.io/</url>
     <description>Open Source API &amp; Schema Registry</description>
 
@@ -64,86 +69,47 @@
 
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-
-        <!-- Apicurio Registry Version -->
-        <apicurio-registry.version>${project.version}</apicurio-registry.version>
-
-        <!-- Quarkus -->
-        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
-        <quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
-
         <!-- Kafka -->
-        <kafka.version>2.8.1</kafka.version>
-
-        <!-- Confluent API / client -->
-        <confluent.version>5.5.1</confluent.version>
+        <kafka.version>3.5.0</kafka.version>
 
         <!-- RestEasy -->
         <resteasy.version>4.5.8.Final</resteasy.version>
 
         <!-- Slf4j -->
-        <slf4j.version>1.7.25</slf4j.version>
+        <slf4j.version>2.0.13</slf4j.version>
 
         <!-- Vert.x version -->
         <vertx.version>3.9.5</vertx.version>
 
         <!-- Apicurio REST client-->
-        <apicurio-common-rest-client.version>0.1.14.Final</apicurio-common-rest-client.version>
+        <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version>
 
         <!-- Apicurio schema validation library -->
         <apicurio-registry-schema-validation.version>0.0.4.Final</apicurio-registry-schema-validation.version>
 
         <!-- Plugin Versions -->
-        <quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
-
-        <version.compiler.plugin>3.8.1</version.compiler.plugin>
-        <version.deploy.plugin>2.8.2</version.deploy.plugin>
-        <version.failsafe.plugin>2.22.2</version.failsafe.plugin>
-        <version.javadoc.plugin>3.2.0</version.javadoc.plugin>
-        <version.source.plugin>3.2.1</version.source.plugin>
-        <version.surefire.plugin>2.22.2</version.surefire.plugin>
-        <version.jar.plugin>3.2.0</version.jar.plugin>
-        <version.properties.plugin>1.0.0</version.properties.plugin>
-        <version.dependency.plugin>3.1.2</version.dependency.plugin>
-        <version.assembly.plugin>3.3.0</version.assembly.plugin>
-        <version.resources.plugin>3.2.0</version.resources.plugin>
-        <version.clean.plugin>3.1.0</version.clean.plugin>
+        <version.compiler.plugin>3.13.0</version.compiler.plugin>
+        <version.deploy.plugin>3.1.2</version.deploy.plugin>
+        <version.failsafe.plugin>3.2.5</version.failsafe.plugin>
+        <version.javadoc.plugin>3.6.3</version.javadoc.plugin>
+        <version.source.plugin>3.3.1</version.source.plugin>
+        <version.surefire.plugin>3.2.5</version.surefire.plugin>
+        <version.jar.plugin>3.4.1</version.jar.plugin>
+        <version.properties.plugin>1.2.1</version.properties.plugin>
+        <version.dependency.plugin>3.6.1</version.dependency.plugin>
+        <version.assembly.plugin>3.7.1</version.assembly.plugin>
+        <version.resources.plugin>3.3.1</version.resources.plugin>
+        <version.clean.plugin>3.3.2</version.clean.plugin>
         <version.avro>1.11.0</version.avro>
         <protobuf.version>3.21.6</protobuf.version>
         <!-- Proto -->
         <proto-plugin.version>0.6.1</proto-plugin.version>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
     </properties>
 
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-
     <build>
         <pluginManagement>
             <plugins>
-
-                <plugin>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-maven-plugin</artifactId>
-                    <version>${quarkus-plugin.version}</version>
-                </plugin>
-
-                <!-- Maven -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>properties-maven-plugin</artifactId>
@@ -206,7 +172,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>