Update to 2.1.11-SNAPSHOT

[aaf/authz.git] / auth / auth-batch / pom.xml

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 8d97f10..18f8670 100644 (file)
--- 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,7 +76,7 @@
 
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!--  SONAR  -->
-               <sonar.skip>true</sonar.skip>
+               <!-- <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>
@@ -89,45 +89,45 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
        <dependencies>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.misc</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.misc</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-rosetta</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.authz.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </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>
 
@@ -137,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>
 
@@ -152,7 +152,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -163,7 +162,6 @@
                        <plugin>
                                        <groupId>org.jacoco</groupId>
                                        <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>${jacoco.version}</version>
                                        <configuration>
                                                <excludes>
                                                        <exclude>**/gen/**</exclude>
@@ -222,6 +220,35 @@
                                                </execution>
                                        </executions>
                                </plugin>
+                               <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <classifier>tests</classifier>
+                                       <archive>
+                                               <manifest>
+                                                       <mainClass>org.onap.aaf.auth.batch.Batch</mainClass>
+                                               </manifest>
+                                               <manifestEntries>
+                                                       <Sealed>true</Sealed>
+                                               </manifestEntries>
+                                       </archive>
+
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>full</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <descriptors>
+                                                               <descriptor>src/assemble/auth-batch.xml</descriptor>
+                                                       </descriptors>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
                </plugins>
        </build>