Upgrade to latest oparent

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

diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml
index c2c892e..6f3d8d7 100644 (file)
--- a/authz-batch/pom.xml
+++ b/authz-batch/pom.xml
@@ -9,7 +9,7 @@
        <parent>
                <groupId>com.att.authz</groupId>
                <artifactId>parent</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.0.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
                
@@ -18,12 +18,7 @@
        <description>Batch Processing for Authz</description>
        <packaging>jar</packaging>
                <url>https://github.com/att/AAF</url>
-       <licenses>
-               <license>
-               <name>BSD License</name>
-               <url> </url>
-               </license>
-       </licenses>
+
        <developers>
                <developer>
                <name>Jonathan Gathman</name>
@@ -36,6 +31,28 @@
        <properties>
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <project.swmVersion>1</project.swmVersion>
+               <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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <skipTests>false</skipTests>
+               <project.dme2Version>3.1.200</project.dme2Version>
+               
+               <!--  SONAR  -->
+                <jacoco.version>0.7.7.201606060606</jacoco.version>
+                <sonar.skip>true</sonar.skip>
+           <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>
+           <!-- 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>
        </properties>
        
        <dependencies>
@@ -43,52 +60,27 @@
                <dependency>
                        <groupId>org.onap.aaf.inno</groupId>
                        <artifactId>env</artifactId>
-                       <version>${project.version}</version>
+                       <version>${project.innoVersion}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.inno</groupId>
                        <artifactId>rosetta</artifactId>
-                       <version>${project.version}</version>
+                       <version>${project.innoVersion}</version>
                </dependency>
                
                <dependency>
                <groupId>org.onap.aaf.cadi</groupId>
                <artifactId>cadi-core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${project.cadiVersion}</version>
            </dependency>
 
                <dependency>
                <groupId>org.onap.aaf.cadi</groupId>
                <artifactId>cadi-aaf</artifactId>
-                       <version>${project.version}</version>
+                       <version>${project.cadiVersion}</version>
            </dependency>
 
-
-
-               <!--  <dependency>
-                       <groupId>com.att.authz</groupId>
-                       <artifactId>authz-att</artifactId>
-                       <exclusions>
-                               <exclusion> 
-                                       <groupId>javax.servlet</groupId>
-                               <artifactId>servlet-api</artifactId>
-                       </exclusion>
-                       <exclusion>
-                               <groupId>org.onap.aaf.cadi</groupId>
-                               <artifactId>cadi-aaf</artifactId>
-                       </exclusion>
-                       <exclusion>
-                               <groupId>org.onap.aaf.cadi</groupId>
-                               <artifactId>cadi-core</artifactId>
-                           </exclusion>
-                           <exclusion>
-                               <groupId>org.onap.aaf.cadi</groupId>
-                               <artifactId>cadi-client</artifactId>
-                       </exclusion>
-                   </exclusions>
-                       
-               </dependency>   -->
                
                <dependency>
                        <groupId>prg.onap.aaf.authz</groupId>
@@ -125,31 +117,12 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>
                </dependency>
-               
-               <!-- Data Migration 
-                        <dependency>
-           <groupId>com.oracle</groupId>
-           <artifactId>ojdbc6</artifactId>
-           <version>11.2.0</version>
-         </dependency>
-         
-         <dependency>
-           <groupId>com.opencsv</groupId>
-           <artifactId>opencsv</artifactId>
-           <version>3.3</version>
-         </dependency>
-               -->
+
        </dependencies>
 
        <build>
                <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-deploy-plugin</artifactId>
-                                       <configuration>
-                                               <skip>true</skip>
-                                       </configuration>
-                               </plugin>
+                        
                            
                                <plugin>
                                        <artifactId>maven-assembly-plugin</artifactId>
@@ -229,22 +202,84 @@
                      </executions>
                    </plugin>
        
-
-       <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-gpg-plugin</artifactId>
-           <version>1.5</version>
-           <executions>
-               <execution>
-                   <id>sign-artifacts</id>
-                   <phase>verify</phase>
-                   <goals>
-                       <goal>sign</goal>
-                   </goals>
-               </execution>
-           </executions>
-         </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>
+          <version>${jacoco.version}</version>
+          <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>      
+
+                               
                
                        </plugins>
        </build>