From 8bfbc4b6241d21252cd98d653f0860a58e64dcc2 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Mon, 1 Jul 2019 14:22:12 -0400 Subject: [PATCH] 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 Signed-off-by: Jim Hahn --- BRMSGateway/config.properties | 2 +- 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 +- .../policy/pap/xacml/rest/XACMLPapServlet.java | 83 +++++++++------------- 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 | 2 +- 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/install/src/files/brmsgw.conf | 4 +- packages/pom.xml | 2 +- pom.xml | 6 +- version.properties | 2 +- 26 files changed, 60 insertions(+), 79 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 604faada4..81f3a3083 100644 --- 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 189cd364a..eccf483b8 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-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 861bf7b95..26e1b5aa1 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.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 501adaaec..1a83ead3d 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.0-SNAPSHOT +brms.dependency.version=1.5.1-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 1b156272d..03b333574 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 4b383a418..a91db6726 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT 4.3.10.Final 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 b5951d823..85315ca54 100644 --- 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 297b9cda0..e2e3b3496 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 5deed4a80..b373c73a1 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 96646328d..2882ffafd 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index d94a9e632..883a85992 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index a23bb5b91..c2b2cc095 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 3b6faab2b..7d126a72b 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index e216bf1ff..782bbc979 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 78323649a..1003dd252 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index babbe665c..e56e5b923 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index 13551a722..10ffc0dcf 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 575f8b0cc..2489ea936 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 38c064031..821947e5d 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 2dbc69966..b29ae6ef9 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index c251da6db..9c134ca8d 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine packages - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index f597b0a8a..0b0316521 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT install diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index 6d0f7d1af..6fa034682 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.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 bba89600d..b8ab828a2 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 1ea26c9c7..3f5b660b7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.0-SNAPSHOT + 1.5.1-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -59,8 +59,8 @@ 1.3.3 1.18 6.4.3 - 1.5.0 - 2.1.0 + 1.5.1-SNAPSHOT + 2.1.1-SNAPSHOT PolicyEngineUtils diff --git a/version.properties b/version.properties index 2d1adf1a8..a58701fa8 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=5 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6