From da6e5067d1848f3ae8ed312e3c867d5b8f810342 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Tue, 25 Jul 2023 16:06:58 +0900
Subject: [PATCH] [DROOLS-7513] Upgrade Infinispan to 14.0.13.Final - Solves
 ISPN-15071

---
 build-parent/pom.xml                          |   1 +
 .../infinispan-local.xml                      |  53 -----
 .../drools-reliability-infinispan/pom.xml     | 196 +-----------------
 .../drools-reliability-tests/pom.xml          |   3 +-
 4 files changed, 3 insertions(+), 250 deletions(-)
 delete mode 100644 drools-reliability/drools-reliability-infinispan/infinispan-remote-config/infinispan-local.xml

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 1141ce4da65..f01825ce2ca 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -80,6 +80,7 @@
     <version.org.hamcrest>1.3</version.org.hamcrest>
     <version.org.hibernate>5.6.12.Final</version.org.hibernate>
     <version.org.hsqldb>2.3.0</version.org.hsqldb>
+    <version.org.infinispan>14.0.13.Final</version.org.infinispan>
     <version.org.javassist>3.26.0-GA</version.org.javassist>
     <version.org.jboss.narayana.tomcat>5.13.1.Final</version.org.jboss.narayana.tomcat>
     <version.org.jboss.transaction.spi>7.6.1.Final</version.org.jboss.transaction.spi>
diff --git a/drools-reliability/drools-reliability-infinispan/infinispan-remote-config/infinispan-local.xml b/drools-reliability/drools-reliability-infinispan/infinispan-remote-config/infinispan-local.xml
deleted file mode 100644
index b6f6b768516..00000000000
--- a/drools-reliability/drools-reliability-infinispan/infinispan-remote-config/infinispan-local.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<infinispan
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:infinispan:config:14.0 https://infinispan.org/schemas/infinispan-config-14.0.xsd
-                            urn:infinispan:server:14.0 https://infinispan.org/schemas/infinispan-server-14.0.xsd"
-      xmlns="urn:infinispan:config:14.0"
-      xmlns:server="urn:infinispan:server:14.0">
-
-   <cache-container name="default" statistics="true">
-      <!-- no transport = local cache -->
-      <security>
-         <authorization/>
-      </security>
-   </cache-container>
-
-   <server xmlns="urn:infinispan:server:14.0">
-      <interfaces>
-         <interface name="public">
-            <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
-         </interface>
-      </interfaces>
-
-      <socket-bindings default-interface="public" port-offset="${infinispan.socket.binding.port-offset:0}">
-         <socket-binding name="default" port="${infinispan.bind.port:11222}"/>
-         <socket-binding name="memcached" port="11221"/>
-      </socket-bindings>
-
-      <security>
-         <credential-stores>
-            <credential-store name="credentials" path="credentials.pfx">
-               <clear-text-credential clear-text="secret"/>
-            </credential-store>
-         </credential-stores>
-         <security-realms>
-            <security-realm name="default">
-               <!-- Uncomment to enable TLS on the realm -->
-               <!-- server-identities>
-                  <ssl>
-                     <keystore path="application.keystore"
-                               password="password" alias="server"
-                               generate-self-signed-certificate-host="localhost"/>
-                  </ssl>
-               </server-identities-->
-               <properties-realm groups-attribute="Roles">
-                  <user-properties path="users.properties"/>
-                  <group-properties path="groups.properties"/>
-               </properties-realm>
-            </security-realm>
-         </security-realms>
-      </security>
-
-      <endpoints socket-binding="default" security-realm="default" />
-   </server>
-</infinispan>
diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml b/drools-reliability/drools-reliability-infinispan/pom.xml
index 7f11166ffb3..ffb87b57ffe 100644
--- a/drools-reliability/drools-reliability-infinispan/pom.xml
+++ b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -15,8 +15,6 @@
 
   <properties>
     <java.module.name>org.drools.reliability.infinispan</java.module.name>
-    <version.infinispan>14.0.6.Final</version.infinispan>
-    <version.testcontainers>1.17.2</version.testcontainers>
   </properties>
 
   <dependencyManagement>
@@ -24,16 +22,10 @@
       <dependency>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-bom</artifactId>
-        <version>${version.infinispan}</version>
+        <version>${version.org.infinispan}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.testcontainers</groupId>
-        <artifactId>junit-jupiter</artifactId>
-        <version>${version.testcontainers}</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -55,88 +47,6 @@
       <groupId>org.drools</groupId>
       <artifactId>drools-reliability-core</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-server-testdriver-core</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.infinispan</groupId>
-          <artifactId>infinispan-jboss-marshalling</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-component-annotations</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency><!-- For unit test logging: configure in src/test/resources/logback-test.xml -->
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-model-codegen</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -173,108 +83,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <!-- override default-test for embedded -->
-                <id>default-test</id>
-                <configuration>
-                  <excludes>
-                    <exclude>**/*SmokeTest.java</exclude>
-                  </excludes>
-                </configuration>
-              </execution>
-              <execution>
-                <id>smoke-tests-remote</id>
-                <configuration>
-                  <systemPropertyVariables>
-                    <drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
-                  </systemPropertyVariables>
-                  <includes>
-                    <include>**/smoke/remote/*SmokeTest.java</include>
-                  </includes>
-                </configuration>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>smoke-tests-remote-proto</id>
-                <configuration>
-                  <systemPropertyVariables>
-                    <drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
-                    <drools.reliability.storage.infinispan.marshaller>PROTOSTREAM</drools.reliability.storage.infinispan.marshaller>
-                    <drools.reliability.storage.infinispan.serialization.context.initializer>org.drools.reliability.infinispan.proto.TestProtoStreamSchemaImpl</drools.reliability.storage.infinispan.serialization.context.initializer>
-                  </systemPropertyVariables>
-                  <includes>
-                    <include>**/smoke/proto/*SmokeTest.java</include>
-                  </includes>
-                </configuration>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>remote</id>
-      <activation>
-        <property>
-          <name>remote</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- override default-test from embedded to remote -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <systemPropertyVariables>
-                <drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>remote-proto</id>
-      <activation>
-        <property>
-          <name>remote-proto</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <!-- override default-test with Remote+ProtoStream -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <systemPropertyVariables>
-                <drools.reliability.storage.infinispan.mode>REMOTE</drools.reliability.storage.infinispan.mode>
-                <drools.reliability.storage.infinispan.marshaller>PROTOSTREAM</drools.reliability.storage.infinispan.marshaller>
-                <drools.reliability.storage.infinispan.serialization.context.initializer>org.drools.reliability.infinispan.proto.TestProtoStreamSchemaImpl</drools.reliability.storage.infinispan.serialization.context.initializer>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
\ No newline at end of file
diff --git a/drools-reliability/drools-reliability-tests/pom.xml b/drools-reliability/drools-reliability-tests/pom.xml
index 204605546ba..965223ca90a 100644
--- a/drools-reliability/drools-reliability-tests/pom.xml
+++ b/drools-reliability/drools-reliability-tests/pom.xml
@@ -15,7 +15,6 @@
 
   <properties>
     <java.module.name>org.drools.reliability.infinispan</java.module.name>
-    <version.infinispan>14.0.6.Final</version.infinispan>
     <version.testcontainers>1.17.2</version.testcontainers>
   </properties>
 
@@ -24,7 +23,7 @@
       <dependency>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-bom</artifactId>
-        <version>${version.infinispan}</version>
+        <version>${version.org.infinispan}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>