X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=a555393979d9d9ee17c93832444f71c7fa359d1c;hb=5eeb7b8e6f7c4bbe5da8d08a8145109e2f05329f;hp=22dcc7ade3a2b98bccc38b1bd97ad3480535d6a7;hpb=1c6b5fa580c9b82e17b710dbc4cf9bbce57eb5bc;p=dmaap%2Fdbcapi.git

diff --git a/pom.xml b/pom.xml
index 22dcc7a..a555393 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0"?>
-<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">
+<!--
+  ============LICENSE_START==========================================
+  org.onap.dmaap
+  ===================================================================
+  Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.dmaap.dbcapi</groupId>
 	<artifactId>dbcapi</artifactId>
@@ -9,8 +28,8 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
-		<relativePath />
+		<version>1.2.2</version>
+		<relativePath/>
 	</parent>
 	<build>
 		<finalName>dbcapi</finalName>
@@ -132,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>
@@ -154,7 +203,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -176,19 +225,17 @@
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
+        <dependency>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-cadi-aaf</artifactId>
+			<version>2.1.7</version>
+            <classifier>full</classifier>
+        </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<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>
@@ -197,27 +244,36 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.3</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>
@@ -260,13 +316,13 @@
 		<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>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.4.1208.jre7</version>
+			<version>42.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.att.eelf</groupId>
@@ -291,7 +347,13 @@
     		<groupId>org.glassfish.jersey.inject</groupId>
     		<artifactId>jersey-hk2</artifactId>
 		</dependency>
-	</dependencies>
+    <dependency>
+      <groupId>pl.pragmatists</groupId>
+      <artifactId>JUnitParams</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 	<reporting>
 		<plugins>
 			<plugin>
@@ -319,12 +381,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> 
-		<eelf.version>0.0.1</eelf.version>
-		<artifact.version>1.0.5-SNAPSHOT</artifact.version>
+		<jettyVersion>9.4.12.RC2</jettyVersion> 
+		<eelf.version>1.0.0</eelf.version>
+		<artifact.version>1.0.28-SNAPSHOT</artifact.version>
 		<!-- SONAR -->
 		<jacoco.version>0.7.7.201606060606</jacoco.version>
 		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>