X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fpom.xml;h=18f867001ee9af04d4926c1acadd9190f13e4be1;hb=c9324c82b4a7d6e2867b2e765f4949ee306045af;hp=8969de0e9dde8624a9ba02ab778867a8e2623fef;hpb=67bac2c1c44beab7752b39584553449e1c8a4e94;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 8969de0e..18f86700 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -23,13 +23,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.authz.auth</groupId>
-		<artifactId>parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>authparent</artifactId>
+		<version>2.1.11-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>auth-batch</artifactId>
+	<artifactId>aaf-auth-batch</artifactId>
 	<name>AAF Auth Batch</name>
 	<description>Batch Processing for AAF Auth</description>
 	<packaging>jar</packaging>
@@ -76,12 +76,13 @@
 
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
+		<!-- <sonar.skip>true</sonar.skip> -->
 		 <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>
@@ -94,34 +95,39 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.misc</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.cadi</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.authz.auth</groupId>
+			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-auth-deforg</artifactId>
+		</dependency>
+
+		<!--dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
+		</dependency -->
 
 	</dependencies>
 
@@ -131,8 +137,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 			</plugin>
 
@@ -140,13 +146,12 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<skip>false</skip>
 				</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>
@@ -155,54 +160,93 @@
 				</configuration>
 			</plugin>		
 			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<configuration>
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+
+
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-					<includes>
-						<include>org.onap.aaf.*</include>
-					</includes>
+					<classifier>tests</classifier>
+					<archive>
+						<manifest>
+							<mainClass>org.onap.aaf.auth.batch.Batch</mainClass>
+						</manifest>
+						<manifestEntries>
+							<Sealed>true</Sealed>
+						</manifestEntries>
+					</archive>
+
 				</configuration>
 				<executions>
 					<execution>
-						<id>pre-unit-test</id>
+						<id>full</id>
+						<phase>package</phase>
 						<goals>
-							<goal>prepare-agent</goal>
+							<goal>single</goal>
 						</goals>
 						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-							<!-- <append>true</append> -->
+							<descriptors>
+								<descriptor>src/assemble/auth-batch.xml</descriptor>
+							</descriptors>
 						</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>