From 81db61d122e8176bc7237f149d7815bf4979ed97 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 30 May 2019 11:12:54 -0400 Subject: Bump engine to version 1.5.0 Fixed license date. Change-Id: I711fb4e91afdb3813bc04b16265f584d80ac8e5d Issue-ID: POLICY-1747 Signed-off-by: Jim Hahn --- BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java | 8 +------- .../src/test/java/org/onap/policy/brms/api/BrmsPushTest.java | 8 ++++---- BRMSGateway/src/test/resources/config.properties | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'BRMSGateway/src') 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 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 -- cgit 1.2.3-korg