Bump engine to version 1.5.0 20/88920/4
authorJim Hahn <jrh3@att.com>
Thu, 30 May 2019 15:12:54 +0000 (11:12 -0400)
committerJim Hahn <jrh3@att.com>
Fri, 31 May 2019 13:47:33 +0000 (09:47 -0400)
Fixed license date.

Change-Id: I711fb4e91afdb3813bc04b16265f584d80ac8e5d
Issue-ID: POLICY-1747
Signed-off-by: Jim Hahn <jrh3@att.com>
26 files changed:
BRMSGateway/config.properties
BRMSGateway/dependency.json
BRMSGateway/pom.xml
BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
BRMSGateway/src/test/java/org/onap/policy/brms/api/BrmsPushTest.java
BRMSGateway/src/test/resources/config.properties
LogParser/pom.xml
ONAP-PAP-REST/pom.xml
ONAP-PDP-REST/pom.xml
ONAP-PDP/pom.xml
ONAP-REST/pom.xml
ONAP-SDK-APP/pom.xml
ONAP-XACML/pom.xml
POLICY-SDK-APP/pom.xml
PolicyEngineAPI/pom.xml
PolicyEngineClient/pom.xml
PolicyEngineUtils/pom.xml
TestSuite/Performance/pom.xml
TestSuite/Stability/pom.xml
TestSuite/pom.xml
packages/base/pom.xml
packages/docker/pom.xml
packages/install/pom.xml
packages/pom.xml
pom.xml
version.properties

index aaa3215..604faad 100644 (file)
@@ -77,7 +77,7 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.4.2-SNAPSHOT
+brms.dependency.version=1.5.0-SNAPSHOT
 
 ENVIRONMENT = DEVL
 
index c741d46..c82625d 100644 (file)
         "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",
index 3ef25d7..189cd36 100644 (file)
@@ -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>
index 38ca866..861bf7b 100644 (file)
@@ -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;
     }
 
index 2c76a2e..4141a8b 100644 (file)
@@ -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);
 
index b8fc09d..501adaa 100644 (file)
@@ -81,6 +81,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.4.2-SNAPSHOT
+brms.dependency.version=1.5.0-SNAPSHOT
 
 ENVIRONMENT = DEVL
index d455df3..1b15627 100644 (file)
@@ -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>
index 043d1ac..4b383a4 100644 (file)
     <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>
             <version>8.5.9</version>
         </dependency>
     </dependencies>
-    <properties>
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <projectversion>2.0.2</projectversion>
-    </properties>
 </project>
index 61c0381..297b9cd 100644 (file)
@@ -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>
index 5c69d93..5deed4a 100644 (file)
@@ -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>
index 2ba4ebc..9664632 100644 (file)
@@ -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>
index 13b4418..d94a9e6 100644 (file)
@@ -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>
index 80b50ac..a23bb5b 100644 (file)
@@ -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>
index 133e930..3b6faab 100644 (file)
@@ -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>
index 60179ca..e216bf1 100644 (file)
@@ -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>
index 03d6879..7832364 100644 (file)
@@ -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>
index 29c0373..babbe66 100644 (file)
@@ -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>
index 5782945..13551a7 100644 (file)
@@ -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>
index 81e100b..575f8b0 100644 (file)
@@ -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>
index fd68f82..38c0640 100644 (file)
@@ -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>
index fefcc28..2dbc699 100755 (executable)
@@ -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>
index 93f8150..2fdeb87 100644 (file)
@@ -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>
index 26d5c43..f597b0a 100644 (file)
@@ -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>
index 55a6cbe..f1e3cb9 100644 (file)
@@ -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 (file)
--- a/pom.xml
+++ b/pom.xml
     <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>
index 739b15f..2d1adf1 100644 (file)
@@ -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}