[release-v1.14] Migrate to Loom-based modules (#1075)

* Remove receiver-vertx and dispatcher-vertx modules (knative-extensions#3791) * Remove receiver-vertx and dispatcher-vertx Signed-off-by: Pierangelo Di Pilato <[email protected]> * Remove vertx-kafka-clients Signed-off-by: Pierangelo Di Pilato <[email protected]> * Remove modules from docs and verify codegen Signed-off-by: Pierangelo Di Pilato <[email protected]> * Remove dispatcher-vertx from benchmark and tests Signed-off-by: Pierangelo Di Pilato <[email protected]> * Add deps Signed-off-by: Pierangelo Di Pilato <[email protected]> --------- Signed-off-by: Pierangelo Di Pilato <[email protected]> * Update Dockerfiles --------- Signed-off-by: Pierangelo Di Pilato <[email protected]> Co-authored-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · May 3, 2024 · 70c0e67 · 70c0e67
1 parent 88e1c46
commit 70c0e67
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 689 deletions.
diff --git a/data-plane/README.md b/data-plane/README.md
@@ -32,10 +32,8 @@ update another one will be created. This allows to not block or use locks.
 ├── core
 ├── dispatcher
 ├── dispatcher-loom
-├── dispatcher-vertx
 ├── receiver
 ├── receiver-loom
-├── receiver-vertx
 ├── contract
 └── tests
 ```
@@ -44,9 +42,7 @@ update another one will be created. This allows to not block or use locks.
 - `core` directory contains the core module, in particular, it contains classes for representing Eventing objects
 - `dispatcher` directory contains the base [_Dispatcher_](#dispatcher) application.
 - `dispatcher-loom` directory contains the [_Dispatcher_](#dispatcher) application's entrypoit that use Loom virtual thread implementation for kafka communication.
-- `dispatcher-vertx` directory contains application's entrypoit that use Vert.x kafka client implementation for kafka communication.
 - `receiver` directory contains the [_Receiver_](#receiver) application.
 - `receiver-loom` directory contains the [_Receiver_](#receiver) application's entrypoit that use Loom virtual thread implementation for kafka communication.
-- `receiver-vertx` directory contains application's entrypoit that use Vert.x kafka client implementation for kafka communication.
 - `contract` directory contains a module in which the protobuf compiler (`protoc`) generates code. Git ignores the
 - `tests` directory contains tests for the whole data-plane.
diff --git a/data-plane/THIRD-PARTY.txt b/data-plane/THIRD-PARTY.txt
@@ -1,5 +1,5 @@
 
-Lists of 236 third-party dependencies.
+Lists of 234 third-party dependencies.
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.4.14 - http://logback.qos.ch/logback-classic)
      (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.4.14 - http://logback.qos.ch/logback-core)
      (Apache License 2.0) brotli4j (com.aayushatharva.brotli4j:brotli4j:1.16.0 - https://github.com/hyperxpro/Brotli4j/brotli4j)
@@ -36,10 +36,8 @@ Lists of 236 third-party dependencies.
      (Unknown license) core (dev.knative.eventing.kafka.broker:core:1.0-SNAPSHOT - no url defined)
      (Unknown license) dispatcher (dev.knative.eventing.kafka.broker:dispatcher:1.0-SNAPSHOT - no url defined)
      (Unknown license) dispatcher-loom (dev.knative.eventing.kafka.broker:dispatcher-loom:1.0-SNAPSHOT - no url defined)
-     (Unknown license) dispatcher-vertx (dev.knative.eventing.kafka.broker:dispatcher-vertx:1.0-SNAPSHOT - no url defined)
      (Unknown license) receiver (dev.knative.eventing.kafka.broker:receiver:1.0-SNAPSHOT - no url defined)
      (Unknown license) receiver-loom (dev.knative.eventing.kafka.broker:receiver-loom:1.0-SNAPSHOT - no url defined)
-     (Unknown license) receiver-vertx (dev.knative.eventing.kafka.broker:receiver-vertx:1.0-SNAPSHOT - no url defined)
      (The Apache Software License, Version 2.0) CloudEvents - API (io.cloudevents:cloudevents-api:2.5.0 - https://cloudevents.github.io/sdk-java/cloudevents-api/)
      (The Apache Software License, Version 2.0) CloudEvents - Core (io.cloudevents:cloudevents-core:2.5.0 - https://cloudevents.github.io/sdk-java/cloudevents-core/)
      (The Apache Software License, Version 2.0) CloudEvents - Vert.x Http Binding (io.cloudevents:cloudevents-http-vertx:2.5.0 - https://cloudevents.github.io/sdk-java/cloudevents-http-vertx/)
@@ -164,7 +162,7 @@ Lists of 236 third-party dependencies.
      (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-codegen (io.vertx:vertx-codegen:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-codegen)
      (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 JUnit 5 support :: Core (io.vertx:vertx-junit5:4.4.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-junit5)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x Kafka Client (io.vertx:vertx-kafka-client:4.4.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-kafka-client)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x Kafka Client (io.vertx:vertx-kafka-client:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-kafka-client)
      (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x metrics implementation for Micrometer.io (io.vertx:vertx-micrometer-metrics:4.5.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-micrometer-metrics)
      (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x OpenTelemetry (io.vertx:vertx-opentelemetry:4.4.7 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-tracing-parent/vertx-opentelemetry)
      (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)

diff --git a/data-plane/benchmarks/pom.xml b/data-plane/benchmarks/pom.xml
@@ -49,10 +49,9 @@
       <version>${jmh.version}</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>dev.knative.eventing.kafka.broker</groupId>
-      <artifactId>dispatcher-vertx</artifactId>
+      <artifactId>dispatcher</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

diff --git a/data-plane/dispatcher-vertx/pom.xml b/data-plane/dispatcher-vertx/pom.xml
diff --git a/...ispatcher-vertx/src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/Main.java b/...ispatcher-vertx/src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/Main.java
diff --git a/...src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/VertxConsumerFactory.java b/...src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/VertxConsumerFactory.java
diff --git a/...x/src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/VertxKafkaConsumer.java b/...x/src/main/java/dev/knative/eventing/kafka/broker/dispatchervertx/VertxKafkaConsumer.java
diff --git a/data-plane/pom.xml b/data-plane/pom.xml
@@ -74,8 +74,6 @@
     <module>core</module>
     <module>receiver</module>
     <module>dispatcher</module>
-    <module>receiver-vertx</module>
-    <module>dispatcher-vertx</module>
     <module>receiver-loom</module>
     <module>dispatcher-loom</module>
   </modules>
@@ -140,21 +138,6 @@
         <version>${antlr.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.vertx</groupId>
-        <artifactId>vertx-kafka-client</artifactId>
-        <version>${vertx.kafka.clients.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>io.vertx</groupId>
         <artifactId>vertx-opentelemetry</artifactId>