summaryrefslogtreecommitdiffstats
path: root/BRMSGateway
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-05-30 11:12:54 -0400
committerJim Hahn <jrh3@att.com>2019-05-31 09:47:33 -0400
commit81db61d122e8176bc7237f149d7815bf4979ed97 (patch)
tree6fd6cb7cbb9d152ca01e2ee4ecffa83b012d1199 /BRMSGateway
parent6bc4e95261ed8ec8bc931696e3674ee5ec54d542 (diff)
Bump engine to version 1.5.0
Fixed license date. Change-Id: I711fb4e91afdb3813bc04b16265f584d80ac8e5d Issue-ID: POLICY-1747 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'BRMSGateway')
-rw-r--r--BRMSGateway/config.properties2
-rw-r--r--BRMSGateway/dependency.json62
-rw-r--r--BRMSGateway/pom.xml2
-rw-r--r--BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java8
-rw-r--r--BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java8
-rw-r--r--BRMSGateway/src/test/resources/config.properties2
6 files changed, 35 insertions, 49 deletions
diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index aaa3215bb..604faada4 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,7 +77,7 @@ ping_interval=30000
#
#
#
-brms.dependency.version=1.4.2-SNAPSHOT
+brms.dependency.version=1.5.0-SNAPSHOT
ENVIRONMENT = DEVL
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index c741d46c0..c82625dee 100644
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -3,120 +3,112 @@
"default": [{
"groupId": "org.onap.policy.drools-applications.controlloop.templates",
"artifactId": "template.demo",
- "version": "1.4.2-SNAPSHOT"
+ "version": "1.5.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "rest",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.0.2-SNAPSHOT"
- }, {
- "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
- "artifactId": "trafficgenerator",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}],
"amsterdam": [{
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appclcm",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "vfc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdc",
- "version": "2.0.2-SNAPSHOT"
- }, {
- "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
- "artifactId": "trafficgenerator",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "eventmanager",
- "version": "1.4.2-SNAPSHOT"
+ "version": "1.5.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "guard",
- "version": "1.4.2-SNAPSHOT"
+ "version": "1.5.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actorServiceProvider",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appclcm",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.so",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnr",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.vfc",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions",
"artifactId": "model-yaml",
- "version": "2.0.2-SNAPSHOT"
+ "version": "2.1.0-SNAPSHOT"
}, {
"groupId": "com.att.research.xacml",
"artifactId": "xacml-pdp",
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 3ef25d79f..189cd364a 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-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 38ca8665f..861bf7b95 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.2-SNAPSHOT";
+ private static final String DEFAULT_VERSION = "1.5.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";
@@ -1049,12 +1049,6 @@ public class BrmsPush {
msoDependency.setArtifactId("controlloop.common.model-impl.so");
msoDependency.setVersion(version);
dependencyList.add(msoDependency);
-
- final Dependency trafficgeneratorDependency = new Dependency();
- trafficgeneratorDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
- trafficgeneratorDependency.setArtifactId("controlloop.common.model-impl.trafficgenerator");
- trafficgeneratorDependency.setVersion(version);
- dependencyList.add(trafficgeneratorDependency);
return dependencyList;
}
diff --git a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
index 2c76a2eff..4141a8bd2 100644
--- a/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
+++ b/BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -108,7 +108,7 @@ public class BrmsPushTest {
// Test misc methods
final String controllerName = "testController";
final List<Dependency> deps = push.defaultDependencies(controllerName);
- assertEquals(deps.size(), 7);
+ assertEquals(deps.size(), 6);
assertNotNull(BrmsPush.getBackUpMonitor());
assertEquals(push.urlListSize(), 1);
diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index b8fc09dea..501adaaec 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.2-SNAPSHOT
+brms.dependency.version=1.5.0-SNAPSHOT
ENVIRONMENT = DEVL