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 +-
 5 files changed, 187 insertions(+), 180 deletions(-)

(limited to 'examples')

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>
-- 
cgit