Merge "Improve policy Config"

diff --combined pom.xml
index e023994,b801e0f..05e983b
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -57,7 -57,7 +57,7 @@@
                </description>
  
                <properties>
 -                              <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
 +                              <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                                <clamp.project.version>${project.version}</clamp.project.version>
                                <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
                                <maven.compiler.source>1.8</maven.compiler.source>
@@@ -88,7 -88,8 +88,7 @@@
                                <skip.docker.build>true</skip.docker.build>
                                <skip.docker.push>true</skip.docker.push>
                                <skip.staging.artifacts>false</skip.staging.artifacts>
 -                              <http.proxy></http.proxy>
 -
 +                              <python.http.proxy.param></python.http.proxy.param>
                </properties>
  
                <distributionManagement>
@@@ -305,7 -306,7 +305,7 @@@
                                <dependency>
                                                <groupId>org.onap.policy.engine</groupId>
                                                <artifactId>PolicyEngineAPI</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.2.0</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <groupId>com.google.guava</groupId>
@@@ -331,16 -332,12 +331,16 @@@
                                                                                <groupId>commons-io</groupId>
                                                                                <artifactId>commons-io</artifactId>
                                                                </exclusion>
 +                                                              <exclusion>
 +                                                                              <artifactId>grizzly-http</artifactId>
 +                                                                              <groupId>org.glassfish.grizzly</groupId>
 +                                                              </exclusion>
                                                </exclusions>
                                </dependency>
                                <dependency>
                                                <groupId>org.onap.policy.common</groupId>
                                                <artifactId>ONAP-Logging</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
@@@ -359,7 -356,7 +359,7 @@@
                                <dependency>
                                                <groupId>org.onap.policy.engine</groupId>
                                                <artifactId>PolicyEngineUtils</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
@@@ -390,7 -387,7 +390,7 @@@
                                <dependency>
                                                <groupId>org.onap.policy.drools-applications</groupId>
                                                <artifactId>policy-yaml</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
@@@ -409,7 -406,7 +409,7 @@@
                                <dependency>
                                                <groupId>org.onap.policy.drools-applications</groupId>
                                                <artifactId>sdc</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
@@@ -428,7 -425,7 +428,7 @@@
                                <dependency>
                                                <groupId>org.onap.policy.drools-applications</groupId>
                                                <artifactId>aai</artifactId>
-                                               <version>1.1.0</version>
+                                               <version>1.1.3</version>
                                                <exclusions>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
@@@ -483,14 -480,14 +483,14 @@@
                                </dependency>
                                <!-- For SDC Controller -->
                                <dependency>
 -                                              <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
 +                                              <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                                                <artifactId>sdc-distribution-client</artifactId>
 -                                              <version>1.2.2</version>
 +                                              <version>1.3.0</version>
                                </dependency>
                                <dependency>
 -                                      <groupId>org.openecomp.sdc.sdc-tosca</groupId>
 +                                      <groupId>org.onap.sdc.sdc-tosca</groupId>
                                        <artifactId>sdc-tosca</artifactId>
 -                                      <version>1.2.2</version>
 +                                      <version>1.3.3</version>
                                </dependency>
                </dependencies>
  
@@@ -830,7 -827,7 +830,7 @@@
                                                                                                                                </ports>
                                                                                                                                <workingDir>/usr/src/http-cache-app</workingDir>
                                                                                                                                <cmd>
 -                                                                                                                                              <shell>./start_http_cache.sh ${http.proxy}</shell>
 +                                                                                                                                              <shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
                                                                                                                                </cmd>
                                                                                                                </run>
                                                                                                </image>