From 31aa90351064401a6ef4aaea9304b745969004e0 Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 5 Aug 2019 10:34:05 -0500 Subject: [PATCH] Update to latest common/models released versions policy/models: 2.1.2 policy/common: 1.5.1 Change-Id: Ifa72ed573fb7685710c7288da6fd16ffe6ea397f Issue-ID: POLICY-1953 Signed-off-by: jhh --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 54 +++++++++++----------- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- .../files/install/servers/brmsgw/config.properties | 2 +- packages/install/src/files/brmsgw.conf | 4 +- pom.xml | 4 +- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 81f3a3083..62578327e 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.5.1-SNAPSHOT +brms.dependency.version=1.5.1 ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 20eb94293..64333e6b3 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,112 +3,112 @@ "default": [{ "groupId": "org.onap.policy.drools-applications.controlloop.templates", "artifactId": "template.demo", - "version": "1.5.1-SNAPSHOT" + "version": "1.5.1" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.5.1-SNAPSHOT" + "version": "1.5.1" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.5.1-SNAPSHOT" + "version": "1.5.1" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appclcm", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "model-yaml", - "version": "2.1.1-SNAPSHOT" + "version": "2.1.2" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", 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 26e1b5aa1..2aa2873f1 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 @@ -117,7 +117,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.5.1-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.5.1"; private static final String DEPENDENCY_FILE = "dependency.json"; private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key"; public static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml"; diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties index 1a83ead3d..cf3d1c032 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.5.1-SNAPSHOT +brms.dependency.version=1.5.1 ENVIRONMENT = DEVL diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index 1080f4636..030a2d2e4 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,7 +84,7 @@ test_via_jmx=${{test_via_jmx}} ping_interval=30000 -brms.dependency.version=1.4.1-SNAPSHOT +brms.dependency.version=1.5.1 CLIENT_FILE=client.properties diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index 6fa034682..a2c8d626b 100644 --- a/packages/install/src/files/brmsgw.conf +++ b/packages/install/src/files/brmsgw.conf @@ -59,5 +59,5 @@ CLIENT_ID=PDPServer CLIENT_KEY=test ENVIRONMENT=DEVL -BRMS_DEPENDENCY_VERSION=1.5.1-SNAPSHOT -BRMS_MODELS_DEPENDENCY_VERSION=2.1.1-SNAPSHOT +BRMS_DEPENDENCY_VERSION=1.5.1 +BRMS_MODELS_DEPENDENCY_VERSION=2.1.2 diff --git a/pom.xml b/pom.xml index 3f5b660b7..d13bbc741 100644 --- a/pom.xml +++ b/pom.xml @@ -59,8 +59,8 @@ 1.3.3 1.18 6.4.3 - 1.5.1-SNAPSHOT - 2.1.1-SNAPSHOT + 1.5.1 + 2.1.2 PolicyEngineUtils -- 2.16.6