summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitreview1
-rw-r--r--BRMSGateway/config.properties2
-rw-r--r--BRMSGateway/dependency.json54
-rw-r--r--BRMSGateway/pom.xml2
-rw-r--r--BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java2
-rw-r--r--BRMSGateway/src/test/resources/config.properties2
-rw-r--r--LogParser/pom.xml2
-rw-r--r--ONAP-PAP-REST/pom.xml2
-rw-r--r--ONAP-PDP-REST/pom.xml2
-rw-r--r--ONAP-PDP/pom.xml2
-rw-r--r--ONAP-REST/pom.xml2
-rw-r--r--ONAP-SDK-APP/pom.xml2
-rw-r--r--ONAP-XACML/pom.xml2
-rw-r--r--POLICY-SDK-APP/pom.xml2
-rw-r--r--PolicyEngineAPI/pom.xml2
-rw-r--r--PolicyEngineClient/pom.xml2
-rw-r--r--PolicyEngineUtils/pom.xml2
-rw-r--r--TestSuite/Performance/pom.xml2
-rw-r--r--TestSuite/Stability/pom.xml2
-rw-r--r--TestSuite/pom.xml2
-rwxr-xr-xpackages/base/pom.xml2
-rw-r--r--packages/base/src/files/install/servers/brmsgw/config.properties2
-rw-r--r--packages/docker/pom.xml2
-rw-r--r--packages/install/pom.xml2
-rw-r--r--packages/install/src/files/brmsgw.conf4
-rw-r--r--packages/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
28 files changed, 56 insertions, 55 deletions
diff --git a/.gitreview b/.gitreview
index 9e38e62ac..e48a7ec91 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=gerrit.onap.org
port=29418
project=policy/engine.git
+defaultbranch=master
diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 25a2d32d1..ccf4fb5dd 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,7 +77,7 @@ ping_interval=30000
#
#
#
-brms.dependency.version=1.5.2
+brms.dependency.version=1.6.0-SNAPSHOT
ENVIRONMENT = DEVL
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index 2c0bcd004..5858574aa 100644
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -3,112 +3,112 @@
"default": [{
"groupId": "org.onap.policy.drools-applications.controlloop.templates",
"artifactId": "template.demo",
- "version": "1.5.2"
+ "version": "1.6.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "rest",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}],
"amsterdam": [{
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appclcm",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "vfc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "eventmanager",
- "version": "1.5.2"
+ "version": "1.6.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "guard",
- "version": "1.5.2"
+ "version": "1.6.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actorServiceProvider",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appclcm",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.so",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnr",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.vfc",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions",
"artifactId": "model-yaml",
- "version": "2.1.3"
+ "version": "2.2.0-SNAPSHOT"
}, {
"groupId": "com.att.research.xacml",
"artifactId": "xacml-pdp",
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 1e9737656..5b344af8a 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.5.2-SNAPSHOT</version>
+ <version>1.6.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 ff2186107..0c43aeef7 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.5.2";
+ private static final String DEFAULT_VERSION = "1.6.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";
diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index d8e489822..73ad1da84 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.5.2
+brms.dependency.version=1.6.0-SNAPSHOT
ENVIRONMENT = DEVL
diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index 8df7e3063..b0281ba88 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>LogParser</artifactId>
<dependencies>
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index a1ad7dc44..33c6e84dc 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<properties>
<hibernate.version>4.3.10.Final</hibernate.version>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 12926cf34..9cdd37227 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.5.2-SNAPSHOT</version>
+ <version>1.6.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 4fdf2199c..044219523 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 6b888f77c..680591854 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.5.2-SNAPSHOT</version>
+ <version>1.6.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 489e4aefe..240ee7f65 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.5.2-SNAPSHOT</version>
+ <version>1.6.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 482c3984f..75bf1c036 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.5.2-SNAPSHOT</version>
+ <version>1.6.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 1067e2f12..6a98e0f6e 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>POLICY-SDK-APP</artifactId>
<packaging>war</packaging>
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 40aeeb109..49c549408 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index ebfc3aef9..8bf4b1c5e 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineClient</artifactId>
<dependencies>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 17f10ade2..50434b36a 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineUtils</artifactId>
<dependencies>
diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml
index d6f310eba..f285cabbb 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>Performance</artifactId>
<properties>
diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml
index 213ce49b2..3fb6d9d6b 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>Stability</artifactId>
<properties>
diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml
index 04171a183..d5feb5062 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>TestSuite</artifactId>
<packaging>pom</packaging>
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 47f20ad52..b8b877109 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index 152b6a5aa..093b0e374 100644
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -84,7 +84,7 @@ test_via_jmx=${{test_via_jmx}}
ping_interval=30000
-brms.dependency.version=1.5.2
+brms.dependency.version=1.6.0-SNAPSHOT
CLIENT_FILE=client.properties
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index f1ba74ce2..6d8b852b0 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index b1c1dac87..9ebac5a30 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.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>install</artifactId>
diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index ef9a46d36..6d025e2fc 100644
--- a/packages/install/src/files/brmsgw.conf
+++ b/packages/install/src/files/brmsgw.conf
@@ -59,5 +59,5 @@ CLIENT_ID=PDPServer
CLIENT_KEY=test
ENVIRONMENT=DEVL
-BRMS_DEPENDENCY_VERSION=1.5.2
-BRMS_MODELS_DEPENDENCY_VERSION=2.1.3
+BRMS_DEPENDENCY_VERSION=1.6.0-SNAPSHOT
+BRMS_MODELS_DEPENDENCY_VERSION=2.2.0-SNAPSHOT
diff --git a/packages/pom.xml b/packages/pom.xml
index db02efbdf..d152ad9fb 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>packages</artifactId>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 031592962..76589c58f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-engine</name>
<description>The ONAP Policy Engine main pom</description>
diff --git a/version.properties b/version.properties
index da665c161..c4476947f 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=5
-patch=2
+minor=6
+patch=0
base_version=${major}.${minor}.${patch}