From cf54241ec76e67246961eb2d25c55b1e14c43877 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 6 Nov 2018 13:37:35 -0500 Subject: Update dmaap 1.1.9 changes 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 (cherry picked from commit fe8b9e72cafa4acf31db4239593a74a5ccf89a4a) Signed-off-by: Pamela Dragosh --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 58 +++++++++++----------- BRMSGateway/pom.xml | 2 +- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- LogParser/pom.xml | 2 +- ONAP-PAP-REST/pom.xml | 2 +- ONAP-PDP-REST/pom.xml | 2 +- ONAP-PDP/pom.xml | 2 +- ONAP-REST/pom.xml | 2 +- ONAP-SDK-APP/pom.xml | 2 +- ONAP-XACML/pom.xml | 2 +- POLICY-SDK-APP/pom.xml | 2 +- PolicyEngineAPI/pom.xml | 2 +- PolicyEngineClient/pom.xml | 2 +- PolicyEngineUtils/pom.xml | 11 +--- .../java/org/onap/policy/utils/BusConsumer.java | 7 ++- .../java/org/onap/policy/utils/BusPublisher.java | 6 +-- .../java/org/onap/policy/utils/test/BusTest.java | 3 +- TestSuite/Performance/pom.xml | 2 +- TestSuite/Stability/pom.xml | 2 +- TestSuite/pom.xml | 2 +- packages/base/pom.xml | 2 +- packages/docker/pom.xml | 2 +- packages/install/pom.xml | 2 +- packages/pom.xml | 2 +- pom.xml | 8 +-- version.properties | 2 +- 28 files changed, 62 insertions(+), 75 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 4e92ee8b2..31aa67aab 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,6 +77,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.3.2-SNAPSHOT +brms.dependency.version=1.3.3-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index b8e3e7cd3..3c25ac2d1 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,120 +3,120 @@ "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", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 343df9eb3..f9da8cd55 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT BRMSGateway This application will take in BRMS rules and acts as interface between PR and PDP XACML diff --git a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java index e7dab547a..bd8fb111a 100644 --- a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java +++ b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java @@ -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"; diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties index fdee7d9e3..92ae2ad18 100644 --- a/BRMSGateway/src/test/resources/config.properties +++ b/BRMSGateway/src/test/resources/config.properties @@ -81,6 +81,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.3.2-SNAPSHOT +brms.dependency.version=1.3.3-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 6b50c0e93..2e6d191a9 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 19e38cd28..5c60a7c94 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 13754224b..37f6a181a 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index d4f2b561a..3d7826bf3 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 36939e3a7..cf6779cb9 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index aea83ce3d..eb9546c9f 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 06f532f3b..875c269f7 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 456cf56cb..9f36223b5 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 38b8b299c..c9c7abf1e 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 92f2cd6d8..b42eda0d2 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 90c15a6b4..a952bd0b3 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT PolicyEngineUtils @@ -101,11 +101,6 @@ com.google.code.gson gson - - com.att.aft - dme2 - 3.1.200 - org.onap.dmaap.messagerouter.dmaapclient dmaapClient @@ -114,10 +109,6 @@ org.slf4j slf4j-log4j12 - - com.att.aft - dme2 - diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java index 6d80a6a78..0d4c86b3d 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java @@ -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 { diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java index 3a12122bf..745213529 100644 --- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java +++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java @@ -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 { /** diff --git a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java index 37170f077..37f0bb016 100644 --- a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java +++ b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java @@ -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 diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index f3a769b26..9b3e421d5 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index e98adfb64..51887edf2 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 88e58df25..3d738e6f2 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 8b48fb08b..0d26d5db0 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 57eb07bce..6a267226e 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index cc1ac70b0..249e7a214 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index 6e346538c..2e3c3e854 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index cddd9bc05..db9d29e2e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,12 +22,12 @@ org.onap.policy.parent integration - 2.0.0 + 2.0.1 org.onap.policy.engine PolicyEngineSuite - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -64,8 +64,8 @@ 1.3.3 1.18 6.3.0 - 1.3.2 - 1.3.2-SNAPSHOT + 1.3.3 + 1.3.3 PolicyEngineUtils diff --git a/version.properties b/version.properties index edc07db88..0f560ef57 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg