X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fpom.xml;h=99d864dd49f9d6ac5ea0f5917997ffadb82d2c89;hb=103d3ca78423b8c90be7ab3ce76c7144f31476d7;hp=7142554b248a7f8ae65a22e80df50b3bd257851a;hpb=372e251380abf42627b72d939aba5e5e310bd31f;p=aaf%2Fauthz.git

diff --git a/auth/pom.xml b/auth/pom.xml
index 7142554b..99d864dd 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -28,29 +28,35 @@
 	<version>2.1.0-SNAPSHOT</version>
 	<name>AAF Auth Parent</name>
 	<packaging>pom</packaging>
+	
+	<parent>             
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.1.0</version>
+    </parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
-		<project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
-		<project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
+		<project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
+		<project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
 		<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
 		<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
 		<powermock.version>1.5.1</powermock.version>
-		<project.conf_dir>/opt/app/osaaf/etc</project.conf_dir>
+		<project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
 	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 	    <!-- Default Sonar configuration -->
-	    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+	    <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+	    <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
 	    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
 	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<developers>
@@ -106,7 +112,7 @@
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.6</version>
 					<configuration>
-						<skip>true</skip>
+						<skip>false</skip>
 					</configuration>
 				</plugin>
 
@@ -131,7 +137,7 @@
 					<artifactId>maven-failsafe-plugin</artifactId>
 					<version>2.17</version>
 					<configuration>
-						<skipTests>flase</skipTests>
+						<skipTests>false</skipTests>
 					</configuration>
 					<executions>
 						<execution>
@@ -160,9 +166,10 @@
 					<configuration>
 						<programs/> <!-- this set in projects that have programs -->
 						<assembleDirectory>../aaf_${project.version}</assembleDirectory>
-						<copyConfigurationDirectory>false</copyConfigurationDirectory>
+						<copyConfigurationDirectory>true</copyConfigurationDirectory>
 						<configurationDirectory>etc</configurationDirectory>
 						<repositoryName>lib</repositoryName>
+						<includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
 						<repositoryLayout>flat</repositoryLayout>
 					</configuration>
 				</plugin>
@@ -461,8 +468,8 @@
 
 			<dependency>
 				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.5</version>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>3.0.1</version>
 			</dependency>
 
 			<dependency>
@@ -477,12 +484,6 @@
 				<version>${project.jettyVersion}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-jmx</artifactId>
-				<version>${project.jettyVersion}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-all</artifactId>
@@ -498,11 +499,10 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-driver-core</artifactId>
-				<!-- version>1.0.3</version -->
-				<!-- version>1.0.5</version -->
 				<version>3.3.0</version>
 				<exclusions>
 					<exclusion>