Bump engine 1.5.1-SNAPSHOT

Released 1.5.0

Fixed compilation issue related with version upgrade of
policy/common.

Issue-ID: POLICY-1737
Change-Id: Ib2f56e8ffcb4b399dbe4a5453b70da10b0f87985
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 604faad..81f3a30 100644 (file)
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,7 +77,7 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.5.0-SNAPSHOT
+brms.dependency.version=1.5.1-SNAPSHOT
 
 ENVIRONMENT = DEVL
 

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 189cd36..eccf483 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-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 861bf7b..26e1b5a 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.5.0-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.5.1-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 501adaa..1a83ead 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.5.0-SNAPSHOT
+brms.dependency.version=1.5.1-SNAPSHOT
 
 ENVIRONMENT = DEVL

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index 1b15627..03b3335 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>LogParser</artifactId>
     <dependencies>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 4b383a4..a91db67 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <properties>
         <hibernate.version>4.3.10.Final</hibernate.version>

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
index b5951d8..85315ca 100644 (file)
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
@@ -557,7 +557,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
             PolicyLogger.metrics("XACMLPapServlet doPost im startTransaction");
         } catch (AdministrativeStateException ae) {
             String message = "POST interface called for PAP " + papResourceName
-                    + " but it has an Administrative" + " state of "
+                    + " but it has an Administrative state of "
                     + im.getStateManager().getAdminState() + "\n Exception Message: "
                     + PolicyUtils.CATCH_EXCEPTION;
             LOGGER.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message, ae);
@@ -567,12 +567,15 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
             PolicyLogger.audit("Transaction Failed - See Error.log");
             setResponseError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
             return;
-        } catch (StandbyStatusException se) {
+        } catch (IntegrityMonitorException ime) {
             String message = "POST interface called for PAP " + papResourceName
-                    + " but it has a Standby Status" + " of "
-                    + im.getStateManager().getStandbyStatus() + "\n Exception Message: "
-                    + se.getMessage();
-            LOGGER.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message, se);
+                    + " but it has an Administrative state of "
+                    + im.getStateManager().getAdminState()
+                    + " and a Standby Status of "
+                    + im.getStateManager().getStandbyStatus()
+                    + "\n Exception Message: "
+                    + ime.getMessage();
+            LOGGER.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message, ime);
             loggingContext.metricEnded();
             PolicyLogger.metrics("XACMLPapServlet doPost im startTransaction");
             loggingContext.transactionEnded();
@@ -831,23 +834,15 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
             im.startTransaction();
             loggingContext.metricEnded();
             PolicyLogger.metrics("XACMLPapServlet doGet im startTransaction");
-        } catch (AdministrativeStateException ae) {
+        } catch (IntegrityMonitorException ime) {
             String message = "GET interface called for PAP " + papResourceName
-                    + " but it has an Administrative" + " state of "
-                    + im.getStateManager().getAdminState() + "\n Exception Message: "
-                    + ae.getMessage();
-            LOGGER.info(message, ae);
-            PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
-            loggingContext.transactionEnded();
-            PolicyLogger.audit("Transaction Failed - See Error.log");
-            setResponseError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
-            return;
-        } catch (StandbyStatusException se) {
-            String message = "GET interface called for PAP " + papResourceName
-                    + " but it has a Standby Status" + " of "
-                    + im.getStateManager().getStandbyStatus() + "\n Exception Message: "
-                    + se.getMessage();
-            LOGGER.info(message, se);
+                    + " but it has an Administrative state of "
+                    + im.getStateManager().getAdminState()
+                    + " and a Standby Status of "
+                    + im.getStateManager().getStandbyStatus()
+                    + "\n Exception Message: "
+                    + ime.getMessage();
+            LOGGER.info(message, ime);
             PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
             loggingContext.transactionEnded();
             PolicyLogger.audit("Transaction Failed - See Error.log");
@@ -1031,19 +1026,13 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
             loggingContext.metricEnded();
             PolicyLogger.metrics("XACMLPapServlet doPut im startTransaction");
         } catch (IntegrityMonitorException e) {
-            String message = "PUT interface called for PAP " + papResourceName;
-            if (e instanceof AdministrativeStateException) {
-                message += " but it has an Administrative state of "
-                        + im.getStateManager().getAdminState();
-            } else if (e instanceof StandbyStatusException) {
-                message += " but it has a Standby Status of "
-                        + im.getStateManager().getStandbyStatus();
-            } else {
-                message += " but an exception occurred";
-
-            }
-            message += "\n Exception Message: " + e.getMessage();
-
+            String message = "PUT interface called for PAP " + papResourceName
+                    + " but it has an Administrative state of "
+                    + im.getStateManager().getAdminState()
+                    + " and a Standby Status of "
+                    + im.getStateManager().getStandbyStatus()
+                    + "\n Exception Message: "
+                    + e.getMessage();
             LOGGER.info(message, e);
             PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
             loggingContext.transactionEnded();
@@ -1253,23 +1242,15 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
             im.startTransaction();
             loggingContext.metricEnded();
             PolicyLogger.metrics("XACMLPapServlet doDelete im startTransaction");
-        } catch (AdministrativeStateException ae) {
+        } catch (IntegrityMonitorException ime) {
             String message = "DELETE interface called for PAP " + papResourceName
-                    + " but it has an Administrative" + " state of "
-                    + im.getStateManager().getAdminState() + "\n Exception Message: "
-                    + ae.getMessage();
-            LOGGER.info(message, ae);
-            PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
-            loggingContext.transactionEnded();
-            PolicyLogger.audit("Transaction Failed - See Error.log");
-            setResponseError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
-            return;
-        } catch (StandbyStatusException se) {
-            String message = "PUT interface called for PAP " + papResourceName
-                    + " but it has a Standby Status" + " of "
-                    + im.getStateManager().getStandbyStatus() + "\n Exception Message: "
-                    + se.getMessage();
-            LOGGER.info(message, se);
+                    + " but it has an Administrative state of "
+                    + im.getStateManager().getAdminState()
+                    + " and a Standby Status of "
+                    + im.getStateManager().getStandbyStatus()
+                    + "\n Exception Message: "
+                    + ime.getMessage();
+            LOGGER.info(message, ime);
             PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
             loggingContext.transactionEnded();
             PolicyLogger.audit("Transaction Failed - See Error.log");

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 297b9cd..e2e3b34 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-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 5deed4a..b373c73 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 9664632..2882ffa 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.engine</groupId>
         <artifactId>PolicyEngineSuite</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-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 d94a9e6..883a859 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>ONAP-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index a23bb5b..c2b2cc0 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-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 3b6faab..7d126a7 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>POLICY-SDK-APP</artifactId>
     <packaging>war</packaging>

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index e216bf1..782bbc9 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineAPI</artifactId>
     <dependencies>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index 7832364..1003dd2 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineClient</artifactId>
     <dependencies>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index babbe66..e56e5b9 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>PolicyEngineUtils</artifactId>
     <dependencies>

diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml
index 13551a7..10ffc0d 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.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>Performance</artifactId>
   <properties>

diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml
index 575f8b0..2489ea9 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.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>Stability</artifactId>
   <properties>

diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml
index 38c0640..821947e 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>TestSuite</artifactId>
     <packaging>pom</packaging>

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 2dbc699..b29ae6e 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.5.0-SNAPSHOT</version>
+               <version>1.5.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index c251da6..9c134ca 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>docker</artifactId>

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index f597b0a..0b03165 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.5.0-SNAPSHOT</version>
+               <version>1.5.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>

diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index 6d0f7d1..6fa0346 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.4.1-SNAPSHOT
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.1-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.5.1-SNAPSHOT
+BRMS_MODELS_DEPENDENCY_VERSION=2.1.1-SNAPSHOT

diff --git a/packages/pom.xml b/packages/pom.xml
index bba8960..b8ab828 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.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
     <artifactId>packages</artifactId>
     <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
index 1ea26c9..3f5b660 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <groupId>org.onap.policy.engine</groupId>
     <artifactId>PolicyEngineSuite</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>policy-engine</name>
     <description>The ONAP Policy Engine main pom</description>
@@ -59,8 +59,8 @@
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.compress.version>1.18</commons.compress.version>
         <elasticsearch.version>6.4.3</elasticsearch.version>
-        <version.policy.common>1.5.0</version.policy.common>
-        <version.policy.models>2.1.0</version.policy.models>
+        <version.policy.common>1.5.1-SNAPSHOT</version.policy.common>
+        <version.policy.models>2.1.1-SNAPSHOT</version.policy.models>
     </properties>
     <modules>
         <module>PolicyEngineUtils</module>

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