Merge "Fix policy engine JUnit that hung on ubuntu 18.04"

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 71c5036..585e002 100644 (file)
--- 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.2-SNAPSHOT
 
 ENVIRONMENT = DEVL
 

diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index 9366894..1b450e3 100644 (file)
--- 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.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "rest",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "events",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "appclcm",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "vfc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "so",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnr",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdnc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "aai",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
             "artifactId": "sdc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "eventmanager",
-            "version": "1.6.1-SNAPSHOT"
+            "version": "1.6.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications.controlloop.common",
             "artifactId": "guard",
-            "version": "1.6.1-SNAPSHOT"
+            "version": "1.6.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actorServiceProvider",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.appclcm",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.so",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.sdnr",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
             "artifactId": "actor.vfc",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.models.policy-models-interactions",
             "artifactId": "model-yaml",
-            "version": "2.2.3-SNAPSHOT"
+            "version": "2.2.5-SNAPSHOT"
         }, {
             "groupId": "com.att.research.xacml",
             "artifactId": "xacml-pdp",

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 68a5a08..c34def8 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.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>

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 ee94c6f..4e01b0a 100644 (file)
--- 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.2-SNAPSHOT";
     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 5ad9b9e..c7522cf 100644 (file)
--- 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.0
+brms.dependency.version=1.6.2-SNAPSHOT
 
 ENVIRONMENT = DEVL

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index ec39cce..534cdbe 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 161b941..3b518ca 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <properties>
         <hibernate.version>4.3.10.Final</hibernate.version>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 61b5e30..490839a 100644 (file)
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-PDP-REST</artifactId>
     <description>ONAP PDP REST</description>

diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 6643b85..4a7e63a 100644 (file)
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index f2cf390..4051489 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-REST</artifactId>
     <description>ONAP REST</description>

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 097bc54..f98f828 100644 (file)
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 9fd78c5..99873ca 100644 (file)
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-XACML</artifactId>
     <packaging>jar</packaging>

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index cfe85ef..d0be794 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
index 8a7a45d..0493afc 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
@@ -41,7 +41,8 @@
     <script src= "app/fusion/external/jquery/dist/jquery.min.js"></script>
     <script src= "app/policyApp/CSS/bootstrap/dist/js/bootstrap-modalmanager.min.js"></script>
     <script src= "app/policyApp/CSS/bootstrap/dist/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="app/fusion/styles/jquery-ui.css">
+    <!-- <link rel="stylesheet" href="app/fusion/styles/jquery-ui.css"> -->
+    <script src= "static/js/jquery-ui.js"></script>
 
     <!---------------------------Angular Gridster-------------------------------->
     <link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 280d25a..8a93e98 100644 (file)
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index a0e22cb..8886a79 100644 (file)
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 4d32ac1..3df31c8 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>

diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml
index f2bc649..d1fef73 100644 (file)
--- a/TestSuite/Performance/pom.xml
+++ b/TestSuite/Performance/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>

diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml
index 201c853..ce72921 100644 (file)
--- a/TestSuite/Stability/pom.xml
+++ b/TestSuite/Stability/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>TestSuite</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>

diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml
index 8b21f9b..467f464 100644 (file)
--- a/TestSuite/pom.xml
+++ b/TestSuite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>

diff --git a/docs/index.rst b/docs/index.rst
index 4b9227f..b25b123 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,5 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. _master_index:
 
 Policy Engine (Legacy)
 ----------------------

diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst
index 19f774c..2eb3e88 100644 (file)
--- a/docs/platform/architecture.rst
+++ b/docs/platform/architecture.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a
 .. Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
+.. _architecture:
 
 
 Architecture
@@ -10,7 +11,7 @@ Architecture
     :depth: 3
 
 POLICY is a subsystem of ONAP that maintains, distributes, and operates on the
-set of rules that underlie ONAP’s control, orchestration, and management
+set of rules that underlie ONAP's control, orchestration, and management
 functions.
 
 POLICY provides a logically centralized environment for the creation and
@@ -136,14 +137,14 @@ selected conditions in effect at that time.
 
 Some examples of types of policies are:
 
-* VNF placement — rules governing where VNFs should be placed, including
+* VNF placement - rules governing where VNFs should be placed, including
   affinity rules
-* Data and feed management — what data to collect and when, retention periods,
+* Data and feed management - what data to collect and when, retention periods,
   and when to send alarms about issues
-* Access control — who (or what) can have access to which data
-* Trigger conditions and actions — what conditions are actionable, and what to
+* Access control - who (or what) can have access to which data
+* Trigger conditions and actions - what conditions are actionable, and what to
   do under those conditions
-* Interactions — how interactions between change management and
+* Interactions - how interactions between change management and
   fault/performance management are handled (for example, should closed loops be
   disabled during maintenance?)
 
@@ -190,7 +191,7 @@ correct component in a control loop such as the MSO, a Controller, or DCAE.
 Policy engines such as XACML and Drools also enforce policies and can trigger
 other components as a result (for example, causing a controller to take
 specific actions specified by the policy).  Additionally, some policies
-(“Guard Policies”) may enforce checks against decided actions.
+("Guard Policies") may enforce checks against decided actions.
 
 
 Policy Unification and Organization

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 2e00c84..5715ceb 100755 (executable)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.6.2-SNAPSHOT</version>
+               <version>1.6.3-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>

diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index a92201d..2666b8c 100644 (file)
--- 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.2-SNAPSHOT
 
 CLIENT_FILE=client.properties
 

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 417aa0e..a62e25d 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>packages</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>docker</artifactId>

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 4e1db79..63ef0bd 100644 (file)
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>packages</artifactId>
-               <version>1.6.2-SNAPSHOT</version>
+               <version>1.6.3-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>

diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index e60a9ae..7dd1153 100644 (file)
--- 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.3-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.6.2-SNAPSHOT
+BRMS_MODELS_DEPENDENCY_VERSION=2.2.5-SNAPSHOT

diff --git a/packages/pom.xml b/packages/pom.xml
index 6e55690..2bec2a5 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.6.3-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
index 6fb508f..91ae711 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
         <relativePath />
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.6.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -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.3-SNAPSHOT</version.policy.common>
-        <version.policy.models>2.2.3-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>

diff --git a/releases/1.6.2-container.yaml b/releases/1.6.2-container.yaml
new file mode 100644 (file)
index 0000000..88566e0
--- /dev/null
+++ b/releases/1.6.2-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '1.6.2'
+project: 'policy-engine'
+log_dir: 'policy-engine-maven-docker-stage-master/304'
+ref: 99fad3e83f8282299e59077d8826362990c695a9
+containers:
+    - name: 'policy-pe'
+      version: '1.6.2-20200415T1303'

diff --git a/releases/1.6.2.yaml b/releases/1.6.2.yaml
new file mode 100644 (file)
index 0000000..c268e5a
--- /dev/null
+++ b/releases/1.6.2.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.6.2'
+project: 'policy-engine'
+log_dir: 'policy-engine-maven-stage-master/305/'

diff --git a/version.properties b/version.properties
index 5be42c8..d6bddbc 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -24,7 +24,7 @@
 
 major=1
 minor=6
-patch=2
+patch=3
 
 base_version=${major}.${minor}.${patch}