From 56cc14bb50f548f2dcab2b3efa6ce4ff7125a221 Mon Sep 17 00:00:00 2001
From: Jiri Pechanec <jpechane@redhat.com>
Date: Wed, 11 Jan 2023 10:03:49 +0100
Subject: [PATCH] DBZ-5986 Unify Infinispan version for Oracle and sink

---
 debezium-bom/pom.xml                                          | 4 ----
 debezium-server/debezium-server-bom/pom.xml                   | 1 -
 debezium-server/debezium-server-infinispan/pom.xml            | 1 +
 .../infinispan/InfinispanTestResourceLifecycleManager.java    | 2 +-
 pom.xml                                                       | 4 ++++
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml
index a6b6ba3ee..f334e7e6e 100644
--- a/debezium-bom/pom.xml
+++ b/debezium-bom/pom.xml
@@ -26,10 +26,6 @@
         <version.joda>2.10.1</version.joda>
         <version.google.protos>1.17.0</version.google.protos>
 
-        <!-- Oracle dependencies -->
-        <version.infinispan>14.0.2.Final</version.infinispan>
-        <version.infinispan.protostream>4.5.0.Final</version.infinispan.protostream>
-
         <!-- Tracing -->
         <version.opentracing.strimzi>0.33.0</version.opentracing.strimzi>
 
diff --git a/debezium-server/debezium-server-bom/pom.xml b/debezium-server/debezium-server-bom/pom.xml
index f572f5546..7142385db 100644
--- a/debezium-server/debezium-server-bom/pom.xml
+++ b/debezium-server/debezium-server-bom/pom.xml
@@ -19,7 +19,6 @@
         <version.pravega>0.9.1</version.pravega>
         <version.nats>2.16.3</version.nats>
         <version.stan>2.2.3</version.stan>
-        <version.infinispan>14.0.4.Final</version.infinispan>
 
         <version.commons.logging>1.2</version.commons.logging>
     </properties>
diff --git a/debezium-server/debezium-server-infinispan/pom.xml b/debezium-server/debezium-server-infinispan/pom.xml
index 60484db70..4fc86929a 100644
--- a/debezium-server/debezium-server-infinispan/pom.xml
+++ b/debezium-server/debezium-server-infinispan/pom.xml
@@ -89,6 +89,7 @@
                     <enableAssertions>true</enableAssertions>
                     <systemProperties>
                         <test.type>IT</test.type>
+                        <tag.infinispan>${version.infinispan}</tag.infinispan>
                     </systemProperties>
                     <runOrder>${runOrder}</runOrder>
                 </configuration>
diff --git a/debezium-server/debezium-server-infinispan/src/test/java/io/debezium/server/infinispan/InfinispanTestResourceLifecycleManager.java b/debezium-server/debezium-server-infinispan/src/test/java/io/debezium/server/infinispan/InfinispanTestResourceLifecycleManager.java
index 4fa41bd88..53800f2f4 100644
--- a/debezium-server/debezium-server-infinispan/src/test/java/io/debezium/server/infinispan/InfinispanTestResourceLifecycleManager.java
+++ b/debezium-server/debezium-server-infinispan/src/test/java/io/debezium/server/infinispan/InfinispanTestResourceLifecycleManager.java
@@ -20,7 +20,7 @@
 public class InfinispanTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InfinispanTestResourceLifecycleManager.class);
-    public static final String INFINISPAN_IMAGE = "quay.io/infinispan/server:14.0.4.Final";
+    public static final String INFINISPAN_IMAGE = "quay.io/infinispan/server:" + System.getProperty("tag.infinispan", "latest");
     public static final int PORT = ConfigurationProperties.DEFAULT_HOTROD_PORT;
     public static final String CONFIG_PATH = "/etc/infinispan-local.xml";
     private static final GenericContainer<?> container = new GenericContainer<>(INFINISPAN_IMAGE)
diff --git a/pom.xml b/pom.xml
index d7ad6f22b..12cfed187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,10 @@
 
         <!-- Required in protoc plug-in config, too; can't be in BOM therefore -->
         <version.com.google.protobuf>3.19.6</version.com.google.protobuf>
+
+        <!-- Infinispan version for Oracle and Debezium Server sink -->
+        <version.infinispan>14.0.4.Final</version.infinispan>
+        <version.infinispan.protostream>4.5.0.Final</version.infinispan.protostream>
     </properties>
 
     <modules>