Merge "JUnit additions for PAP-REST"

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 39e943b..0d9ebfb 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -66,10 +66,26 @@
                        <artifactId>integrity-monitor</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <!--
+               CLM security fix - force use of commons-collections 3.2.2.
+               Remove this if a new version of nexus-rest-client-java is upgraded
+               to not use velocity (and then subsequently commons-collections v3.1 
+                -->
+               <dependency>
+                   <groupId>commons-collections</groupId>
+                   <artifactId>commons-collections</artifactId>
+                   <version>3.2.2</version>
+               </dependency>
                <dependency>
                        <groupId>org.sonatype.nexus</groupId>
                        <artifactId>nexus-rest-client-java</artifactId>
                        <version>2.3.1-01</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-collections</groupId>
+                                       <artifactId>commons-collections</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>com.thoughtworks.xstream</groupId>

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index c1ce21e..687e5b3 100644 (file)
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -238,6 +238,16 @@
                        <type>jar</type>
                </dependency>
                <!-- SDK components -->
+               <!--
+               CLM security fix - force use of commons-collections 3.2.2.
+               Remove this if a new version of epsdk-core is upgraded
+               to not use esapi (and then subsequently commons-collections v3.2
+                -->
+               <dependency>
+                   <groupId>commons-collections</groupId>
+                   <artifactId>commons-collections</artifactId>
+                   <version>3.2.2</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-core</artifactId>
@@ -247,6 +257,10 @@
                                        <groupId>mysql</groupId>
                                        <artifactId>mysql-connector-java</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>commons-collections</groupId>
+                                       <artifactId>commons-collections</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>

diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index fe56808..b0e8205 100644 (file)
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -1,4 +1,33 @@
-FROM onap/policy/policy-base
+FROM ubuntu:14.04
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+
+RUN \
+        apt-get clean && \
+        apt-get update && \
+        apt-get install -y zip unzip curl wget ssh telnet maven && \
+        apt-get install -y software-properties-common && \
+        apt-get install -y jq httpie && \
+        apt-get install -y python-pip && \
+        add-apt-repository ppa:openjdk-r/ppa && \
+        apt-get clean && \
+        apt-get update && \
+        apt-get install -y openjdk-8-jdk
+
+RUN useradd --create-home --shell /bin/bash policy
+
+# install MariaDB client
+RUN \
+    apt-get install -y apt-transport-https && \
+        apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
+        add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu trusty main' && \
+        apt-get clean && \
+        apt-get update && \
+        apt-get install -y mariadb-client
 
 RUN mkdir -p /opt/app/policy /tmp/policy-install && chown policy /opt/app/policy /tmp/policy-install
 

diff --git a/pom.xml b/pom.xml
index eba1c04..5338855 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 
                <!-- Project common dependency versions -->
                <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
-               <dmaap.version>1.0.0</dmaap.version>
+               <dmaap.version>1.1.3-SNAPSHOT</dmaap.version>
                <httpclient.version>4.5.5</httpclient.version>
                <jackson.version>2.9.4</jackson.version>
                <commons.fileupload.version>1.3.3</commons.fileupload.version>
@@ -107,31 +107,6 @@
                </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>