From: Jim Hahn Date: Thu, 30 May 2019 15:12:54 +0000 (-0400) Subject: Bump engine to version 1.5.0 X-Git-Tag: 1.5.0~12 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=81db61d122e8176bc7237f149d7815bf4979ed97 Bump engine to version 1.5.0 Fixed license date. Change-Id: I711fb4e91afdb3813bc04b16265f584d80ac8e5d Issue-ID: POLICY-1747 Signed-off-by: Jim Hahn --- 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 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.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 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 diff --git a/LogParser/pom.xml b/LogParser/pom.xml index d455df38e..1b156272d 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT LogParser diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 043d1ac74..4b383a418 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,8 +28,11 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT + + 4.3.10.Final + @@ -288,8 +291,4 @@ 8.5.9 - - 4.3.10.Final - 2.0.2 - diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 61c0381d0..297b9cda0 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT ONAP-PDP-REST ONAP PDP REST diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 5c69d93cf..5deed4a80 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 2ba4ebcb2..96646328d 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT ONAP-REST ONAP REST diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 13b4418c5..d94a9e632 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT ONAP-SDK-APP war diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 80b50ac86..a23bb5b91 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT ONAP-XACML jar diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 133e93067..3b6faab2b 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT POLICY-SDK-APP war diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 60179ca0f..e216bf1ff 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT PolicyEngineAPI diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 03d68793f..78323649a 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT PolicyEngineClient diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 29c037378..babbe665c 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT PolicyEngineUtils diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index 578294529..13551a722 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT Performance diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index 81e100b05..575f8b0cc 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine TestSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT Stability diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index fd68f82f0..38c064031 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT TestSuite pom @@ -31,4 +31,4 @@ Performance Stability - \ No newline at end of file + diff --git a/packages/base/pom.xml b/packages/base/pom.xml index fefcc28aa..2dbc69966 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT base diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 93f815082..2fdeb874f 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT docker diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 26d5c438d..f597b0a8a 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.engine packages - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT install diff --git a/packages/pom.xml b/packages/pom.xml index 55a6cbe11..f1e3cb9ff 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT packages pom diff --git a/pom.xml b/pom.xml index 85f44e4ed..cc0787539 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ org.onap.policy.parent integration - 2.1.0 + 3.0.0-SNAPSHOT org.onap.policy.engine PolicyEngineSuite - 1.4.2-SNAPSHOT + 1.5.0-SNAPSHOT pom policy-engine The ONAP Policy Engine main pom @@ -59,8 +59,8 @@ 1.3.3 1.18 6.4.3 - 1.4.0 - 2.0.0 + 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT PolicyEngineUtils diff --git a/version.properties b/version.properties index 739b15f12..2d1adf1a8 100644 --- a/version.properties +++ b/version.properties @@ -23,8 +23,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=4 -patch=2 +minor=5 +patch=0 base_version=${major}.${minor}.${patch}