Merge "Fixed alignment"

diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties
index e4ac7b5..fcde085 100644 (file)
--- a/BRMSGateway/config.properties
+++ b/BRMSGateway/config.properties
@@ -77,6 +77,6 @@ ping_interval=30000
 #
 #
 #
-brms.dependency.version=1.1.1-SNAPSHOT
+brms.dependency.version=1.1.2-SNAPSHOT
 
 ENVIRONMENT = DEVL

diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index bc58cdd..e26b2e6 100644 (file)
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -3,96 +3,96 @@
         "default": [{
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "demo",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "events",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "rest",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "appc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "aai",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "mso",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "trafficgenerator",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }],
         "amsterdam": [{
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "events",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "appc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "appclcm",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "vfc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "so",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "aai",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "sdc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "trafficgenerator",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "eventmanager",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "guard",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "actorServiceProvider",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "actor.appc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "actor.appclcm",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "actor.so",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "actor.vfc",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "org.onap.policy.drools-applications",
             "artifactId": "policy-yaml",
-            "version": "1.1.1-SNAPSHOT"
+            "version": "1.1.2-SNAPSHOT"
         }, {
             "groupId": "com.att.research.xacml",
             "artifactId": "xacml-pdp",

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 2183a87..223f900 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-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/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
index 0842a40..8185f2d 100644 (file)
--- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
@@ -107,7 +107,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.1.1-SNAPSHOT";
+    private static final String DEFAULT_VERSION = "1.1.2-SNAPSHOT";
     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 b86d8ae..fbcdaf9 100644 (file)
--- 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.1.1-SNAPSHOT
+brms.dependency.version=1.1.2-SNAPSHOT
 
 ENVIRONMENT = DEVL

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index a95ed22..5ff7561 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>LogParser</artifactId>
        

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 71d32fa..b48a14e 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -29,7 +29,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <build>
                <plugins>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index ba9f733..afb7274 100644 (file)
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>ONAP-PDP-REST</artifactId>

diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index fd8054b..36ad0f5 100644 (file)
--- a/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@ -30,7 +30,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <dependencies>
                <dependency>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 8645fca..fa957ac 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -28,7 +28,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>ONAP-REST</artifactId>

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 8be39ec..b9f7e83 100644 (file)
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>ONAP-SDK-APP</artifactId>
        <packaging>war</packaging>

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 3f5fb21..b6a1e4b 100644 (file)
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -27,7 +27,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-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 19382dc..86a422a 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>POLICY-SDK-APP</artifactId>
        <packaging>war</packaging>

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 9ea3117..b73625f 100644 (file)
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        
        <artifactId>PolicyEngineAPI</artifactId>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index f381ecb..c8aefef 100644 (file)
--- a/PolicyEngineClient/pom.xml
+++ b/PolicyEngineClient/pom.xml
@@ -25,7 +25,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineClient</artifactId>
        <dependencies>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 94625a6..2e1b869 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineUtils</artifactId>
        <dependencies>

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index bf935b6..e704cf6 100755 (executable)
--- 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.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>base</artifactId>

diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 4590d94..3667e13 100644 (file)
--- 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.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>install</artifactId>

diff --git a/packages/pom.xml b/packages/pom.xml
index c0a15e3..d2259a8 100644 (file)
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.1.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>packages</artifactId>

diff --git a/pom.xml b/pom.xml
index d8bb126..cc076f1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
        <groupId>org.onap.policy.engine</groupId>
        <artifactId>PolicyEngineSuite</artifactId>
-       <version>1.1.1-SNAPSHOT</version>
+       <version>1.1.2-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>policy-engine</name>
 
@@ -66,6 +66,31 @@
                </site>
        </distributionManagement>
 
+        <repositories>
+                <!-- LF repositories -->
+                <repository>
+                        <id>ecomp-releases</id>
+                        <name>Release Repository</name>
+                        <url>${nexusproxy}/content/repositories/releases/</url>
+                </repository>
+                <repository>
+                        <id>ecomp-staging</id>
+                        <name>Staging Repository</name>
+                        <url>${nexusproxy}/content/repositories/staging/</url>
+                </repository>
+                <repository>
+                        <id>ecomp-snapshots</id>
+                        <name>Snapshots Repository</name>
+                        <url>${nexusproxy}/content/repositories/snapshots/</url>
+                </repository>
+                <repository>
+                        <id>ecomp-public</id>
+                        <name>Public Repository</name>
+                        <url>${nexusproxy}/content/repositories/public/</url>
+                </repository>
+                <!-- LF repositories END-->
+        </repositories>
+
        <reporting>
          <plugins>
            <plugin>