From b559c050557e757325743bd37b41fd49b01ba19a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 16 May 2019 14:50:33 +0000 Subject: [PATCH] Step snapshot version of policy engine Issue-ID: POLICY-1630 Change-Id: Iefcaaf1811535e22904367b8d11346a02f5851c1 Signed-off-by: liamfallon --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 58 +++++++++++----------- 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 +- 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 +- .../files/install/servers/brmsgw/config.properties | 4 +- packages/docker/pom.xml | 2 +- packages/install/pom.xml | 2 +- packages/install/src/files/brmsgw.conf | 4 +- packages/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 27 files changed, 57 insertions(+), 57 deletions(-) diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 2ef1a28be..592415405 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.4.0-SNAPSHOT +brms.dependency.version=1.4.1-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 240872384..6b0dd1041 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,120 +3,120 @@ "default": [{ "groupId": "org.onap.policy.drools-applications.controlloop.templates", "artifactId": "template.demo", - "version": "1.4.0-SNAPSHOT" + "version": "1.4.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "trafficgenerator", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "trafficgenerator", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.4.0-SNAPSHOT" + "version": "1.4.1-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.4.0-SNAPSHOT" + "version": "1.4.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appclcm", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "model-yaml", - "version": "2.0.0-SNAPSHOT" + "version": "2.0.1-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 1922e90b3..b3fd734ec 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.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 548275c9d..97e225890 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.4.0-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.4.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 08fd8be40..48d9bc5a5 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.4.0-SNAPSHOT +brms.dependency.version=1.4.1-SNAPSHOT ENVIRONMENT = DEVL diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 035181db9..075372357 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 9714e4dc7..8cca55579 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index bffc06b38..ef76cc036 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 2bd454861..eacdbdac6 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 5d899fcbe..46ae78eb2 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 28cbf87d3..340ca4f98 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 05770808f..d168ccfad 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index c5da9dd95..c0d387321 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 159d83151..1eecf1cf5 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index feb9e51ea..54ca652f5 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 5a30f5163..349311e72 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index 7a5b6a16e..386c6bc67 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index d52038491..70ae11e7f 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 8c96319d3..b8b6ed48c 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT TestSuite pom diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 18dc891a1..afdf44068 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT base diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index c16df02b5..1080f4636 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,9 +84,9 @@ test_via_jmx=${{test_via_jmx}} ping_interval=30000 -brms.dependency.version=1.3.0-SNAPSHOT +brms.dependency.version=1.4.1-SNAPSHOT CLIENT_FILE=client.properties # AES key for password encryption in config files -#org.onap.policy.encryption.aes.key=12345678901234567890123456789012 \ No newline at end of file +#org.onap.policy.encryption.aes.key=12345678901234567890123456789012 diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 04a65adcb..0cc321233 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 72a978de9..d72a78aaf 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT install diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index bfd82a135..6d0f7d1af 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.0-SNAPSHOT -BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT +BRMS_DEPENDENCY_VERSION=1.4.1-SNAPSHOT +BRMS_MODELS_DEPENDENCY_VERSION=2.0.1-SNAPSHOT diff --git a/packages/pom.xml b/packages/pom.xml index a1dc9854f..a97debf55 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index f1a5a744a..21b7218c7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom diff --git a/version.properties b/version.properties index c0fb9b16f..e0ab8ddb9 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=4 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6