spline #1009 Remove obsolete producer model v1.1

AbsaOSS · Feb 1, 2022 · 11797c2 · 11797c2
1 parent 0395bef
commit 11797c2
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 363 deletions.
diff --git a/kafka-gateway/pom.xml b/kafka-gateway/pom.xml
@@ -46,14 +46,28 @@
         </dependency>
         <dependency>
             <groupId>za.co.absa.spline</groupId>
-            <artifactId>producer-model-v1.1</artifactId>
+            <artifactId>producer-model-mapper</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- current model -->
+
         <dependency>
             <groupId>za.co.absa.spline</groupId>
-            <artifactId>producer-model-mapper</artifactId>
+            <artifactId>producer-model-v1.2</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- deprecated models -->
+
+        <dependency>
+            <groupId>za.co.absa.spline</groupId>
+            <artifactId>producer-model-v1.1</artifactId>
+            <version>0.7.5</version>
+        </dependency>
+
+        <!-- other deps -->
+
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>

diff --git a/producer-model-mapper/pom.xml b/producer-model-mapper/pom.xml
@@ -31,20 +31,35 @@
     <dependencies>
         <dependency>
             <groupId>za.co.absa.spline</groupId>
-            <artifactId>producer-model-v1.1</artifactId>
+            <artifactId>commons</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- current model -->
+
         <dependency>
             <groupId>za.co.absa.spline</groupId>
-            <artifactId>commons</artifactId>
+            <artifactId>producer-model-v1.2</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- deprecated models -->
+
+        <dependency>
+            <groupId>za.co.absa.spline</groupId>
+            <artifactId>producer-model-v1.1</artifactId>
+            <version>0.7.5</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>za.co.absa.spline</groupId>
             <artifactId>producer-model</artifactId>
             <version>0.5.1</version>
+            <optional>true</optional>
         </dependency>
 
+        <!-- other deps -->
+
         <dependency>
             <groupId>io.bfil</groupId>
             <artifactId>automapper_${scala.compat.version}</artifactId>

diff --git a/producer-model/pom.xml b/producer-model/pom.xml
@@ -25,7 +25,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>producer-model-v1.1</artifactId>
+    <artifactId>producer-model-v1.2</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/AttrOrExprRef.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/AttrOrExprRef.scala
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/Attribute.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/Attribute.scala
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/ExecutionEvent.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/ExecutionEvent.scala
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/executionPlan.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/executionPlan.scala
diff --git a/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/expressions.scala b/producer-model/src/main/scala/za/co/absa/spline/producer/model/v1_1/expressions.scala