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

diff --git a/pom.xml b/pom.xml
index ae171b4..fe9e68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,52 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2017 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====================================================
- *
--->
-<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/xsd/maven-4.0.0.xsd">
+<!--* ============LICENSE_START==================================================== 
+    * =========================================================================== 
+    * org.onap.aaf 
+    * Copyright (c) 2017 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==================================================== 
+    * -->
+<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/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>CADI Misc Modules</name>
+	<artifactId>parent</artifactId>
+	<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.0</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<properties>
+		<!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
+		<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>
-	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-	    <!-- Default Sonar configuration -->
-	    <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>
+		<!-- 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.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>
@@ -118,7 +120,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -129,6 +131,7 @@
 	<modules>
 		<module>shiro</module>
 		<module>shiro-osgi-bundle</module>
+		<module>sidecar</module>
 	</modules>
 
 	<!-- ============================================================== -->
@@ -139,78 +142,92 @@
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-client</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-oauth</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
-
-			<!-- Prevent Cycles in Testing  -->
+			<!-- Prevent Cycles in Testing -->
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 				<classifier>tests</classifier>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-jetty</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-cass</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 				<classifier>full</classifier>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-cadi-client</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-env</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-rosetta</artifactId>
-				<version>${project.version}</version>
+				<version>${cadi.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-misc-log4j</artifactId>
-				<version>${project.version}</version>
+				<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>
@@ -247,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>
@@ -277,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>
 
@@ -349,7 +360,7 @@
 					</configuration>
 				</plugin>
 
-				<!--This plugin's configuration is used to store Eclipse m2e settings
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -374,24 +385,13 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore/>
+										<ignore />
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
 						</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>