Merge "Use managed guava version"

diff --combined pom.xml
index d9aeb55,99fc35e..10c5db8
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -8,9 -8,9 +8,9 @@@
    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
-  
+ 
           http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@@ -19,8 -19,7 +19,7 @@@
    ============LICENSE_END============================================
    ECOMP is a trademark and service mark of AT&T Intellectual Property.
  -->
- <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/maven-v4_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/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.dmaap.dbcapi</groupId>
        <artifactId>dbcapi</artifactId>
@@@ -29,8 -28,8 +28,8 @@@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
        <build>
                <finalName>dbcapi</finalName>
@@@ -152,36 -151,6 +151,36 @@@
                  </dependencies>
                </plugin>
  
 +              <!-- prevent SNAPSHOT dependencies -->
 +              <plugin>
 +                      <groupId>org.apache.maven.plugins</groupId>
 +                      <artifactId>maven-enforcer-plugin</artifactId>
 +                      <executions>
 +                              <execution>
 +                                      <id>enforce-no-snapshots</id>
 +                                      <goals>
 +                                              <goal>enforce</goal>
 +                                      </goals>
 +                                      <configuration>
 +                                              <rules>
 +                                                      <requireReleaseDeps>
 +                                                              <message>No Snapshots Allowed!</message>
 +                                                              <excludes>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
 +                                                                      <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
 +                                                              </excludes>
 +                                                      </requireReleaseDeps>
 +                                              </rules>
 +                                              <fail>true</fail>
 +                                      </configuration>
 +                              </execution>
 +                      </executions>
 +              </plugin>
 +
                </plugins>
                <pluginManagement>
                        <plugins>
@@@ -204,7 -173,7 +203,7 @@@
                                                                                </goals>
                                                                        </pluginExecutionFilter>
                                                                        <action>
-                                                                               <ignore />
+                                                                               <ignore/>
                                                                        </action>
                                                                </pluginExecution>
                                                        </pluginExecutions>
@@@ -237,6 -206,14 +236,6 @@@
                        <artifactId>jackson-annotations</artifactId>
                        <version>${jackson.version}</version>
                </dependency>
 -              <dependency>
 -                      <groupId>com.fasterxml.jackson.core</groupId>
 -                      <artifactId>jackson-databind</artifactId>
 -<!-- for DMAAP-205, a point release on the common version
 -       addresses a security issue.  Note the add notation here
 -  -->
 -                      <version>${jackson.version}.1</version>
 -              </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.dataformat</groupId>
                        <artifactId>jackson-dataformat-yaml</artifactId>
@@@ -252,29 -229,20 +251,29 @@@
                        <artifactId>logback-classic</artifactId>
                        <version>1.2.0</version>
                </dependency>
 +<!-- DMAAP-656:
 +   - override this dependency because it utilized a third party
 +   - lib called com.google.guava:20.0 which had severe security threat identified.
 + -->
 +              <dependency>
 +                      <groupId>com.google.guava</groupId>
 +                      <artifactId>guava</artifactId>
 +                      <version>24.1.1-jre</version>
 +              </dependency>
                <dependency>
                        <groupId>io.swagger</groupId>
                        <artifactId>swagger-core</artifactId>
 -                      <version>1.5.13</version>
 +                      <version>${swagger.version}</version>
                </dependency>
                <dependency>
                        <groupId>io.swagger</groupId>
                        <artifactId>swagger-jersey2-jaxrs</artifactId>
 -                      <version>1.5.13</version>
 +                      <version>${swagger.version}</version>
                </dependency>
                <dependency>
                        <groupId>io.swagger</groupId>
                        <artifactId>swagger-annotations</artifactId>
 -                      <version>1.5.13</version>
 +                      <version>${swagger.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.glassfish.jersey.containers</groupId>
@@@ -317,7 -285,7 +316,7 @@@
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
 -                      <version>1.6</version>
 +                      <version>1.11</version>
                </dependency>
                <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
                <dependency>
@@@ -376,13 -344,12 +375,13 @@@
                </site>
        </distributionManagement>
        <properties>
 -          <jackson.version>2.8.11</jackson.version>
 +              <swagger.version>1.5.19</swagger.version>
 +          <jackson.version>2.9.5</jackson.version>
                <jersey.version>2.26</jersey.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -              <jettyVersion>9.3.9.v20160517</jettyVersion> 
 +              <jettyVersion>9.3.8.RC0</jettyVersion> 
                <eelf.version>0.0.1</eelf.version>
 -              <artifact.version>1.0.14-SNAPSHOT</artifact.version>
 +              <artifact.version>1.0.15-SNAPSHOT</artifact.version>
                <!-- SONAR -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
                <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>