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>
diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index aaa3215..604faad 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,7 +77,7 @@
#
#
#
-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 c741d46..c82625d 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 3ef25d7..189cd36 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 38ca866..861bf7b 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 @@
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 @@
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 2c76a2e..4141a8b 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 @@
// 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 b8fc09d..501adaa 100644
--- a/BRMSGateway/src/test/resources/config.properties
+++ b/BRMSGateway/src/test/resources/config.properties
@@ -81,6 +81,6 @@
#
#
#
-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 d455df3..1b15627 100644
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -24,7 +24,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>LogParser</artifactId>
<dependencies>
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 043d1ac..4b383a4 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -28,8 +28,11 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
+ <properties>
+ <hibernate.version>4.3.10.Final</hibernate.version>
+ </properties>
<build>
<plugins>
<plugin>
@@ -288,8 +291,4 @@
<version>8.5.9</version>
</dependency>
</dependencies>
- <properties>
- <hibernate.version>4.3.10.Final</hibernate.version>
- <projectversion>2.0.2</projectversion>
- </properties>
</project>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 61c0381..297b9cd 100644
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/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>ONAP-PDP-REST</artifactId>
<description>ONAP PDP REST</description>
diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 5c69d93..5deed4a 100644
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 2ba4ebc..9664632 100644
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -25,7 +25,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>ONAP-REST</artifactId>
<description>ONAP REST</description>
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 13b4418..d94a9e6 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -22,7 +22,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>ONAP-SDK-APP</artifactId>
<packaging>war</packaging>
diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 80b50ac..a23bb5b 100644
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -24,7 +24,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>ONAP-XACML</artifactId>
<packaging>jar</packaging>
diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 133e930..3b6faab 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -22,7 +22,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>POLICY-SDK-APP</artifactId>
<packaging>war</packaging>
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 60179ca..e216bf1 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -24,7 +24,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>PolicyEngineAPI</artifactId>
<dependencies>
diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index 03d6879..7832364 100644
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -24,7 +24,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>PolicyEngineClient</artifactId>
<dependencies>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 29c0373..babbe66 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -24,7 +24,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>PolicyEngineUtils</artifactId>
<dependencies>
diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml
index 5782945..13551a7 100644
--- a/TestSuite/Performance/pom.xml
+++ b/TestSuite/Performance/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>TestSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>Performance</artifactId>
<properties>
diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml
index 81e100b..575f8b0 100644
--- a/TestSuite/Stability/pom.xml
+++ b/TestSuite/Stability/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>TestSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>Stability</artifactId>
<properties>
diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml
index fd68f82..38c0640 100644
--- a/TestSuite/pom.xml
+++ b/TestSuite/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>TestSuite</artifactId>
<packaging>pom</packaging>
@@ -31,4 +31,4 @@
<module>Performance</module>
<module>Stability</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index fefcc28..2dbc699 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 93f8150..2fdeb87 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 26d5c43..f597b0a 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>install</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index 55a6cbe..f1e3cb9 100644
--- a/packages/pom.xml
+++ b/packages/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>packages</artifactId>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 85f44e4..cc07875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>2.1.0</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-engine</name>
<description>The ONAP Policy Engine main pom</description>
@@ -59,8 +59,8 @@
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<commons.compress.version>1.18</commons.compress.version>
<elasticsearch.version>6.4.3</elasticsearch.version>
- <version.policy.common>1.4.0</version.policy.common>
- <version.policy.models>2.0.0</version.policy.models>
+ <version.policy.common>1.5.0-SNAPSHOT</version.policy.common>
+ <version.policy.models>2.1.0-SNAPSHOT</version.policy.models>
</properties>
<modules>
<module>PolicyEngineUtils</module>
diff --git a/version.properties b/version.properties
index 739b15f..2d1adf1 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}