Update POMS for SONAR code coverage 45/40745/1
authorIanHowell <ian.howell@att.com>
Tue, 3 Apr 2018 16:24:27 +0000 (11:24 -0500)
committerIanHowell <ian.howell@att.com>
Tue, 3 Apr 2018 16:26:01 +0000 (11:26 -0500)
Issue-ID: AAF-128
Change-Id: I3340c9596682d00291414c5ae3e0a4b71d19c228
Signed-off-by: IanHowell <ian.howell@att.com>
13 files changed:
cadi/aaf/pom.xml
cadi/cass/pom.xml
cadi/client/pom.xml
cadi/core/pom.xml
cadi/oauth-enduser/pom.xml
cadi/pom.xml
cadi/shiro/pom.xml
misc/env/pom.xml
misc/log4j/pom.xml
misc/pom.xml
misc/rosetta/pom.xml
misc/xgen/pom.xml
pom.xml

index 25655d0..c9b59a6 100644 (file)
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
                        </plugin>
-                               <plugin>
+                       <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
                                <extensions>true</extensions>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>               
+                       </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>
-                       <!-- We want to create a Jar with Rosetta built in (since I don't want 
-                               a separate deployment at this time Use this one as the jar to put in SWM 
-                               packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> 
-                               <classifier>tests</classifier> <archive> <manifest> <mainClass>org.onap.aaf.cadi.cm.CmAgent</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/cadi-aaf.xml</descriptor> 
+                               <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>
+                       <!-- We want to create a Jar with Rosetta built in (since I don't want
+                               a separate deployment at this time Use this one as the jar to put in SWM
+                               packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>
+                               <classifier>tests</classifier> <archive> <manifest> <mainClass>org.onap.aaf.cadi.cm.CmAgent</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/cadi-aaf.xml</descriptor>
                                </descriptors> </configuration> </execution> </executions> </plugin> -->
                </plugins>
        </build>
-       
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
index ae4d06a..e632705 100644 (file)
                                                </goals>
                                                <configuration>
                                                        <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-
                                                        <propertyName>failsafeArgLine</propertyName>
                                                </configuration>
                                        </execution>
index da0286b..fa9cd89 100644 (file)
  *
 -->
 <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">
-<parent>
-       <groupId>org.onap.aaf.authz.cadi</groupId>
-       <artifactId>parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
-       <relativePath>..</relativePath>
-</parent>
+       <parent>
+               <groupId>org.onap.aaf.authz.cadi</groupId>
+               <artifactId>parent</artifactId>
+               <version>1.5.0-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
 
        <artifactId>aaf-cadi-client</artifactId>
        <name>AAF CADI Client</name>
        <modelVersion>4.0.0</modelVersion>
 
        <properties>
-       <!--  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.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>
+               <!--  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.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>
-       
+
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
@@ -88,7 +88,7 @@
                <dependency>
                        <groupId>org.onap.aaf.authz.misc</groupId>
                        <artifactId>aaf-misc-rosetta</artifactId>
-                       
+
                </dependency>
                <dependency>
                        <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>maven-jarsigner-plugin</artifactId>
                                <version>1.4</version>
                        </plugin>
-                                                       <plugin>
+                       <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
                                <version>1.6.7</version>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>               
+                       </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>
+                               <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>
-       
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
index 35c5a2e..93d5a8f 100644 (file)
@@ -1,14 +1,14 @@
-<!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2018 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==================================================== 
+<!-- * ============LICENSE_START====================================================
+       * org.onap.aaf * ===========================================================================
+       * Copyright (c) 2018 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">
@@ -40,7 +40,7 @@
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
-       
+
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
@@ -86,7 +86,7 @@
        <build>
                <plugins>
                        <plugin>
-                               <!-- Must put this in to turn on Signing, but Configuration itself is 
+                               <!-- Must put this in to turn on Signing, but Configuration itself is
                                        in Parent -->
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jarsigner-plugin</artifactId>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>               
+                       </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>
+                               <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>
 
index ba04a9a..b11805b 100644 (file)
                                </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>
+                               <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>
 
-       
-            <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>
+                                                       <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>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-deploy-plugin</artifactId>
index 5c72f5b..a9d8a99 100644 (file)
        </organization>
        <packaging>pom</packaging>
 
-   <parent>             
+   <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.1.0</version>
     </parent>
-       
+
        <properties>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
+                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
-       
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
                                <artifactId>jetty-servlet</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-                       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-io</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-security</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-http</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-util</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-server</artifactId>
                            <artifactId>servlet-api</artifactId>
                                <version>2.5</version>
                        </dependency>
-                       
+
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>slf4j-api</artifactId>
                <testSourceDirectory>src/test/java</testSourceDirectory>
                <plugins>
                </plugins>
-               <pluginManagement>                      
+               <pluginManagement>
                        <plugins>
                                <plugin>
                                        <inherited>true</inherited>
                                                <target>1.7</target>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <version>2.4</version>
                                                <excludePackageNames>org.opendaylight.*</excludePackageNames>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.2</version>
                                                <goals>-s ${mvn.settings} deploy</goals>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <artifactId>maven-assembly-plugin</artifactId>
                                        <version>2.5.5</version>
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-deploy-plugin</artifactId>
                                        <configuration>
                                                <skip>false</skip>
                                        </configuration>
-       
+
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-dependency-plugin</artifactId>
                                        <version>2.10</version>
                                </plugin>
-       
+
                                <!-- Maven surefire plugin for testing -->
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <configuration>
                                        </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>
                                                </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>
-          <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>
+                               <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>
-               </pluginManagement>                     
+               </pluginManagement>
        </build>
 
-
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-       
+
 </project>
index 21b67f6..4edabec 100644 (file)
@@ -49,7 +49,7 @@
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
-       
+
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
@@ -99,7 +99,7 @@
        </dependencies>
        <build>
                <plugins>
-                                               <plugin>
+                       <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
                                <version>1.6.7</version>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>       
-             <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-deploy-plugin</artifactId>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
-       
-                               </plugin>                       
+                       </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>
-                       
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <version>2.8.1</version>
+                               <configuration>
+                                       <skip>false</skip>
+                               </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>
-       
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
index 0a8309d..3702036 100644 (file)
@@ -68,7 +68,7 @@
                        </roles>
                </developer>
        </developers>
-       
+
        <properties>
        <jacocoVersion>0.7.6.201602180812</jacocoVersion>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <enforcer.skip>true</enforcer.skip>
-               
+
                <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>
        <plugins>
-       <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.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </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.sonarsource.scanner.maven</groupId>
+                       <artifactId>sonar-maven-plugin</artifactId>
+                       <version>3.2</version>
+               </plugin>
                <!-- Jacoco -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <!-- Override OParent version -->
-                               <version>${jacocoVersion}</version>
-                               <executions>
-                                       <!-- disable jacoco executions from oparent -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <!-- Order matters -->
-                                       <execution>
-                                               <id>portal-prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <!-- offline instrumentation for PowerMock -->
-                                       <execution>
-                                               <id>portal-offline-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <systemPropertyVariables>
-                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
-                                       </systemPropertyVariables>
-                               </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>
+               <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-surefire-plugin</artifactId>
+                       <configuration>
+                               <systemPropertyVariables>
+                                       <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                               </systemPropertyVariables>
+                       </configuration>
+               </plugin>
        </plugins>
-       </build>
-       
+</build>
+
        <dependencies>
                <dependency>
                        <groupId>log4j</groupId>
                        <scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
                </dependency>
        </dependencies>
-       
-       
+
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
index 98df9d0..b7f1960 100644 (file)
@@ -68,7 +68,7 @@
                        </roles>
                </developer>
        </developers>
-       
+
        <properties>
        <jacocoVersion>0.7.6.201602180812</jacocoVersion>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <enforcer.skip>true</enforcer.skip>
-               
+
                <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>
                <dependency>
                        <groupId>org.onap.aaf.authz.misc</groupId>
                                        </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.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </plugin>
-               <!-- Jacoco -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <!-- Override OParent version -->
-                               <version>${jacocoVersion}</version>
-                               <executions>
-                                       <!-- disable jacoco executions from oparent -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <!-- Order matters -->
-                                       <execution>
-                                               <id>portal-prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <!-- offline instrumentation for PowerMock -->
-                                       <execution>
-                                               <id>portal-offline-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </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.sonarsource.scanner.maven</groupId>
+                                       <artifactId>sonar-maven-plugin</artifactId>
+                                       <version>3.2</version>
+                               </plugin>
+                               <!-- Jacoco -->
+                               <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>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <systemPropertyVariables>
-                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
-                                       </systemPropertyVariables>
-                               </configuration>
-                       </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-surefire-plugin</artifactId>
+                                       <configuration>
+                                               <systemPropertyVariables>
+                                                       <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                               </systemPropertyVariables>
+                                       </configuration>
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>
index d577314..fc27550 100644 (file)
@@ -27,8 +27,8 @@
        <name>AAF Misc Parent</name>
        <version>1.3.0-SNAPSHOT</version>
        <packaging>pom</packaging>
-       
-       <parent>             
+
+       <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.1.0</version>
@@ -41,7 +41,7 @@
                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <enforcer.skip>true</enforcer.skip>
-               
+
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <powermock.version>1.5.1</powermock.version>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -51,7 +51,7 @@
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
-       
+
 
        <developers>
                <developer>
                        <artifactId>junit</artifactId>
                        <version>4.10</version>
                        <scope>test</scope>
-               </dependency>   
+               </dependency>
        </dependencies>
 
        <build>
                                                <outputDirectory>target</outputDirectory>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <inherited>true</inherited>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        </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.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </plugin>
-               <!-- Jacoco -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <!-- Override OParent version -->
-                               <version>${jacocoVersion}</version>
-                               <executions>
-                                       <!-- disable jacoco executions from oparent -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <!-- Order matters -->
-                                       <execution>
-                                               <id>portal-prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <!-- offline instrumentation for PowerMock -->
-                                       <execution>
-                                               <id>portal-offline-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </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.sonarsource.scanner.maven</groupId>
+                                       <artifactId>sonar-maven-plugin</artifactId>
+                                       <version>3.2</version>
+                               </plugin>
+                               <!-- Jacoco -->
+                               <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>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <systemPropertyVariables>
-                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
-                                       </systemPropertyVariables>
-                               </configuration>
-                       </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-surefire-plugin</artifactId>
+                                       <configuration>
+                                               <systemPropertyVariables>
+                                                       <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                               </systemPropertyVariables>
+                                       </configuration>
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>
                        </dependency>
                </dependencies>
        </dependencyManagement>
-       
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
index 8178a75..5bebf56 100644 (file)
                <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <enforcer.skip>true</enforcer.skip>
-               
+
                <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>
                <dependency>
                        <groupId>org.onap.aaf.authz.misc</groupId>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>               
+                       </plugin>
                        <plugin>
-            <groupId>org.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </plugin>
-               <!-- Jacoco -->
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>3.2</version>
+                       </plugin>
+                       <!-- Jacoco -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <!-- Override OParent version -->
-                               <version>${jacocoVersion}</version>
+                               <version>${jacoco.version}</version>
+                               <configuration>
+                                       <excludes>
+                                               <exclude>**/gen/**</exclude>
+                                               <exclude>**/generated-sources/**</exclude>
+                                               <exclude>**/yang-gen/**</exclude>
+                                               <exclude>**/pax/**</exclude>
+                                       </excludes>
+                               </configuration>
                                <executions>
-                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <!-- Order matters -->
-                                       <execution>
-                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                                       <propertyName>surefireArgLine</propertyName>
                                                </configuration>
                                        </execution>
-                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>portal-offline-instrument</id>
+                                               <id>post-unit-test</id>
+                                               <phase>test</phase>
                                                <goals>
-                                                       <goal>instrument</goal>
+                                                       <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>portal-restore-instrumented-classes</id>
-                                               <phase>test</phase>
+                                               <id>pre-integration-test</id>
+                                               <phase>pre-integration-test</phase>
                                                <goals>
-                                                       <goal>restore-instrumented-classes</goal>
+                                                       <goal>prepare-agent</goal>
                                                </goals>
+                                               <configuration>
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                       <propertyName>failsafeArgLine</propertyName>
+                                               </configuration>
                                        </execution>
                                        <execution>
-                                               <id>portal-post-unit-test</id>
-                                               <phase>test</phase>
+                                               <id>post-integration-test</id>
+                                               <phase>post-integration-test</phase>
                                                <goals>
                                                        <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
                                                </configuration>
                                        </execution>
                                </executions>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-       
+
 </project>
index a3bceb1..08b4e1a 100644 (file)
        
        <build>
        <plugins>
-       <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.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </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.sonarsource.scanner.maven</groupId>
+                       <artifactId>sonar-maven-plugin</artifactId>
+                       <version>3.2</version>
+               </plugin>
+
                <!-- Jacoco -->
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <!-- Override OParent version -->
-                               <version>${jacocoVersion}</version>
-                               <executions>
-                                       <!-- disable jacoco executions from oparent -->
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>none</phase>
-                                       </execution>
-                                       <!-- Order matters -->
-                                       <execution>
-                                               <id>portal-prepare-agent</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                               </configuration>
-                                       </execution>
-                                       <!-- offline instrumentation for PowerMock -->
-                                       <execution>
-                                               <id>portal-offline-instrument</id>
-                                               <goals>
-                                                       <goal>instrument</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-restore-instrumented-classes</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>restore-instrumented-classes</goal>
-                                               </goals>
-                                       </execution>
-                                       <execution>
-                                               <id>portal-post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </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>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <systemPropertyVariables>
-                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
-                                       </systemPropertyVariables>
-                               </configuration>
-                       </plugin>
+               <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-surefire-plugin</artifactId>
+                       <configuration>
+                               <systemPropertyVariables>
+                                       <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                               </systemPropertyVariables>
+                       </configuration>
+               </plugin>
        </plugins>
        </build>
        
diff --git a/pom.xml b/pom.xml
index 809d0ff..48b0c0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
  *
 -->
 <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">
+       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.authz.authz</groupId>
        <artifactId>parent</artifactId>
        <version>2.1.0-SNAPSHOT</version>
        <name>AAF Overall Parent</name>
        <packaging>pom</packaging>
-       
-       <parent>             
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
-       
+
+       <parent>
+               <groupId>org.onap.oparent</groupId>
+               <artifactId>oparent</artifactId>
+               <version>1.1.0</version>
+       </parent>
+
        <properties>
                <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>
-               
+
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!--  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.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>
+               <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>
+               <!-- 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>
        <build>
                <plugins>
                                        <stagingProfileId>176c31dfe190a</stagingProfileId>
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
-                       </plugin>               
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>3.2</version>
+                       </plugin>
                        <plugin>
-                   <groupId>org.sonarsource.scanner.maven</groupId>
-                   <artifactId>sonar-maven-plugin</artifactId>
-                   <version>3.2</version>
-               </plugin>
-               <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
+                               <version>${jacoco.version}</version>
                                <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
+                                       <excludes>
+                                               <exclude>**/gen/**</exclude>
+                                               <exclude>**/generated-sources/**</exclude>
+                                               <exclude>**/yang-gen/**</exclude>
+                                               <exclude>**/pax/**</exclude>
+                                       </excludes>
                                </configuration>
                                <executions>
                                        <execution>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <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>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                       <propertyName>failsafeArgLine</propertyName>
                                                </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>
+                                               <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>   
+       </build>
        <modules>
                <module>auth/auth-client</module>
                <module>misc</module>
                <module>cadi</module>
                <module>auth</module>
-       </modules>
+       </modules>
 
        <distributionManagement>
                <repository>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-       
-</project>     
+
+</project>