From a3a032d5b902c3e125dccd2bc2b41f22861decc1 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 10 Aug 2023 16:58:48 +0100
Subject: Java 17 Upgrade

Updated dependencies to latest versions
Made Java 17 changes
Moved apex dependencies versions to main apex pom

Issue-ID: POLICY-4675
Change-Id: Ia5cd5670a1f024f5402cbd7371162ce3313930ef
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 examples/examples-acm/pom.xml                      | 191 +++++++++++----------
 .../examples/acm/AcmTestRestDmaapEndpoint.java     |  14 +-
 .../apex/examples/acm/TestApexAcmExample.java      |   4 +-
 3 files changed, 107 insertions(+), 102 deletions(-)

(limited to 'examples/examples-acm')

diff --git a/examples/examples-acm/pom.xml b/examples/examples-acm/pom.xml
index 00f674dbe..35680ea16 100644
--- a/examples/examples-acm/pom.xml
+++ b/examples/examples-acm/pom.xml
@@ -19,97 +19,102 @@
   ============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>3.0.0-SNAPSHOT</version>
-   </parent>
-   <artifactId>examples-acm</artifactId>
-   <name>examples-acm</name>
-   <description>Specific code for the APEX acm Example</description>
-   <properties>
-      <policymodel.name>APEXacElementPolicy</policymodel.name>
-      <toscapolicy.name>APEXacElementToscaPolicy</toscapolicy.name>
-      <!-- Update the required node type value for generating a node template -->
-      <nodeType.name>org.onap.nodetypes.policy.MetadataSet</nodeType.name>
-   </properties>
-   <dependencies>
-      <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.services</groupId>
-         <artifactId>services-engine</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
-         <artifactId>plugins-context-schema-json</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
-         <artifactId>plugins-executor-javascript</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
-         <artifactId>plugins-event-carrier-restclient</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
-         <artifactId>events</artifactId>
-         <version>${version.policy.models}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.onap.policy.common</groupId>
-         <artifactId>policy-endpoints</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-   <build>
-      <plugins>
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <configuration>
-             <argLine>-Xss1m</argLine>
-           </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <executions>
-               <!-- Generate the APEX ToscaPolicy JSON file-->
-               <execution>
-                  <id>generate-tosca-policy</id>
-                  <phase>compile</phase>
-                  <goals>
-                     <goal>java</goal>
-                  </goals>
-                  <configuration>
-                     <mainClass>org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain</mainClass>
-                     <classpathScope>compile</classpathScope>
-                     <arguments>
-                        <argument>--command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex</argument>
-                        <argument>--output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json</argument>
-                        <argument>--log-file=${project.build.directory}/${policymodel.name}_policygeneration.log</argument>
-                        <argument>--apex-config-file=${project.basedir}/src/main/resources/examples/config/apexACM/ApexConfig.json</argument>
-                        <argument>--tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json</argument>
-                     </arguments>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
-   </build>
+         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>3.0.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>examples-acm</artifactId>
+    <name>examples-acm</name>
+    <description>Specific code for the APEX acm Example</description>
+    <properties>
+        <policymodel.name>APEXacElementPolicy</policymodel.name>
+        <toscapolicy.name>APEXacElementToscaPolicy</toscapolicy.name>
+        <!-- Update the required node type value for generating a node template -->
+        <nodeType.name>org.onap.nodetypes.policy.MetadataSet</nodeType.name>
+    </properties>
+    <dependencies>
+        <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.services</groupId>
+            <artifactId>services-engine</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
+            <artifactId>plugins-context-schema-json</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
+            <artifactId>plugins-executor-javascript</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
+            <artifactId>plugins-event-carrier-restclient</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
+            <artifactId>events</artifactId>
+            <version>${version.policy.models}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Xss1m</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <!-- Generate the APEX ToscaPolicy JSON file-->
+                    <execution>
+                        <id>generate-tosca-policy</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain</mainClass>
+                            <classpathScope>compile</classpathScope>
+                            <arguments>
+                                <argument>
+                                    --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex
+                                </argument>
+                                <argument>
+                                    --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json
+                                </argument>
+                                <argument>
+                                    --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log
+                                </argument>
+                                <argument>
+                                    --apex-config-file=${project.basedir}/src/main/resources/examples/config/apexACM/ApexConfig.json
+                                </argument>
+                                <argument>
+                                    --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json
+                                </argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java b/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java
index a3af9406c..8aed72080 100644
--- a/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java
+++ b/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation.
+ * Copyright (C) 2022-2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@
 
 package org.onap.policy.apex.examples.acm;
 
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
diff --git a/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java b/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java
index 5b8cbdfe7..9df25e678 100644
--- a/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java
+++ b/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * Copyright (C) 2022 Nordix Foundation.
+ * Copyright (C) 2022-2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ package org.onap.policy.apex.examples.acm;
 
 import static org.awaitility.Awaitility.await;
 
+import jakarta.ws.rs.client.ClientBuilder;
 import java.util.concurrent.TimeUnit;
-import javax.ws.rs.client.ClientBuilder;
 import org.junit.Test;
 import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain;
 import org.onap.policy.apex.service.engine.main.ApexMain;
-- 
cgit