From 62028bb5b8c9127f73694b1c7efabe5e109f3017 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 14 Jan 2025 14:22:46 +0000
Subject: Fix apex-pdp image generation

- policies generated with docker profile were missing the
--working-dir argument
- infinispan and hazelcast uplifted and  configurations fixed to
match the latest versions

Issue-ID: POLICY-5192
Change-Id: I4a47c3dbdbbc8e863abaa4097ba00ea31508ffa5
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 examples/examples-acm/pom.xml                      |   3 +-
 .../examples-decisionmaker-sharedcontext/pom.xml   |   4 +-
 examples/examples-grpc/pom.xml                     |   4 +-
 examples/examples-myfirstpolicy/pom.xml            | 352 ++++++++++-----------
 examples/examples-onap-vcpe/pom.xml                |   4 +-
 .../src/main/resources/hazelcast/hazelcast.xml     | 147 +--------
 .../resources/infinispan/default-jgroups-tcp.xml   |  40 +--
 .../src/main/resources/infinispan/infinispan.xml   |  18 +-
 .../pom.xml                                        |   9 +-
 .../infinispan/InfinispanContextDistributor.java   |   7 +-
 .../resources/infinispan/default-jgroups-tcp.xml   |  40 +--
 .../src/main/resources/infinispan/infinispan.xml   |   9 +-
 pom.xml                                            |   7 +-
 13 files changed, 262 insertions(+), 382 deletions(-)

diff --git a/examples/examples-acm/pom.xml b/examples/examples-acm/pom.xml
index 9e6135100..9e2945c6b 100644
--- a/examples/examples-acm/pom.xml
+++ b/examples/examples-acm/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2022 Nordix Foundation.
+   Copyright (C) 2022, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -110,6 +110,7 @@
                                 <argument>
                                     --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json
                                 </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/examples/examples-decisionmaker-sharedcontext/pom.xml b/examples/examples-decisionmaker-sharedcontext/pom.xml
index 5def61b3a..88843f49c 100644
--- a/examples/examples-decisionmaker-sharedcontext/pom.xml
+++ b/examples/examples-decisionmaker-sharedcontext/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2023 Nordix Foundation.
+   Copyright (C) 2023, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -93,6 +93,7 @@
                                 <argument>--log-file=${project.build.directory}/${policymodel.decisionmaker.name}_policygeneration.log</argument>
                                 <argument>--apex-config-file=${project.basedir}/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServerNoModel.json</argument>
                                 <argument>--tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json</argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -111,6 +112,7 @@
                                 <argument>--log-file=${project.build.directory}/${policymodel.decisionmakertwo.name}_policygeneration.log</argument>
                                 <argument>--apex-config-file=${project.basedir}/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServerNoModel_Decision.json</argument>
                                 <argument>--tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplateTwo.json</argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index d23311a05..bf8c84c09 100644
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2020 Nordix Foundation.
+   Copyright (C) 2020, 2025 Nordix Foundation.
    Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
   ================================================================================
@@ -151,6 +151,7 @@
                                 <argument>
                                     --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json
                                 </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -184,6 +185,7 @@
                                 <argument>
                                     --output-node-template-file=${project.build.directory}/classes/${toscapolicy.name}.nodeTemplate.json
                                 </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index ce6a0247e..7495d30c2 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2020,2022 Nordix Foundation.
+   Modifications Copyright (C) 2020,2022,2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,183 +19,183 @@
   ============LICENSE_END=========================================================
 -->
 <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>
-  <parent>
-    <groupId>org.onap.policy.apex-pdp.examples</groupId>
-    <artifactId>examples</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
-  </parent>
+        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>
+    <parent>
+        <groupId>org.onap.policy.apex-pdp.examples</groupId>
+        <artifactId>examples</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
 
-  <artifactId>examples-myfirstpolicy</artifactId>
-  <name>${project.artifactId}</name>
-  <description>Specific code for the Apex MyFirstPolicy Example</description>
+    <artifactId>examples-myfirstpolicy</artifactId>
+    <name>${project.artifactId}</name>
+    <description>Specific code for the Apex MyFirstPolicy Example</description>
 
-  <properties>
-    <policymodel1m.name>MyFirstPolicyModelMvel_0.0.1</policymodel1m.name>
-    <policymodel1j.name>MyFirstPolicyModelJavascript_0.0.1</policymodel1j.name>
-    <policymodel2.name>MyFirstPolicyModel_0.0.1</policymodel2.name>
-    <policymodel3.name>MyFirstPolicyModelSFL_0.0.1</policymodel3.name>
-    <policymodel4.name>MyFirstPolicyModelAvro_0.0.1</policymodel4.name>
-  </properties>
+    <properties>
+        <policymodel1m.name>MyFirstPolicyModelMvel_0.0.1</policymodel1m.name>
+        <policymodel1j.name>MyFirstPolicyModelJavascript_0.0.1</policymodel1j.name>
+        <policymodel2.name>MyFirstPolicyModel_0.0.1</policymodel2.name>
+        <policymodel3.name>MyFirstPolicyModelSFL_0.0.1</policymodel3.name>
+        <policymodel4.name>MyFirstPolicyModelAvro_0.0.1</policymodel4.name>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.model</groupId>
-      <artifactId>model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.core</groupId>
-      <artifactId>core</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.auth</groupId>
-      <artifactId>cli-editor</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
-      <artifactId>plugins-executor-mvel</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
-      <artifactId>plugins-executor-javascript</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.model</groupId>
+            <artifactId>model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.core</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.auth</groupId>
+            <artifactId>cli-editor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
+            <artifactId>plugins-executor-mvel</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
+            <artifactId>plugins-executor-javascript</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <executions>
-          <!-- Generate the APEX Policy JSON files from the APEX CLI command -->
-          <execution>
-            <id>generate-policy1m</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-            <configuration>
-              <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
-              <classpathScope>compile</classpathScope>
-              <arguments>
-                <argument>
-                  --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1m.name}.apex
-                </argument>
-                <argument>
-                  --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1m.name}.json
-                </argument>
-                <argument>
-                  --log-file=${project.build.directory}/${policymodel1m.name}_policygeneration.log
-                </argument>
-                <argument>--working-dir=${project.basedir}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-policy1j</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-            <configuration>
-              <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
-              <classpathScope>compile</classpathScope>
-              <arguments>
-                <argument>
-                  --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1j.name}.apex
-                </argument>
-                <argument>
-                  --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1j.name}.json
-                </argument>
-                <argument>
-                  --log-file=${project.build.directory}/${policymodel1j.name}_policygeneration.log
-                </argument>
-                <argument>--working-dir=${project.basedir}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-policy2</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-            <configuration>
-              <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
-              <classpathScope>compile</classpathScope>
-              <arguments>
-                <argument>
-                  --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/2/${policymodel2.name}.apex
-                </argument>
-                <argument>
-                  --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/2/${policymodel2.name}.json
-                </argument>
-                <argument>
-                  --log-file=${project.build.directory}/${policymodel2.name}_policygeneration.log
-                </argument>
-                <argument>--working-dir=${project.basedir}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-policy3</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-            <configuration>
-              <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
-              <classpathScope>compile</classpathScope>
-              <arguments>
-                <argument>
-                  --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/3/${policymodel3.name}.apex
-                </argument>
-                <argument>
-                  --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/3/${policymodel3.name}.json
-                </argument>
-                <argument>
-                  --log-file=${project.build.directory}/${policymodel3.name}_policygeneration.log
-                </argument>
-                <argument>--working-dir=${project.basedir}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-policy4</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>java</goal>
-            </goals>
-            <configuration>
-              <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
-              <classpathScope>compile</classpathScope>
-              <arguments>
-                <argument>
-                  --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/4/${policymodel4.name}.apex
-                </argument>
-                <argument>
-                  --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/4/${policymodel4.name}.json
-                </argument>
-                <argument>
-                  --log-file=${project.build.directory}/${policymodel4.name}_policygeneration.log
-                </argument>
-                <argument>--working-dir=${project.basedir}</argument>
-              </arguments>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <!-- Generate the APEX Policy JSON files from the APEX CLI command -->
+                    <execution>
+                        <id>generate-policy1m</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1m.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1m.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel1m.name}_policygeneration.log
+                                </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-policy1j</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/1/${policymodel1j.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/1/${policymodel1j.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel1j.name}_policygeneration.log
+                                </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-policy2</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/2/${policymodel2.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/2/${policymodel2.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel2.name}_policygeneration.log
+                                </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-policy3</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/3/${policymodel3.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/3/${policymodel3.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel3.name}_policygeneration.log
+                                </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-policy4</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/examples/models/MyFirstPolicy/4/${policymodel4.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-model-file=${project.build.directory}/classes/examples/models/MyFirstPolicy/4/${policymodel4.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel4.name}_policygeneration.log
+                                </argument>
+                                <argument>--working-dir=${project.basedir}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index c18ef88f2..f64a24ecf 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -133,6 +133,7 @@
                                 <argument>--log-file=${project.build.directory}/${policymodel.name}_policygeneration.log</argument>
                                 <argument>--apex-config-file=${project.basedir}/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json</argument>
                                 <argument>--tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json</argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
@@ -170,6 +171,7 @@
                                 <argument>--log-file=${project.build.directory}/${policymodelstandalone.name}_policygeneration.log</argument>
                                 <argument>--apex-config-file=${project.basedir}/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig.json</argument>
                                 <argument>--tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json</argument>
+                                <argument>--working-dir=${project.basedir}</argument>
                             </arguments>
                         </configuration>
                     </execution>
diff --git a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
index b0847f295..e9cc99bf2 100644
--- a/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/hazelcast/hazelcast.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,12 +20,9 @@
   ============LICENSE_END=========================================================
 -->
 <hazelcast xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <group>
-        <name>HazelcastGroup3.0EVAL</name>
-        <password>password3.0EVAL</password>
-    </group>
+    <cluster-name>HazelcastGroup3.0EVAL</cluster-name>
     <network>
-        <port auto-increment="true">5706</port>
+        <port>5706</port>
         <join>
             <multicast enabled="false">
                 <multicast-group>224.2.2.10</multicast-group>
@@ -35,8 +33,7 @@
                 <!-- members>192.168.219.141</members-->
             </tcp-ip>
         </join>
-        <interfaces enabled="false">
-            <!-- This value will allow hazelcast to run locally from the IDE -->
+        <interfaces>
             <interface>127.0.0.*</interface>
         </interfaces>
     </network>
@@ -51,171 +48,55 @@
     <executor-service>
         <pool-size>16</pool-size>
     </executor-service>
-    <queue name="default">
-        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>100000</max-size>
-        <!-- Maximum number of seconds for each item to stay in the queue. Items 
-            that are not consumed in <time-to-live-seconds> will automatically get evicted 
-            from the queue. Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. 
-            Default is 0. -->
-    </queue>
     <map name="default">
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
         <backup-count>1</backup-count>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>0</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>25</eviction-percentage>
+        <eviction eviction-policy="NONE"/>
     </map>
 
     <map name="CommonCache">
-
-
-        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
-            then all entries of the map will be copied to another JVM for fail-safety. 
-            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
-
-        <!-- Can we read the local backup entries? Default value is false for strong 
-            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>LRU</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>3000000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>5</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="LRU" size="3000000"/>
         <time-to-live-seconds>7200</time-to-live-seconds>
-
-
     </map>
 
     <map name="CommonDataCache">
-
-
-        <!-- Number of async-backups. If 1 is set as the backup-count for example, 
-            then all entries of the map will be copied to another JVM for fail-safety. 
-            Valid numbers are 0 (no backup), 1, 2, 3. -->
         <async-backup-count>1</async-backup-count>
-
-        <!-- Can we read the local backup entries? Default value is false for strong 
-            consistency. Being able to read backup data will give you greater performance. -->
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>LRU</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>3000000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>5</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="LRU" size="3000000"/>
         <time-to-live-seconds>7200</time-to-live-seconds>
-
     </map>
 
 
     <queue name="raw-distributer-queue">
-        <!-- Maximum size of the queue. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
-    <map name="queue-map">
 
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
+    <map name="queue-map">
         <backup-count>0</backup-count>
-
     </map>
 
     <map name="TOPIC-TASK-MAP">
-
         <async-backup-count>3</async-backup-count>
-
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>1000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>0</eviction-percentage>
-
-
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="NONE" size="1000"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
-    <map name="TOPIC-REGISTRY">
 
+    <map name="TOPIC-REGISTRY">
         <async-backup-count>3</async-backup-count>
-
         <read-backup-data>true</read-backup-data>
-        <!-- Valid values are: NONE (no eviction), LRU (Least Recently Used), LFU 
-            (Least Frequiently Used). NONE is the default. -->
-        <eviction-policy>NONE</eviction-policy>
-        <!-- Maximum size of the map. When max size is reached, map is evicted 
-            based on the policy defined. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
-        <max-size>1000</max-size>
-        <!-- When max. size is reached, specified percentage of the map will be 
-            evicted. Any integer between 0 and 100. If 25 is set for example, 25% of 
-            the entries will get evicted. -->
-        <eviction-percentage>0</eviction-percentage>
-
-        <!-- Maximum number of seconds for each entry to stay in the map. Entries 
-            that are older than <time-to-live-seconds> and not updated for <time-to-live-seconds> 
-            will get automatically evicted from the map. Any integer between 0 and Integer.MAX_VALUE. 
-            0 means infinite. Default is 0. -->
+        <eviction eviction-policy="NONE" size="1000"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
+
     <queue name="Pooled-Topic-Request-Queue">
-        <!-- Maximum size of the queue.Any integer between 0 and Integer.MAX_VALUE. 
-            0 means Integer.MAX_VALUE. Default is 0. -->
         <max-size>100000</max-size>
     </queue>
-    <map name="Pooled-Topic-Request-Queue-Backup-map">
 
-        <!-- Number of backups. If 1 is set as the backup-count for example, then 
-            all entries of the map will be copied to another JVM for fail-safety. Valid 
-            numbers are 0 (no backup), 1, 2, 3. -->
+    <map name="Pooled-Topic-Request-Queue-Backup-map">
         <backup-count>1</backup-count>
-        <eviction-policy>NONE</eviction-policy>
+        <eviction eviction-policy="NONE"/>
         <time-to-live-seconds>0</time-to-live-seconds>
     </map>
 
diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
index 028cf1df6..11658990a 100644
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/infinispan/default-jgroups-tcp.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +22,8 @@
 
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.3.xsd">
+
    <TCP bind_addr="${jgroups.tcp.address:127.0.0.1}"
         bind_port="${jgroups.tcp.port:7800}"
         enable_diagnostics="false"
@@ -29,48 +31,36 @@
         send_buf_size="640k"
         sock_conn_timeout="300"
         bundler_type="no-bundler"
-
         thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
         thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
-        thread_pool.keep_alive_time="60000"
-   />
+        thread_pool.keep_alive_time="60000" />
+
    <MPING bind_addr="${jgroups.tcp.address:127.0.0.1}"
           mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
           mcast_port="${jgroups.mping.mcast_port:43366}"
-          ip_ttl="${jgroups.udp.ip_ttl:2}" 
-   />
-   <MERGE3 min_interval="10000" 
-           max_interval="30000" 
-   />
+          ip_ttl="${jgroups.udp.ip_ttl:2}" />
+
+   <MERGE3 min_interval="10000" max_interval="30000" />
    <FD_SOCK />
-   <FD_ALL timeout="60000" 
-           interval="15000" 
-           timeout_check_interval="5000" 
-   />
+   <FD_ALL timeout="60000" interval="15000" timeout_check_interval="5000" />
    <VERIFY_SUSPECT timeout="5000" />
    <pbcast.NAKACK2 use_mcast_xmit="false"
                    xmit_interval="100"
                    xmit_table_num_rows="50"
                    xmit_table_msgs_per_row="1024"
                    xmit_table_max_compaction_time="30000"
-                   resend_last_seqno="true"
-   />
+                   resend_last_seqno="true" />
    <UNICAST3 xmit_interval="100"
              xmit_table_num_rows="50"
              xmit_table_msgs_per_row="1024"
              xmit_table_max_compaction_time="30000"
-             conn_expiry_timeout="0"
-   />
+             conn_expiry_timeout="0" />
    <pbcast.STABLE stability_delay="500"
                   desired_avg_gossip="5000"
-                  max_bytes="1M"
-   />
+                  max_bytes="1M" />
    <pbcast.GMS print_local_addr="false"
                install_view_locally_first="true"
-               join_timeout="${jgroups.join_timeout:5000}"
-   />
-   <MFC max_credits="2m" 
-        min_threshold="0.40"
-   />
-   <FRAG3/>
+               join_timeout="${jgroups.join_timeout:5000}" />
+   <MFC max_credits="2m" min_threshold="0.40" />
+   <FRAG3 />
 </config>
diff --git a/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
index 5b416f50d..da85f787e 100644
--- a/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/infinispan/infinispan.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,23 +20,24 @@
   ============LICENSE_END=========================================================
 -->
 
-<infinispan xmlns="urn:infinispan:config:8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:infinispan:config:8.0 http://infinispan.org/schemas/infinispan-config-8.0.xsd">
+<infinispan xmlns="urn:infinispan:config:14.0" 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">
+
     <jgroups>
-        <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml" />
+        <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml"/>
     </jgroups>
 
     <cache-container name="ApexCacheContainer" default-cache="TestContext_0.0.1">
-        <transport cluster="apexCluster" stack="external-file" />
-        <jmx />
+        <transport cluster="apexCluster" stack="external-file"/>
+        <jmx enabled="true"/>
         <replicated-cache name="LargeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
         <replicated-cache name="LongSameTypeContextMap_0.0.1" mode="SYNC" statistics="true">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
         <replicated-cache name="TestContext_0.0.1" mode="SYNC">
-            <state-transfer enabled="true" />
+            <state-transfer enabled="true"/>
         </replicated-cache>
     </cache-container>
 </infinispan>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index 31c601c3f..775e2f68c 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2023 Nordix Foundation.
+   Modifications Copyright (C) 2023, 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -43,6 +43,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-component-annotations</artifactId>
+            <version>${version.infinispan}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>
 
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
index 346d23db8..58c20032a 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/java/org/onap/policy/apex/plugins/context/distribution/infinispan/InfinispanContextDistributor.java
@@ -1,7 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2025 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +87,7 @@ public class InfinispanContextDistributor extends AbstractDistributor {
      */
     @Override
     public Map<String, Object> getContextAlbumMap(final AxArtifactKey contextAlbumKey) {
-        LOGGER.info("InfinispanContextDistributor: create album: " + contextAlbumKey.getId());
+        LOGGER.info("InfinispanContextDistributor: create album: {}", contextAlbumKey.getId());
 
         // Get the Cache from Infinispan
         return infinispanManager.getCacheManager().getCache(contextAlbumKey.getId().replace(':', '_'));
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/default-jgroups-tcp.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/default-jgroups-tcp.xml
index 028cf1df6..11658990a 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/default-jgroups-tcp.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/default-jgroups-tcp.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +22,8 @@
 
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.3.xsd">
+
    <TCP bind_addr="${jgroups.tcp.address:127.0.0.1}"
         bind_port="${jgroups.tcp.port:7800}"
         enable_diagnostics="false"
@@ -29,48 +31,36 @@
         send_buf_size="640k"
         sock_conn_timeout="300"
         bundler_type="no-bundler"
-
         thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
         thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
-        thread_pool.keep_alive_time="60000"
-   />
+        thread_pool.keep_alive_time="60000" />
+
    <MPING bind_addr="${jgroups.tcp.address:127.0.0.1}"
           mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
           mcast_port="${jgroups.mping.mcast_port:43366}"
-          ip_ttl="${jgroups.udp.ip_ttl:2}" 
-   />
-   <MERGE3 min_interval="10000" 
-           max_interval="30000" 
-   />
+          ip_ttl="${jgroups.udp.ip_ttl:2}" />
+
+   <MERGE3 min_interval="10000" max_interval="30000" />
    <FD_SOCK />
-   <FD_ALL timeout="60000" 
-           interval="15000" 
-           timeout_check_interval="5000" 
-   />
+   <FD_ALL timeout="60000" interval="15000" timeout_check_interval="5000" />
    <VERIFY_SUSPECT timeout="5000" />
    <pbcast.NAKACK2 use_mcast_xmit="false"
                    xmit_interval="100"
                    xmit_table_num_rows="50"
                    xmit_table_msgs_per_row="1024"
                    xmit_table_max_compaction_time="30000"
-                   resend_last_seqno="true"
-   />
+                   resend_last_seqno="true" />
    <UNICAST3 xmit_interval="100"
              xmit_table_num_rows="50"
              xmit_table_msgs_per_row="1024"
              xmit_table_max_compaction_time="30000"
-             conn_expiry_timeout="0"
-   />
+             conn_expiry_timeout="0" />
    <pbcast.STABLE stability_delay="500"
                   desired_avg_gossip="5000"
-                  max_bytes="1M"
-   />
+                  max_bytes="1M" />
    <pbcast.GMS print_local_addr="false"
                install_view_locally_first="true"
-               join_timeout="${jgroups.join_timeout:5000}"
-   />
-   <MFC max_credits="2m" 
-        min_threshold="0.40"
-   />
-   <FRAG3/>
+               join_timeout="${jgroups.join_timeout:5000}" />
+   <MFC max_credits="2m" min_threshold="0.40" />
+   <FRAG3 />
 </config>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml
index 5b416f50d..22862c96b 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/main/resources/infinispan/infinispan.xml
@@ -2,6 +2,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2016-2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2025 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -19,15 +20,16 @@
   ============LICENSE_END=========================================================
 -->
 
-<infinispan xmlns="urn:infinispan:config:8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:infinispan:config:8.0 http://infinispan.org/schemas/infinispan-config-8.0.xsd">
+<infinispan xmlns="urn:infinispan:config:14.0" 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">
+
     <jgroups>
         <stack-file name="external-file" path="infinispan/default-jgroups-tcp.xml" />
     </jgroups>
 
     <cache-container name="ApexCacheContainer" default-cache="TestContext_0.0.1">
         <transport cluster="apexCluster" stack="external-file" />
-        <jmx />
+        <jmx enabled="true" />
         <replicated-cache name="LargeContextMap_0.0.1" mode="SYNC" statistics="true">
             <state-transfer enabled="true" />
         </replicated-cache>
@@ -39,3 +41,4 @@
         </replicated-cache>
     </cache-container>
 </infinispan>
+
diff --git a/pom.xml b/pom.xml
index 573945981..efe011a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020, 2022-2024 Nordix Foundation.
+   Modifications Copyright (C) 2019-2020, 2022-2025 Nordix Foundation.
    Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020-2021 Bell Canada.
   ================================================================================
@@ -40,7 +40,6 @@
     <description>Packaging for all the Apex components, the engine, the WAR service, and the editor.</description>
 
     <properties>
-        <encoding>UTF-8</encoding>
         <file.encoding>UTF-8</file.encoding>
         <sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info
         </sonar.javascript.lcov.reportPaths>
@@ -57,8 +56,8 @@
         <version.avro>1.11.3</version.avro>
         <version.caffeine>3.1.8</version.caffeine>
         <version.curator>5.5.0</version.curator>
-        <version.hazelcast>5.3.5</version.hazelcast>
-        <version.infinispan>14.0.13.Final</version.infinispan>
+        <version.hazelcast>5.3.8</version.hazelcast>
+        <version.infinispan>14.0.33.Final</version.infinispan>
         <version.jgroups>5.2.18.Final</version.jgroups>
         <version.jms>3.1.0</version.jms>
         <version.jnr.jffi>1.3.12</version.jnr.jffi>
-- 
cgit