Merge "Use managed guava version"

diff --combined ms/blueprintsprocessor/parent/pom.xml
index ecd123d,ea27c63..409c8ad
--- 1/ms/blueprintsprocessor/parent/pom.xml
--- 2/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@@ -2,8 -2,6 +2,8 @@@
  <!--
    ~  Copyright © 2017-2018 AT&T Intellectual Property.
    ~
 +  ~  Modifications Copyright © 2018 IBM.
 +  ~
    ~  Licensed under the Apache License, Version 2.0 (the "License");
    ~  you may not use this file except in compliance with the License.
    ~  You may obtain a copy of the License at
@@@ -16,8 -14,7 +16,7 @@@
    ~  See the License for the specific language governing permissions and
    ~  limitations under the License.
    -->
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
          <groupId>org.onap.ccsdk.apps</groupId>
@@@ -158,7 -155,7 +157,7 @@@
              <dependency>
                  <groupId>com.google.guava</groupId>
                  <artifactId>guava</artifactId>
-                 <version>25.1-jre</version>
+ 
              </dependency>
  
              <!-- Database -->
@@@ -168,12 -165,6 +167,12 @@@
                  <version>${h2database.version}</version>
              </dependency>
              <!-- Test Dependency -->
 +            <dependency>
 +                <groupId>org.powermock</groupId>
 +                <artifactId>powermock-api-mockito2</artifactId>
 +                <version>1.7.4</version>
 +                <scope>test</scope>
 +            </dependency>
              <dependency>
                  <groupId>org.jetbrains.kotlin</groupId>
                  <artifactId>kotlin-test</artifactId>
@@@ -183,11 -174,52 +182,11 @@@
          </dependencies>
      </dependencyManagement>
      <dependencies>
 -        <dependency>
 -            <groupId>org.apache.commons</groupId>
 -            <artifactId>commons-lang3</artifactId>
 -        </dependency>
 -        <dependency>
 -            <groupId>commons-collections</groupId>
 -            <artifactId>commons-collections</artifactId>
 -        </dependency>
 -        <dependency>
 -            <groupId>commons-io</groupId>
 -            <artifactId>commons-io</artifactId>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.velocity</groupId>
 -            <artifactId>velocity</artifactId>
 -        </dependency>
  
 +        <!-- Application Component Dependency -->
          <dependency>
 -            <groupId>io.springfox</groupId>
 -            <artifactId>springfox-swagger2</artifactId>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.springfox</groupId>
 -            <artifactId>springfox-swagger-ui</artifactId>
 -        </dependency>
 -
 -        <dependency>
 -            <groupId>org.springframework.boot</groupId>
 -            <artifactId>spring-boot-starter-test</artifactId>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.jetbrains.kotlin</groupId>
 -            <artifactId>kotlin-test</artifactId>
 -            <version>${kotlin.version}</version>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.projectreactor</groupId>
 -            <artifactId>reactor-test</artifactId>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.jetbrains.kotlin</groupId>
 -            <artifactId>kotlin-stdlib-jdk8</artifactId>
 -            <version>${kotlin.version}</version>
 +            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
 +            <artifactId>resource-dict</artifactId>
          </dependency>
      </dependencies>
      <build>

diff --combined ms/controllerblueprints/parent/pom.xml
index 19e55fe,1e8b8f2..370533b
--- 1/ms/controllerblueprints/parent/pom.xml
--- 2/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@@ -2,8 -2,6 +2,8 @@@
  <!--
    ~ Copyright © 2017-2018 AT&T Intellectual Property.
    ~
 +  ~ Modifications Copyright © 2018 IBM.
 +  ~
    ~ Licensed under the Apache License, Version 2.0 (the "License");
    ~ you may not use this file except in compliance with the License.
    ~ You may obtain a copy of the License at
@@@ -16,11 -14,7 +16,7 @@@
    ~ See the License for the specific language governing permissions and
    ~ limitations under the License.
    -->
- 
- <project
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
          <groupId>org.onap.ccsdk.apps</groupId>
@@@ -91,7 -85,7 +87,7 @@@
              <dependency>
                  <groupId>com.google.guava</groupId>
                  <artifactId>guava</artifactId>
-                 <version>25.1-jre</version>
+ 
              </dependency>
  
              <!-- Kotlin Dependencies -->
@@@ -118,7 -112,12 +114,7 @@@
                  <artifactId>h2</artifactId>
                  <version>${h2database.version}</version>
              </dependency>
 -            <dependency>
 -                <groupId>org.jetbrains.kotlin</groupId>
 -                <artifactId>kotlin-test</artifactId>
 -                <version>${kotlin.version}</version>
 -                <scope>test</scope>
 -            </dependency>
 +
  
              <!-- Application Components -->
              <dependency>
@@@ -141,20 -140,6 +137,20 @@@
                  <artifactId>resource-dict</artifactId>
                  <version>${project.version}</version>
              </dependency>
 +
 +            <!-- Testing Dependencies -->
 +            <dependency>
 +                <groupId>org.powermock</groupId>
 +                <artifactId>powermock-api-mockito2</artifactId>
 +                <version>1.7.4</version>
 +                <scope>test</scope>
 +            </dependency>
 +            <dependency>
 +                <groupId>org.jetbrains.kotlin</groupId>
 +                <artifactId>kotlin-test</artifactId>
 +                <version>${kotlin.version}</version>
 +                <scope>test</scope>
 +            </dependency>
          </dependencies>
      </dependencyManagement>
  
@@@ -199,8 -184,25 +195,8 @@@
              <groupId>com.fasterxml.jackson.module</groupId>
              <artifactId>jackson-module-kotlin</artifactId>
          </dependency>
 -        <!-- test -->
 -        <dependency>
 -            <groupId>junit</groupId>
 -            <artifactId>junit</artifactId>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.jetbrains.kotlin</groupId>
 -            <artifactId>kotlin-test</artifactId>
 -            <scope>test</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>io.projectreactor</groupId>
 -            <artifactId>reactor-test</artifactId>
 -            <scope>test</scope>
 -        </dependency>
      </dependencies>
  
 -
      <build>
          <plugins>
              <plugin>