X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fe9e68b4e96e95233afc194647d9cf69187a6347;hb=refs%2Fheads%2Fmaster;hp=8e9f174340b631b6b3cd4468ec65a4d37c6df6da;hpb=e9c0bf259db0084592536e896cc449b5cf34b84f;p=aaf%2Fcadi.git

diff --git a/pom.xml b/pom.xml
index 8e9f174..fe9e68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,22 +22,22 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.aaf.cadi</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.1.7-SNAPSHOT</version>
+	<version>2.1.19-SNAPSHOT</version>
 	<name>CADI Plugins Parent</name>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.2.1</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<properties>
 		<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
-		<cadi.version>2.1.7-SNAPSHOT</cadi.version>
+		<cadi.version>2.7.4</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>
@@ -131,9 +131,7 @@
 	<modules>
 		<module>shiro</module>
 		<module>shiro-osgi-bundle</module>
-		<!-- Not in Casablanca 
 		<module>sidecar</module>
-		-->
 	</modules>
 
 	<!-- ============================================================== -->
@@ -159,7 +157,6 @@
 				<version>${cadi.version}</version>
 			</dependency>
 
-
 			<!-- Prevent Cycles in Testing -->
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
@@ -216,6 +213,21 @@
 				<artifactId>aaf-misc-log4j</artifactId>
 				<version>${cadi.version}</version>
 			</dependency>
+			
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-core</artifactId>
+				<version>1.3.2</version>
+			</dependency>
+		
+			<dependency>
+	    		<groupId>ch.qos.logback</groupId>
+			    <artifactId>logback-classic</artifactId>
+			    <version>1.2.3</version>
+	    		<scope>test</scope>
+			</dependency>
+			
+			<!-- 
 
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
@@ -252,13 +264,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>
@@ -282,8 +288,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>
 
@@ -386,17 +392,6 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.sonatype.plugins</groupId>
-					<artifactId>nexus-staging-maven-plugin</artifactId>
-					<version>1.6.7</version>
-					<extensions>true</extensions>
-					<configuration>
-						<nexusUrl>${nexusproxy}</nexusUrl>
-						<stagingProfileId>176c31dfe190a</stagingProfileId>
-						<serverId>ecomp-staging</serverId>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>