X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f44bd61d6a0f30831539881a3aa0060bd28be666;hb=49d5ae3928a7079db098096592574e5a2bda592b;hp=45bfe2961bda3ac8acbf00ecf83fcf57e346c374;hpb=25129101f6735146df78a6c94fac9fca510d585d;p=aaf%2Fcadi.git

diff --git a/pom.xml b/pom.xml
index 45bfe29..f44bd61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
 	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>
 	<groupId>org.onap.aaf.cadi</groupId>
-	<artifactId>cadimiscparent</artifactId>
-	<version>2.1.2-SNAPSHOT</version>
-	<name>aaf-cadi</name>
+	<artifactId>parent</artifactId>
+	<version>2.1.9-SNAPSHOT</version>
+	<name>CADI Plugins Parent</name>
 	<packaging>pom</packaging>
 
 	<parent>
@@ -34,10 +34,10 @@
 
 	<properties>
 		<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
-		<cadi.version>2.1.2</cadi.version>
+		<cadi.version>2.1.9-SNAPSHOT</cadi.version>
 		<!-- <sonar.skip>true</sonar.skip> -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
+		<!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->
 		<powermock.version>1.5.1</powermock.version>
 		<!-- SONAR -->
 		<jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -157,7 +157,6 @@
 				<version>${cadi.version}</version>
 			</dependency>
 
-
 			<!-- Prevent Cycles in Testing -->
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
@@ -214,6 +213,8 @@
 				<artifactId>aaf-misc-log4j</artifactId>
 				<version>${cadi.version}</version>
 			</dependency>
+			
+			<!-- 
 
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
@@ -250,13 +251,7 @@
 				<artifactId>jetty-server</artifactId>
 				<version>${project.jettyVersion}</version>
 			</dependency>
-
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-
+			-->
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
@@ -280,8 +275,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>${maven.compiler.source}</source>
+						<target>${maven.compiler.target}</target>
 					</configuration>
 				</plugin>