X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d591201dc026db72f6a253a0179e447bdf7a66fa;hb=0281762bb03c89e10d5d38232c26964555864d03;hp=9c036829a52a17e55b154ff9bb72acd9edd92749;hpb=43854a9e3310ff7a92257d16c4fc0a8321eaec68;p=aaf%2Fauthz.git

diff --git a/pom.xml b/pom.xml
index 9c036829..d591201d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,10 @@
   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>com.att.authz</groupId>
+	<groupId>org.onap.aaf.authz</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.0.15</version>
-	<name>Authz Parent (pom)</name>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>aaf-authz</name>
 	<packaging>pom</packaging>
 	<url>https://github.com/att/AAF</url>
 	<licenses>
@@ -53,18 +53,22 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<skipTests>false</skipTests>
-		<project.interfaceVersion>2.6</project.interfaceVersion>
-		<project.innoVersion>1.2.13</project.innoVersion>
-		<project.cadiVersion>1.3.2</project.cadiVersion>
+		<project.interfaceVersion>1.0.0-SNAPSHOT</project.interfaceVersion>
+		<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
+		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
 		<project.dme2Version>3.1.200</project.dme2Version>
-				<!-- version>  2.8.8</version -->
-				<!-- version>  2.8.5.8</version -->
-				<!-- version>  2.8.2.5</version -->
-				<!-- version>2.8.1.3</version -->
-				<!-- version>2.8.1</version This version changes Servlet to 3.0-->
-				<!-- version>2.6.29</version -->
-				<!-- version>2.6.20</version -->
-		
+		<sonar.language>java</sonar.language>
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+		<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>
 	</properties>
 
 	<build>
@@ -226,19 +230,7 @@
 			</execution>
 		      </executions>
 		    </plugin>
- 
-			
-		<plugin>
-			<groupId>org.sonatype.plugins</groupId>
-			<artifactId>nexus-staging-maven-plugin</artifactId>
-			<version>1.6.7</version>
-			<extensions>true</extensions>
-			<configuration>
-			<serverId>ossrhdme</serverId>
-			<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-			<autoReleaseAfterClose>true</autoReleaseAfterClose>
-			</configuration>
-		</plugin>
+
 			
 		<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -251,7 +243,69 @@
 				  </formats>
 				</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>
+					<skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
+				</configuration>
+			</plugin>		
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+					<includes>
+						<include>org.onap.aaf.*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                        </configuration>
+                    </execution>
+				</executions>
+			</plugin>
 				
 	    	</plugins>
 		</pluginManagement>			
@@ -309,44 +363,44 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>env</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>log4j</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>rosetta</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.inno</groupId>
+				<groupId>org.onap.aaf.inno</groupId>
 				<artifactId>xgen</artifactId>
 				<version>${project.innoVersion}</version>
 			</dependency>
 			
 			<dependency>
-				<groupId>com.att.cadi</groupId>
+				<groupId>org.onap.aaf.cadi</groupId>
 				<artifactId>cadi-core</artifactId>
 				<version>${project.cadiVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>com.att.cadi</groupId>
+				<groupId>org.onap.aaf.cadi</groupId>
 				<artifactId>cadi-client</artifactId>
 				<version>${project.cadiVersion}</version>
 			</dependency>
 			
 			
 			<dependency>
-				<groupId>com.att.cadi</groupId>
+				<groupId>org.onap.aaf.cadi</groupId>
 				<artifactId>cadi-aaf</artifactId>
 				<version>${project.cadiVersion}</version>
 				<exclusions>
@@ -358,43 +412,39 @@
 			</dependency>
 			
 			<dependency>
-				<groupId>com.att.authz</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>authz-client</artifactId>
 				<version>${project.interfaceVersion}</version>
 			</dependency>
 			
 			
 			<dependency>
-				<groupId>com.att.authz</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>authz-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			
 			<dependency>
-	            <groupId>com.att.authz</groupId>
+	            <groupId>org.onap.aaf.authz</groupId>
 	            <artifactId>authz-cass</artifactId>
 				<version>${project.version}</version>
 	        </dependency>
 	        
 	        <dependency>
-				<groupId>com.att.authz</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>authz-batch</artifactId>
 				<version>${project.interfaceVersion}</version>
 			</dependency>
 	    
-	    <!--  <dependency>
-	            <groupId>com.att.authz</groupId>
-	            <artifactId>authz-att</artifactId>
-				<version>${project.version}</version>
-	        </dependency>     --> 
+
 
 		    <dependency>
-	            <groupId>com.att.authz</groupId>
+	            <groupId>org.onap.aaf.authz</groupId>
 	            <artifactId>authz-cmd</artifactId>
 				<version>${project.version}</version>
 	        </dependency>
 	        <dependency>
-	            <groupId>com.att.authz</groupId>
+	            <groupId>org.onap.aaf.authz</groupId>
 	            <artifactId>authz-gw</artifactId>
 				<version>${project.version}</version>
 	        </dependency>
@@ -402,11 +452,6 @@
 			<dependency>
 				<groupId>com.att.aft</groupId>
 				<artifactId>dme2</artifactId>
-				<!--  version>2.6.20</version -->
-				<!-- version>2.6.29</version -->
-				<!-- version>2.8.1</version This version changes Servlet to 3.0-->
-				<!-- version>2.8.1.3</version -->
-				<!-- version>2.8.2.5</version -->
 				<version>${project.dme2Version}</version>
 			</dependency>
 		
@@ -470,23 +515,48 @@
 			
 		</dependencies>
 	</dependencyManagement>
-	
-	
-<distributionManagement>
-    		<snapshotRepository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    		</snapshotRepository>
-    		<repository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    		</repository>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>AAF Release Repository</name>
+			<url>${nexusproxy}${releaseNexusPath}</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>AAF Snapshot Repository</name>
+			<url>${nexusproxy}${snapshotNexusPath}</url>
+		</snapshotRepository>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}${sitePath}</url>
+		</site>
 	</distributionManagement>
+<pluginRepositories>
+        <pluginRepository>
+            <id>onap-plugin-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
 	
-	<scm>
-		<connection>https://github.com/att/AAF.git</connection>
-		<developerConnection>${project.scm.connection}</developerConnection>
-		<url>http://github.com/att/AAF/tree/master</url>
-	</scm>
-	
+	<repositories>
+		<repository>
+			<id>central</id>
+			<name>Maven 2 repository 2</name>
+			<url>http://repo2.maven.org/maven2/</url>
+		</repository>
+		<repository>
+            <id>onap-jar-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </repository>
+		<repository>
+			<id>spring-repo</id>
+			<name>Spring repo</name>
+			<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
+		</repository>
+		<repository>
+			<id>repository.jboss.org-public</id>
+			<name>JBoss.org Maven repository</name>
+			<url>https://repository.jboss.org/nexus/content/groups/public</url>
+		</repository>
+	</repositories>	
 </project>