Merge "Sonar Fix- URIParser.java"

diff --git a/Dockerfiles/aai-common/README.md b/Dockerfiles/aai-common/README.md
index 0726e26..8213124 100644 (file)
--- a/Dockerfiles/aai-common/README.md
+++ b/Dockerfiles/aai-common/README.md
@@ -2,13 +2,23 @@
 
 ### Building the image
 
-Run the following command if building the image in internal network
+Run the following command to build AAI common images at internal network
 
 ```bash
     export NEW_VERSION=<NEW_VERSION>
-    docker build \
-           -t aaionap/aai-common:${NEW_VERSION}${BASE_TAG:-"-alpine"} -f <Dockerfile.alpine | Dockerfile.ubuntu> .
+    export BASE_IMAGE=<alpine | ubuntu>
+    sudo docker build -t \
+        nexus3.onap.org:10003/onap/aai-common-${BASE_IMAGE}:${NEW_VERSION} \
+        -f Dockerfile.${BASE_IMAGE} .
 ```
 
-Replace the NEW\_VERSION with the new docker image version for aai-common
-If different based images are required replace BASE\_TAG accordingly to the base image used.
+Replace the **NEW\_VERSION** with the new docker image version for aai-common.
+Set **BASE\_IMAGE** to **alpine** or **ubuntu** to build aai-common-alpine or
+aai-common-ubuntu image.
+
+NOTE: In order to push images into Nexus3, you have to be logged into Nexus3
+with appropriate credentials first.
+
+NOTE2: Both alpine and ubuntu based aai-common images are built automatically
+by jenkins jobs and they are available at official ONAP docker registry
+(currently nexus3).

diff --git a/Dockerfiles/haproxy/Dockerfile b/Dockerfiles/haproxy/Dockerfile
index f6d6c28..7bf9b20 100644 (file)
--- a/Dockerfiles/haproxy/Dockerfile
+++ b/Dockerfiles/haproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:1.7
+FROM haproxy:1.7-alpine
 
 # Set up your corporate proxy if there is
 ENV HTTP_PROXY  ""
@@ -6,17 +6,10 @@ ENV HTTPS_PROXY  ""
 ENV http_proxy  ""
 ENV https_proxy  ""
 
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN if [ ! -z ${HTTP_PROXY} ]; \
-    then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \
-    fi && \
-    if [ ! -z ${HTTP_PROXY} ]; \
-    then echo "Acquire::https::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \
-    fi && \
-    apt-get update && \
-    apt-get -y install ca-certificates openssl curl && \
-    rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache \
+    ca-certificates \
+    curl \
+    openssl
 
 RUN mkdir -p /etc/ssl/certs/ && mkdir -p /etc/ssl/private
 

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 6fd1c35..8838d53 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-annotations</artifactId>
     <name>aai-annotations</name>
     <packaging>jar</packaging>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>

diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 518f96f..090a7bc 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-auth</artifactId>
     <name>aai-auth</name>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 553db9f..75aea62 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-core</artifactId>
     <name>aai-core</name>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
       <springframework.version>4.3.24.RELEASE</springframework.version>
@@ -263,7 +263,7 @@
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
-            <version>0.2.0</version>
+            <version>0.2.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -465,7 +465,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
-            <version>1.5.20.RELEASE</version>
+            <version>1.5.21.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java
index ade20f4..4bc30b8 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java
@@ -22,7 +22,7 @@ package org.onap.aai;
 
 import java.util.Map;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.onap.aai.config.ConfigConfiguration;
@@ -88,8 +88,8 @@ public abstract class AAISetup {
 
     protected static final String SERVICE_NAME = "JUNIT";
 
-    @BeforeClass
-    public static void setupBundleconfig() throws Exception {
+    @Before
+    public void setupBundleconfig() throws Exception {
         System.setProperty("AJSC_HOME", ".");
         System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
         System.setProperty("aai.service.name", SERVICE_NAME);

diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index c640c10..203a89e 100644 (file)
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,17 +29,17 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-rest</artifactId>
     <name>aai-rest</name>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <eelf.core.version>1.0.1-oss</eelf.core.version>
-        <spring.boot.starter.web.version>1.5.20.RELEASE</spring.boot.starter.web.version>
-        <spring.boot.starter.parent.version>1.5.20.RELEASE</spring.boot.starter.parent.version>
+        <spring.boot.starter.web.version>1.5.21.RELEASE</spring.boot.starter.web.version>
+        <spring.boot.starter.parent.version>1.5.21.RELEASE</spring.boot.starter.parent.version>
         <spring.security.version>1.0.8.RELEASE</spring.security.version>
     </properties>
 
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
-            <version>1.5.20.RELEASE</version>
+            <version>1.5.21.RELEASE</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
index 130cb6e..f5fc074 100644 (file)
--- a/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/RestClient.java
@@ -79,7 +79,7 @@ public abstract class RestClient {
             log.error("URL syntax error with url {}{}", getBaseUrl(), uri);
             throw new RestClientException(e.getMessage());
         }
-        log.debug("METHOD={},URL={},http={}" + method, url, httpEntity);
+        log.debug("METHOD={},URL={},HEADERS={}", method, url, httpEntity);
 
         ResponseEntity responseEntity = getRestTemplate().exchange(url, method, httpEntity, String.class);
         log.debug("RESPONSE={}", responseEntity);

diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 9f20418..152994f 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-schema-ingest</artifactId>
     <name>aai-schema-ingest</name>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>1.5.20.RELEASE</version>
+            <version>1.5.21.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
-            <version>1.5.20.RELEASE</version>
+            <version>1.5.21.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 5e73372..000c2d6 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-utils</artifactId>
     <name>aai-utils</name>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>

diff --git a/pom.xml b/pom.xml
index dfc01f3..222c8e1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>

diff --git a/version.properties b/version.properties
index 708788b..704dc53 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=1
-minor_version=5
-patch_version=2
+minor_version=6
+patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}