From 3b25dd8b60d2d8d7f147efefc5425851aec0021e Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <jh1730@att.com>
Date: Wed, 30 Aug 2017 23:42:35 -0500
Subject: CL dependencies fixes for lab environment runtime

This also includes workarounds to the recent oparent dependency
introduction that breaks runtime (with the version-check-maven-plugin).

manifested by loading control loops and failing to load some classes
due to different versions.

The issue was that underlying drools libraries use 3.2.5 and oparent
has included a had dependency with transitive dependencies for some maven
libraries in 3.2.3 and lower version xml parsers.   Bottomoline, the
classpath at runtime was formed by the union of both, with some
libraries being resolved to the oparent one, and others to the drools
one.   These errors are very obscured to debug.

Additional clean up of dependencies versions and order of build
was introduced to avoid issues loading dependencies at runtime in a
lab environment (non-junit)..

Issue-ID: POLICY-162
Change-Id: I019c82e6bed4eab4884cdbf8f6f32472c3a7352f
Signed-off-by: Jorge Hernandez <jh1730@att.com>
---
 controlloop/common/eventmanager/pom.xml            | 12 ++++++++++++
 controlloop/common/guard/pom.xml                   | 22 +++++++---------------
 controlloop/common/pom.xml                         |  2 +-
 .../src/main/resources/__controlLoopName__.drl     |  2 +-
 controlloop/templates/template.demo/pom.xml        | 14 +++++++++++++-
 5 files changed, 34 insertions(+), 18 deletions(-)

(limited to 'controlloop')

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index b33763b12..8447ff74d 100644
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -28,6 +28,18 @@
 	</parent>
 	<artifactId>eventmanager</artifactId>
 	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.jpa</artifactId>
+			<version>2.7.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+	  	</dependency>
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>actorServiceProvider</artifactId>
diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml
index 388a233ea..2b173c36c 100644
--- a/controlloop/common/guard/pom.xml
+++ b/controlloop/common/guard/pom.xml
@@ -7,16 +7,6 @@
 	</parent>
   <artifactId>guard</artifactId>
   <dependencies>
-	
-<!-- 
-	<dependency>
-		<groupId>org.onap.policy.drools-applications</groupId>
-		<artifactId>common</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-		<scope>provided</scope>
-	</dependency>
--->
-
 		<dependency>
 			<groupId>org.onap.policy.drools-applications</groupId>
 			<artifactId>policy-yaml</artifactId>
@@ -44,24 +34,26 @@
       	<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.5</version>
+			<scope>provided</scope>
 	  	</dependency>
       	<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>4.5.2</version>
+			<scope>provided</scope>
 	  	</dependency>
 		<dependency>
 			<groupId>org.drools</groupId>
 			<artifactId>drools-core</artifactId>
-			<version>6.3.0.Final</version>
+			<version>6.5.0.Final</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>2.6.4</version>
+            <version>2.7.0</version>
+			<scope>provided</scope>
         </dependency>
-		
-      
   </dependencies>
 </project>
diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index f3975b958..b6db66660 100644
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -34,8 +34,8 @@
 
     <modules>
     	<module>actors</module>
-    	<module>eventmanager</module>
         <module>guard</module>
+    	<module>eventmanager</module>
         <module>model-impl</module>
     	<module>policy-yaml</module>
     </modules>
diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
index 1c6244cc3..caf72732b 100644
--- a/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
+++ b/controlloop/templates/template.demo.v1.0.0/archetype-cl-legacy/src/main/resources/archetype-resources/src/main/resources/__controlLoopName__.drl
@@ -84,7 +84,7 @@ import org.onap.policy.drools.system.PolicyEngine;
 // These parameters are required to build the runtime policy
 //
 declare Params
-    controlLoopName : String
+    closedLoopControlName : String
     actor : String
     aaiURL : String
     aaiUsername : String
diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index c7451cfee..989f16e5a 100644
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -29,6 +29,18 @@
 	</parent>
 	<artifactId>template.demo</artifactId>
 	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.jpa</artifactId>
+			<version>2.7.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.drools</groupId>
 			<artifactId>drools-core</artifactId>
@@ -147,7 +159,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>
-- 
cgit 1.2.3-korg