From fc19178b956f4474ed14e810fd911ac60f3756d0 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 30 Aug 2023 14:57:10 +0100
Subject: Upgrade Java 17 in policy-drools-apps

Issue-ID: POLICY-4816
Change-Id: I61d5c2c0b8bf2cc08416d91bbd84f27f2ed5c5c1
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 controlloop/packages/apps-controlloop/pom.xml      | 146 +++++++++++----------
 controlloop/packages/artifacts-controlloop/pom.xml |  88 +++++++------
 controlloop/packages/basex-controlloop/pom.xml     |   5 +-
 controlloop/packages/docker-controlloop/pom.xml    |  14 +-
 .../src/main/assembly/assembly.xml                 |   4 +-
 controlloop/packages/pom.xml                       |  79 +++++------
 6 files changed, 172 insertions(+), 164 deletions(-)

(limited to 'controlloop/packages')

diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index 343c197d4..cb6f2c891 100644
--- a/controlloop/packages/apps-controlloop/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019-2020 Bell Canada.
+  Modifications Copyright (C) 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.
@@ -19,83 +20,84 @@
   ============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>
-  <packaging>pom</packaging>
+<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>
+    <packaging>pom</packaging>
 
-  <parent>
-    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>drools-applications-packages</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
+    <parent>
+        <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+        <artifactId>drools-applications-packages</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+    </parent>
 
-  <artifactId>apps-controlloop</artifactId>
+    <artifactId>apps-controlloop</artifactId>
 
-  <name>apps-controlloop</name>
-  <description>Drools Applications Installation Package</description>
+    <name>apps-controlloop</name>
+    <description>Drools Applications Installation Package</description>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-complete-zip</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/assembly/zip.xml</descriptor>
-              </descriptors>
-              <appendAssemblyId>false</appendAssemblyId>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-complete-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <!--  List any dependencies here that should be included in the control loop app zip -->
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-      <artifactId>basex-controlloop</artifactId>
-      <version>${project.version}</version>
-      <type>tar.gz</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-      <artifactId>artifacts-controlloop</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>feature-controlloop-management</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>feature-controlloop-utils</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>feature-controlloop-trans</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>feature-controlloop-usecases</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-    </dependency>
-  </dependencies>
+    <!--  List any dependencies here that should be included in the control loop app zip -->
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+            <artifactId>basex-controlloop</artifactId>
+            <version>${project.version}</version>
+            <type>tar.gz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+            <artifactId>artifacts-controlloop</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+            <artifactId>feature-controlloop-management</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+            <artifactId>feature-controlloop-utils</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+            <artifactId>feature-controlloop-trans</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+            <artifactId>feature-controlloop-usecases</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
 
 </project>
 
diff --git a/controlloop/packages/artifacts-controlloop/pom.xml b/controlloop/packages/artifacts-controlloop/pom.xml
index 32fd5e058..b1511b883 100644
--- a/controlloop/packages/artifacts-controlloop/pom.xml
+++ b/controlloop/packages/artifacts-controlloop/pom.xml
@@ -4,13 +4,14 @@
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2020 Bell Canada.
+  Modifications Copyright (C) 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.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,45 +20,46 @@
   ============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>
-  <packaging>pom</packaging>
-
-  <parent>
-    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-    <artifactId>drools-applications-packages</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>artifacts-controlloop</artifactId>
-
-  <name>artifacts-controlloop</name>
-  <description>Companion artifacts for a drools application to install in nexus repository</description>
-
-  <build>
-    <plugins>
-      <plugin>
-	<artifactId>maven-assembly-plugin</artifactId>
-	<executions>
-	  <execution>
-	    <goals>
-	      <goal>single</goal>
-	    </goals>
-	    <phase>package</phase>
-	    <configuration>
-	      <descriptors>
-		        <descriptor>src/assembly/zip.xml</descriptor>
-	      </descriptors>
-	      <appendAssemblyId>false</appendAssemblyId>
-	    </configuration>
-	  </execution>
-	</executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-      <!-- Placed here any Control Loop Application Dependencies to be
-           installed in local nexus instance: currently none necessary -->
-  </dependencies>
+<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>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+        <artifactId>drools-applications-packages</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>artifacts-controlloop</artifactId>
+
+    <name>artifacts-controlloop</name>
+    <description>Companion artifacts for a drools application to install in nexus repository</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/zip.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- Placed here any Control Loop Application Dependencies to be
+             installed in local nexus instance: currently none necessary -->
+    </dependencies>
 </project>
diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml
index 0f12cde9e..2f063feff 100644
--- a/controlloop/packages/basex-controlloop/pom.xml
+++ b/controlloop/packages/basex-controlloop/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2020 Bell Canada.
+  Modifications Copyright (C) 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 +21,14 @@
   -->
 
 <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">
+         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>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
         <artifactId>drools-applications-packages</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>basex-controlloop</artifactId>
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml
index a21b585d8..2cc834387 100644
--- a/controlloop/packages/docker-controlloop/pom.xml
+++ b/controlloop/packages/docker-controlloop/pom.xml
@@ -21,13 +21,13 @@
   -->
 
 <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">
+         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.drools-applications.controlloop.packages</groupId>
         <artifactId>drools-applications-packages</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>docker-controlloop</artifactId>
     <packaging>pom</packaging>
@@ -36,7 +36,6 @@
     <description>ONAP Policy Control Loop PDP-D Docker Build</description>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <dist.project.version>${project.version}</dist.project.version>
         <docker.skip>false</docker.skip>
@@ -76,7 +75,9 @@
              replace the parameterized base-image version. The fabric8.io docker-maven-plugin shall use this filtered file
              to build the image. After the image is built we perform a cleanup to remove the filtered file.-->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>update-parameterized-dockerfile</id>
@@ -85,13 +86,14 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks>
-                                <copy file="src/main/docker/Dockerfile" toFile="${project.build.directory}/docker-tmp/Dockerfile">
+                            <target>
+                                <copy file="src/main/docker/Dockerfile"
+                                      toFile="${project.build.directory}/docker-tmp/Dockerfile">
                                     <filterset>
                                         <filter token="version.policy.drools-pdp" value="${version.policy.drools-pdp}"/>
                                     </filterset>
                                 </copy>
-                            </tasks>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/controlloop/packages/docker-controlloop/src/main/assembly/assembly.xml b/controlloop/packages/docker-controlloop/src/main/assembly/assembly.xml
index f35050b44..e2d26ee34 100644
--- a/controlloop/packages/docker-controlloop/src/main/assembly/assembly.xml
+++ b/controlloop/packages/docker-controlloop/src/main/assembly/assembly.xml
@@ -20,8 +20,8 @@
   -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>docker-drools-apps</id>
     <fileSets>
         <fileSet>
diff --git a/controlloop/packages/pom.xml b/controlloop/packages/pom.xml
index 1aba20cf5..10bdf05bf 100644
--- a/controlloop/packages/pom.xml
+++ b/controlloop/packages/pom.xml
@@ -4,13 +4,14 @@
   ================================================================================
   Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019-2020 Bell Canada.
+  Modifications Copyright (C) 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.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,41 +21,41 @@
   -->
 
 <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>
-  <packaging>pom</packaging>
-  <parent>
-    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
-    <artifactId>controlloop</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
-  <artifactId>drools-applications-packages</artifactId>
-  <name>PDP-D Application Installation Packages</name>
-  <description>PDP-D Installation</description>
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>basex-controlloop</module>
-        <module>artifacts-controlloop</module>
-        <module>apps-controlloop</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>docker</id>
-      <modules>
-        <module>basex-controlloop</module>
-        <module>artifacts-controlloop</module>
-        <module>apps-controlloop</module>
-        <module>docker-controlloop</module>
-      </modules>
-      <properties>
-        <docker.skip.push>false</docker.skip.push>
-      </properties>
-    </profile>
-  </profiles>
+         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>
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+        <artifactId>controlloop</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+    <artifactId>drools-applications-packages</artifactId>
+    <name>PDP-D Application Installation Packages</name>
+    <description>PDP-D Installation</description>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>basex-controlloop</module>
+                <module>artifacts-controlloop</module>
+                <module>apps-controlloop</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>docker</id>
+            <modules>
+                <module>basex-controlloop</module>
+                <module>artifacts-controlloop</module>
+                <module>apps-controlloop</module>
+                <module>docker-controlloop</module>
+            </modules>
+            <properties>
+                <docker.skip.push>false</docker.skip.push>
+            </properties>
+        </profile>
+    </profiles>
 </project>
-- 
cgit 1.2.3-korg