From 1c5d6cdf3793b0691686dc34c742f62582daff50 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 17 Sep 2019 12:14:50 -0400 Subject: Bump versions in policy/engine master Also added default branch to .gitreview to facilitate branching in the future. Switched internal properties to use snapshot versions of other repos per review comment. Change-Id: I23d71e67051d88cfaa07adc15e2d143289269027 Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn --- BRMSGateway/config.properties | 2 +- BRMSGateway/dependency.json | 54 +++++++++++----------- BRMSGateway/pom.xml | 2 +- .../java/org/onap/policy/brms/api/BrmsPush.java | 2 +- BRMSGateway/src/test/resources/config.properties | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'BRMSGateway') diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 25a2d32d1..ccf4fb5dd 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.5.2 +brms.dependency.version=1.6.0-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 2c0bcd004..5858574aa 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.5.2" + "version": "1.6.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", - "version": "1.5.2" + "version": "1.6.0-SNAPSHOT" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", - "version": "1.5.2" + "version": "1.6.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appclcm", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "model-yaml", - "version": "2.1.3" + "version": "2.2.0-SNAPSHOT" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 1e9737656..5b344af8a 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.5.2-SNAPSHOT + 1.6.0-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 ff2186107..0c43aeef7 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.2"; + private static final String DEFAULT_VERSION = "1.6.0-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 d8e489822..73ad1da84 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.2 +brms.dependency.version=1.6.0-SNAPSHOT ENVIRONMENT = DEVL -- cgit 1.2.3-korg