From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 15 Apr 2020 00:34:21 +0000 (-0400)
Subject: Point to released common,models,drools-apps
X-Git-Tag: 1.6.2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=02544540c9bb24c87e0c2497476feaf98197ca15

Point to released common,models,drools-apps

Issue-ID: POLICY-2378
Change-Id: I4aa81585e154c1e7ee131db9cf5194530a212e67
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 71c5036cc..fadbeafbb 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,7 +77,7 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.6.1-SNAPSHOT
+brms.dependency.version=1.6.1
 
 ENVIRONMENT = DEVL
 
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index 54502ea06..d28d99a70 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.6.1-SNAPSHOT"
+            "version": "1.6.1"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "rest",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appclcm",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "vfc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
-            "version": "1.6.1-SNAPSHOT"
+            "version": "1.6.1"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
-            "version": "1.6.1-SNAPSHOT"
+            "version": "1.6.1"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actorServiceProvider",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appclcm",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.so",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnr",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.vfc",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions",
             "artifactId": "model-yaml",
-            "version": "2.2.4-SNAPSHOT"
+            "version": "2.2.4"
         }, {
             "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 ee94c6f96..9651618b7 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.6.1-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.6.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 2de8e8462..c0815f455 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.6.1-SNAPSHOT
+brms.dependency.version=1.6.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 a92201d2e..e1dca999d 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.6.1-SNAPSHOT
+brms.dependency.version=1.6.1
 
 CLIENT_FILE=client.properties
 
diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index 8bee9a103..5caae1e4e 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.6.1-SNAPSHOT
-BRMS_MODELS_DEPENDENCY_VERSION=2.2.4-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.6.1
+BRMS_MODELS_DEPENDENCY_VERSION=2.2.4
diff --git a/pom.xml b/pom.xml
index 8abaadfa1..de23205ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,8 @@
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
         <elasticsearch.version>6.8.2</elasticsearch.version>
-        <version.policy.common>1.6.4-SNAPSHOT</version.policy.common>
-        <version.policy.models>2.2.4-SNAPSHOT</version.policy.models>
+        <version.policy.common>1.6.4</version.policy.common>
+        <version.policy.models>2.2.4</version.policy.models>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>