Update dmaap 1.1.9 changes 03/72103/5
authorPamela Dragosh <pdragosh@research.att.com>
Tue, 6 Nov 2018 18:37:35 +0000 (13:37 -0500)
committerPamela Dragosh <pdragosh@research.att.com>
Thu, 8 Nov 2018 18:36:33 +0000 (13:36 -0500)
Upgrading policy/parent to v1.1.9 requires these
code changes to occur.

Need to change to policy/parent 2.0.1 for the
right dmaap to be included.

Upgrade policy common and drools-applications to
1.3.3 released artifacts.

Also just included the change from gerrit review
https://gerrit.onap.org/r/#/c/72026/ instead of
cherry picking it.

Updating release to 1.3.3-SNAPSHOT

Issue-ID: POLICY-1229
Change-Id: I16f4bbd9ba2d46cdc3b94feba1f2e7f20d837dad
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
(cherry picked from commit fe8b9e72cafa4acf31db4239593a74a5ccf89a4a)
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
28 files changed:
BRMSGateway/config.properties
BRMSGateway/dependency.json
BRMSGateway/pom.xml
BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
BRMSGateway/src/test/resources/config.properties
LogParser/pom.xml
ONAP-PAP-REST/pom.xml
ONAP-PDP-REST/pom.xml
ONAP-PDP/pom.xml
ONAP-REST/pom.xml
ONAP-SDK-APP/pom.xml
ONAP-XACML/pom.xml
POLICY-SDK-APP/pom.xml
PolicyEngineAPI/pom.xml
PolicyEngineClient/pom.xml
PolicyEngineUtils/pom.xml
PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
TestSuite/Performance/pom.xml
TestSuite/Stability/pom.xml
TestSuite/pom.xml
packages/base/pom.xml
packages/docker/pom.xml
packages/install/pom.xml
packages/pom.xml
pom.xml
version.properties

index 4e92ee8..31aa67a 100644 (file)
@@ -77,6 +77,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.3.2-SNAPSHOT
+brms.dependency.version=1.3.3-SNAPSHOT
 
 ENVIRONMENT = DEVL
index b8e3e7c..3c25ac2 100644 (file)
         "default": [{
             "groupId": "org.onap.policy.drools-applications.controlloop.templates",
             "artifactId": "template.demo",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "rest",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "so",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdnc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdnr",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "events",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "appclcm",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "vfc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "so",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdnr",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdnc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "aai",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "sdc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
             "artifactId": "trafficgenerator",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actorServiceProvider",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.appclcm",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.so",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.sdnc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.sdnr",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
             "artifactId": "actor.vfc",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "policy-yaml",
-            "version": "1.3.2-SNAPSHOT"
+            "version": "1.3.3-SNAPSHOT"
         }, {
             "groupId": "com.att.research.xacml",
             "artifactId": "xacml-pdp",
index 343df9e..f9da8cd 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>BRMSGateway</artifactId>
     <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
index e7dab54..bd8fb11 100644 (file)
@@ -118,7 +118,7 @@ public class BrmsPush {
     private static final Logger LOGGER = FlexLogger.getLogger(BrmsPush.class.getName());
     private static final String PROJECTSLOCATION = "RuleProjects";
     private static final String[] GOALS = { "clean", "deploy" };
-    private static final String DEFAULT_VERSION = "1.3.2-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.3.3-SNAPSHOT";
     private static final String DEPENDENCY_FILE = "dependency.json";
     private static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
 
index fdee7d9..92ae2ad 100644 (file)
@@ -81,6 +81,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.3.2-SNAPSHOT
+brms.dependency.version=1.3.3-SNAPSHOT
 
 ENVIRONMENT = DEVL
index 6b50c0e..2e6d191 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>
index 19e38cd..5c60a7c 100644 (file)
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
index 1375422..37f6a18 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>
index d4f2b56..3d7826b 100644 (file)
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
index 36939e3..cf6779c 100644 (file)
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-REST</artifactId>
     <description>ONAP REST</description>
index aea83ce..eb9546c 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>
index 06f532f..875c269 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-XACML</artifactId>
     <packaging>jar</packaging>
index 456cf56..9f36223 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>
index 38b8b29..c9c7abf 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>
index 92f2cd6..b42eda0 100644 (file)
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>
index 90c15a6..a952bd0 100644 (file)
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.att.aft</groupId>
-            <artifactId>dme2</artifactId>
-            <version>3.1.200</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.att.aft</groupId>
-                    <artifactId>dme2</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
index 6d80a6a..0d4c86b 100644 (file)
@@ -23,10 +23,9 @@ package org.onap.policy.utils;
 import java.net.MalformedURLException;
 import java.util.List;
 import java.util.Properties;
-
-import com.att.nsa.mr.client.MRClient.MRApiException;
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 
 public interface BusConsumer {
        
index 3a12122..7452135 100644 (file)
@@ -24,14 +24,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
-
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.onap.policy.common.logging.eelf.PolicyLogger;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-
 public interface BusPublisher {
        
        /**
index 37170f0..37f0bb0 100644 (file)
@@ -27,11 +27,10 @@ import java.net.MalformedURLException;
 import java.util.Arrays;
 
 import org.junit.Test;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
 import org.onap.policy.utils.BusConsumer;
 import org.onap.policy.utils.BusPublisher;
 
-import com.att.nsa.mr.client.MRClient.MRApiException;
-
 public class BusTest {
     
     @Test 
index f3a769b..9b3e421 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>
index e98adfb..51887ed 100644 (file)
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>
index 88e58df..3d738e6 100644 (file)
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>
index 8b48fb0..0d26d5d 100755 (executable)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.3.2-SNAPSHOT</version>
+               <version>1.3.3-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>
index 57eb07b..6a26722 100644 (file)
@@ -25,7 +25,7 @@
        <parent>
                 <groupId>org.onap.policy.engine</groupId>
                 <artifactId>packages</artifactId>
-                <version>1.3.2-SNAPSHOT</version>
+                <version>1.3.3-SNAPSHOT</version>
        </parent>
 
        <artifactId>docker</artifactId>
index cc1ac70..249e7a2 100644 (file)
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.3.2-SNAPSHOT</version>
+               <version>1.3.3-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>
index 6e34653..2e3c3e8 100644 (file)
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.2-SNAPSHOT</version>
+               <version>1.3.3-SNAPSHOT</version>
        </parent>
        <artifactId>packages</artifactId>
        <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index cddd9bc..db9d29e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -64,8 +64,8 @@
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
         <elasticsearch.version>6.3.0</elasticsearch.version>
-        <version.policy.common>1.3.2</version.policy.common>
-        <version.policy.drools-application>1.3.2-SNAPSHOT</version.policy.drools-application>
+        <version.policy.common>1.3.3</version.policy.common>
+        <version.policy.drools-application>1.3.3</version.policy.drools-application>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>
index edc07db..0f560ef 100644 (file)
@@ -24,7 +24,7 @@
 
 major=1
 minor=3
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}