summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BRMSGateway/config.properties2
-rw-r--r--BRMSGateway/dependency.json46
-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--docs/release-notes.rst9
-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/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
24 files changed, 50 insertions, 49 deletions
diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index 081d308ca..e716c49fc 100644
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,6 +77,6 @@ ping_interval=30000
#
#
#
-brms.dependency.version=1.2.2
+brms.dependency.version=1.2.3
ENVIRONMENT = DEVL
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index aa200f1ae..000d3f61a 100644
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -3,96 +3,96 @@
"default": [{
"groupId": "org.onap.policy.drools-applications.controlloop.templates",
"artifactId": "template.demo",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "events",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "rest",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "appc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "aai",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "so",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "trafficgenerator",
- "version": "1.2.2"
+ "version": "1.2.3"
}],
"amsterdam": [{
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "events",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "appc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "appclcm",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "vfc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "so",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "aai",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "sdc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
"artifactId": "trafficgenerator",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "eventmanager",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "guard",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
"artifactId": "actorServiceProvider",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
"artifactId": "actor.appc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
"artifactId": "actor.appclcm",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
"artifactId": "actor.so",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
"artifactId": "actor.vfc",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "policy-yaml",
- "version": "1.2.2"
+ "version": "1.2.3"
}, {
"groupId": "com.att.research.xacml",
"artifactId": "xacml-pdp",
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index eabf00f34..e6e9bafae 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 a15eee34d..caf49aa55 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
@@ -118,7 +118,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.2.2";
+ private static final String DEFAULT_VERSION = "1.2.3";
private static final String DEPENDENCY_FILE = "dependency.json";
private static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties
index 2330424b4..25eeb83a6 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.2.2
+brms.dependency.version=1.2.3
ENVIRONMENT = DEVL
diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index e887bf03e..1dd7ee8d3 100644
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>LogParser</artifactId>
<dependencies>
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 2c694d293..15b512599 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.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<build>
<plugins>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 6ab3b4970..656da4b24 100644
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 33af65235..c329fba0c 100644
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 2776c89b5..dbde32284 100644
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 ddc425273..16fc240ad 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>ONAP-SDK-APP</artifactId>
<packaging>war</packaging>
diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index b2aa41611..f7b9bba62 100644
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 f5ced6814..0ce7b9d92 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>POLICY-SDK-APP</artifactId>
<packaging>war</packaging>
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 09e647a04..9fd60d14d 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index 0c0d7fc54..78fa7a55d 100644
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineClient</artifactId>
<dependencies>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index cefb9b8bf..2baed14fe 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineUtils</artifactId>
<dependencies>
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 5164ddcc4..d04d282d1 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -82,7 +82,6 @@ The Beijing release for POLICY delivered the following Epics. For a full list of
**Bug Fixes**
- * `[POLICY-454] <https://jira.onap.org/browse/POLICY-454>`_ - brmsgw 1.1.2 policy rules generation in a 1.1.1 docker image
* `[POLICY-484] <https://jira.onap.org/browse/POLICY-484>`_ - Extend election handler run window and clean up error messages
* `[POLICY-494] <https://jira.onap.org/browse/POLICY-494>`_ - POLICY EELF Audit.log not in ECOMP Standards Compliance
* `[POLICY-501] <https://jira.onap.org/browse/POLICY-501>`_ - Fix issues blocking election handler and add directed interface for opstate
@@ -98,12 +97,11 @@ The Beijing release for POLICY delivered the following Epics. For a full list of
* `[POLICY-743] <https://jira.onap.org/browse/POLICY-743>`_ - Fixed data name since its name was changed on server side
* `[POLICY-753] <https://jira.onap.org/browse/POLICY-753>`_ - Policy Health Check failed with multi-node cluster
* `[POLICY-765] <https://jira.onap.org/browse/POLICY-765>`_ - junit test for guard fails intermittently
- * `[POLICY-796] <https://jira.onap.org/browse/POLICY-796>`_ - VirtualControlLoopEvent facts are piling up
**Security Issues**
- * Please see the `Policy R2 Beijing Security/Vulnerability Threat <https://wiki.onap.org/pages/viewpage.action?pageId=25437092>`_ page for security related issues.
+ * Refer to the `Policy R2 Beijing Security/Vulnerability Threat <https://wiki.onap.org/pages/viewpage.action?pageId=25437092>`_ page for security related issues.
**Known Issues**
@@ -112,6 +110,7 @@ The Beijing release for POLICY delivered the following Epics. For a full list of
* `[POLICY-764] <https://jira.onap.org/browse/POLICY-764>`_ - Policy Engine PIP Configuration JUnit Test fails intermittently
* `[POLICY-776] <https://jira.onap.org/browse/POLICY-776>`_ - OOF Policy TOSCA models are not correctly rendered
* `[POLICY-799] <https://jira.onap.org/browse/POLICY-799>`_ - Policy API Validation Does Not Validate Required Parent Attributes in the Model
+ * `[POLICY-801] <https://jira.onap.org/browse/POLICY-801>`_ - fields mismatch for OOF flavorFeatures between implementation and wiki
@@ -219,7 +218,9 @@ The Amsterdam release continued evolving the design driven architecture of and f
.. For initial document: list epic and user stories for each, list user stories with no epics.
.. For Bugs section, list bugs that are not tied to an epic. Remove all items with "Won't Do" resolution.
.. 01/15/2018 - Added change for version 1.1.3 to the Amsterdam branch. Also corrected prior version (1.2.0) to (1.1.1)
-.. 11/16/2017 - Initial document for Amsterdam release.
+.. Also, Set up initial information for Beijing.
+.. 05/21/2018 - Information for Beijing release.
+.. Excluded POLICY-454 from bug list since it doesn't apply to Beijing per Jorge.
End of Release Notes
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 9ee6e4e0a..2a60f14eb 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 fa7909608..c6c122e2f 100644
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -84,6 +84,6 @@ test_via_jmx=${{test_via_jmx}}
ping_interval=30000
-brms.dependency.version=1.2.2
+brms.dependency.version=1.2.3
CLIENT_FILE=client.properties
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 2ebd49699..d001c5415 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 79274bc63..14d3a7863 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>install</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index 3de0648be..6a869d02e 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-SNAPSHOT</version>
</parent>
<artifactId>packages</artifactId>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 0fde2900d..4fbaf627f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.2.2-SNAPSHOT</version>
+ <version>1.2.3-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 7e20a36bf..b80ccebde 100644
--- a/version.properties
+++ b/version.properties
@@ -24,7 +24,7 @@
major=1
minor=2
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}