From 22f30af410e70e47e00f071092adae6fab7d56fc Mon Sep 17 00:00:00 2001 From: jhh Date: Fri, 12 Apr 2019 13:05:46 -0500 Subject: [PATCH] Support correct dependencies from models. Change-Id: I526bfa5edf3b036cd709d4500f5953faab7ad47e Issue-ID: POLICY-1611 Signed-off-by: jhh --- .../files/install/servers/brmsgw/dependency.json | 48 +++++++++++----------- packages/install/src/files/brmsgw.conf | 3 ++ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/packages/base/src/files/install/servers/brmsgw/dependency.json b/packages/base/src/files/install/servers/brmsgw/dependency.json index 117dc0126..06126837d 100644 --- a/packages/base/src/files/install/servers/brmsgw/dependency.json +++ b/packages/base/src/files/install/servers/brmsgw/dependency.json @@ -7,68 +7,68 @@ }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "rest", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "trafficgenerator", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }], "amsterdam": [{ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "events", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "appclcm", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "vfc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "so", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "aai", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnr", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "sdnc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-impl", "artifactId": "trafficgenerator", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", @@ -80,35 +80,35 @@ }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actorServiceProvider", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.appc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", - "artifactId": "actor.appclcm", + "artifactId": "actor.MODELS_appclcm", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.so", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnr", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.sdnc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions.model-actors", "artifactId": "actor.vfc", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "org.onap.policy.models.policy-models-interactions", "artifactId": "policy-yaml", - "version": "${{BRMS_DEPENDENCY_VERSION}}" + "version": "${{BRMS_MODELS_DEPENDENCY_VERSION}}" }, { "groupId": "com.att.research.xacml", "artifactId": "xacml-pdp", diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index e08036604..bfd82a135 100644 --- a/packages/install/src/files/brmsgw.conf +++ b/packages/install/src/files/brmsgw.conf @@ -58,3 +58,6 @@ node_type=brms_gateway CLIENT_ID=PDPServer CLIENT_KEY=test ENVIRONMENT=DEVL + +BRMS_DEPENDENCY_VERSION=1.4.0-SNAPSHOT +BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT -- 2.16.6