Maven Docker Build 05/92605/1
authorInstrumental <jonathan.gathman@att.com>
Fri, 2 Aug 2019 19:46:27 +0000 (14:46 -0500)
committerInstrumental <jonathan.gathman@att.com>
Fri, 2 Aug 2019 19:46:35 +0000 (14:46 -0500)
Issue-ID: AAF-917
Change-Id: I259786040c74a7198b3597f4a92c0e8458666560
Signed-off-by: Instrumental <jonathan.gathman@att.com>
32 files changed:
.gitignore
auth-client/pom.xml
auth/auth-batch/pom.xml
auth/auth-cass/docker/dbuild.sh
auth/auth-cass/pom.xml
auth/auth-certman/pom.xml
auth/auth-cmd/pom.xml
auth/auth-core/pom.xml
auth/auth-deforg/pom.xml
auth/auth-fs/pom.xml
auth/auth-gui/pom.xml
auth/auth-hello/pom.xml
auth/auth-locate/pom.xml
auth/auth-oauth/pom.xml
auth/auth-service/pom.xml
auth/docker/.gitignore
auth/docker/dbuild.sh
auth/docker/pom.xml [new file with mode: 0644]
auth/pom.xml
cadi/aaf/jenkins-pom.xml
cadi/aaf/pom.xml
cadi/client/pom.xml
cadi/core/pom.xml
cadi/oauth-enduser/pom.xml
cadi/pom.xml
cadi/servlet-sample/pom.xml
misc/env/pom.xml
misc/log4j/pom.xml
misc/pom.xml
misc/rosetta/pom.xml
misc/xgen/pom.xml
pom.xml

index b36780d..600c50d 100644 (file)
@@ -6,3 +6,4 @@
 /temp/
 .metadata/
 /cadisample/
+.classpath
index bbcffbb..49f8d8d 100644 (file)
  * ============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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.15-SNAPSHOT</version>
     </parent>
-       
-       <artifactId>aaf-auth-client</artifactId>
-       <name>AAF Auth Client</name>
-       <description>XSD Generated classes for AAF Auth</description>
-       <packaging>jar</packaging>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <maven.test.failure.ignore>true</maven.test.failure.ignore>
-               <!--  SONAR  -->
-               <sonar.skip>true</sonar.skip>
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <artifactId>aaf-auth-client</artifactId>
+    <name>AAF Auth Client</name>
+    <description>XSD Generated classes for AAF Auth</description>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+        <!-- SONAR -->
+        <sonar.skip>true</sonar.skip>
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.jvnet.jaxb2.maven2</groupId>
-                               <artifactId>maven-jaxb2-plugin</artifactId>
-                               <version>0.8.2</version>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <schemaDirectory>src/main/xsd</schemaDirectory>
-                               </configuration>
-                       </plugin>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
+    </dependencies>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>2.3.2</version>
-                               <configuration>
-                                       <source>1.6</source>
-                                       <target>1.6</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.8.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                </configuration>
+            </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-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <dumpOnExit>true</dumpOnExit>
+                    <includes>
+                        <include>org.onap.aaf.*</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                    <execution>
                         <goals>
                             <goal>merge</goal>
                         </goals>
                         <phase>post-integration-test</phase>
                         <configuration>
                             <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                <fileSet
+                                    implementation="org.apache.maven.shared.model.fileset.FileSet">
                                     <directory>${project.build.directory}/coverage-reports</directory>
                                     <includes>
                                         <include>*.exec</include>
                             <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
                         </configuration>
                     </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
 
index 304a23f..6ba73e6 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
-
-       <artifactId>aaf-auth-batch</artifactId>
-       <name>AAF Auth Batch</name>
-       <description>Batch Processing for AAF Auth</description>
-       <packaging>jar</packaging>
-
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
-
-       <properties>
-       
-
-
-               <maven.test.failure.ignore>false</maven.test.failure.ignore>
-               <!--  SONAR  -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-rosetta</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cass</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-deforg</artifactId>
-               </dependency>
-
-               <!--dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-               </dependency -->
-
-       </dependencies>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>       
-                       <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <configuration>
-                                               <excludes>
-                                                       <exclude>**/gen/**</exclude>
-                                                       <exclude>**/generated-sources/**</exclude>
-                                                       <exclude>**/yang-gen/**</exclude>
-                                                       <exclude>**/pax/**</exclude>
-                                               </excludes>
-                                       </configuration>
-                                       <executions>
-
-                                               <execution>
-                                                       <id>pre-unit-test</id>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                               <propertyName>surefireArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
-
-
-                                               <execution>
-                                                       <id>post-unit-test</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>pre-integration-test</id>
-                                                       <phase>pre-integration-test</phase>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                               <propertyName>failsafeArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
-
-                                               <execution>
-                                                       <id>post-integration-test</id>
-                                                       <phase>post-integration-test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                               <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <classifier>tests</classifier>
-                                       <archive>
-                                               <manifest>
-                                                       <mainClass>org.onap.aaf.auth.batch.Batch</mainClass>
-                                               </manifest>
-                                               <manifestEntries>
-                                                       <Sealed>true</Sealed>
-                                               </manifestEntries>
-                                       </archive>
-
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>full</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assemble/auth-batch.xml</descriptor>
-                                                       </descriptors>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>aaf-auth-batch</artifactId>
+    <name>AAF Auth Batch</name>
+    <description>Batch Processing for AAF Auth</description>
+    <packaging>jar</packaging>
+
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <properties>
+    
+
+
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+        <!--  SONAR  -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cass</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-deforg</artifactId>
+        </dependency>
+
+        <!--dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency -->
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <configuration>
+                        <excludes>
+                            <exclude>**/gen/**</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                            <exclude>**/yang-gen/**</exclude>
+                            <exclude>**/pax/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+
+                        <execution>
+                            <id>pre-unit-test</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                <propertyName>surefireArgLine</propertyName>
+                            </configuration>
+                        </execution>
+
+
+                        <execution>
+                            <id>post-unit-test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>pre-integration-test</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                <propertyName>failsafeArgLine</propertyName>
+                            </configuration>
+                        </execution>
+
+                        <execution>
+                            <id>post-integration-test</id>
+                            <phase>post-integration-test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <classifier>tests</classifier>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.onap.aaf.auth.batch.Batch</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <Sealed>true</Sealed>
+                        </manifestEntries>
+                    </archive>
+
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>full</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assemble/auth-batch.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 17d359c..641b42b 100644 (file)
@@ -45,6 +45,8 @@ sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
 cd ..
 cp -Rf sample/cass_data auth-cass/cass_data
 cp sample/data/sample.identities.dat auth-cass
+pwd
+ls -ltr auth-batch/target
 cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass
 
 echo "$0: $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass"
index 4b9f9fe..628d739 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
-
-       <artifactId>aaf-auth-cass</artifactId>
-       <name>AAF Auth Cass</name>
-       <description>Cassandra Data Libraries for AAF Auth</description>
-       <packaging>jar</packaging>
-
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
-
-       <properties>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.datastax.cassandra</groupId>
-                       <artifactId>cassandra-driver-core</artifactId>
-                       <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.github.jnr</groupId>
-                                       <artifactId>jnr-posix</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
-               <dependency>
-                       <groupId>com.github.jnr</groupId>
-                       <artifactId>jnr-posix</artifactId>
-                       <version>3.0.45</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-               </dependency>
-
-               <!-- Cassandra prefers Snappy and LZ4 libs for performance -->
-               <dependency>
-                       <groupId>org.xerial.snappy</groupId>
-                       <artifactId>snappy-java</artifactId>
-                       <version>1.1.1-M1</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>net.jpountz.lz4</groupId>
-                       <artifactId>lz4</artifactId>
-                       <version>1.2.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.googlecode.jcsv</groupId>
-                       <artifactId>jcsv</artifactId>
-                       <version>1.4.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
-
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    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>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>aaf-auth-cass</artifactId>
+    <name>AAF Auth Cass</name>
+    <description>Cassandra Data Libraries for AAF Auth</description>
+    <packaging>jar</packaging>
+
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <properties>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+            <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-posix</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- JNR Posix needs bumping up for licence for datastax 3.6.0, remove after this version-->
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-posix</artifactId>
+            <version>3.0.45</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <!-- Cassandra prefers Snappy and LZ4 libs for performance -->
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.1-M1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.jcsv</groupId>
+            <artifactId>jcsv</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
 
index 82d127c..a84a76c 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf 
-       * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
-       
+    * org.onap.aaf 
+    * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-certman</artifactId>
-       <name>AAF Auth Certificate Manager</name>
-       <description>Certificate Manager API</description>
+    <artifactId>aaf-auth-certman</artifactId>
+    <name>AAF Auth Certificate Manager</name>
+    <description>Certificate Manager API</description>
 
-       <properties>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-               <project.bouncyCastleVersion>1.60</project.bouncyCastleVersion>
-       </properties>
+    <properties>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+        <project.bouncyCastleVersion>1.60</project.bouncyCastleVersion>
+    </properties>
 
-       <dependencies>
+    <dependencies>
          <dependency>
           <groupId>org.powermock</groupId>
           <artifactId>powermock-module-junit4-rule-agent</artifactId>
           <version>1.6.4</version>
           <scope>test</scope>
         </dependency>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cass</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-               
-                               <!-- Add the Organizations you wish to support. You can delete ONAP if 
-                       you have something else Match with Property Entry: Organization.<root ns>, 
-                       i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-deforg</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cass</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.google.code.jscep</groupId>
-                       <artifactId>jscep</artifactId>
-                       <version>2.4.0</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.bouncycastle</groupId>
-                                       <artifactId>bcprov-jdk15on</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.bouncycastle</groupId>
-                                       <artifactId>bcpkix-jdk15on</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <!-- JSCEP does not use latest "Bouncy Castle" -->
-               <dependency>
-                 <groupId>org.bouncycastle</groupId>
-                 <artifactId>bcprov-jdk15on</artifactId>
-                 <version>${project.bouncyCastleVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcpkix-jdk15on</artifactId>
-                       <version>${project.bouncyCastleVersion}</version>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+        
+                <!-- Add the Organizations you wish to support. You can delete ONAP if 
+            you have something else Match with Property Entry: Organization.<root ns>, 
+            i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-deforg</artifactId>
+        </dependency>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <includes>
-                                               <include>**/*.class</include>
-                                       </includes>
-                               </configuration>
-                               <version>2.3.1</version>
-                       </plugin>
+        <dependency>
+            <groupId>com.google.code.jscep</groupId>
+            <artifactId>jscep</artifactId>
+            <version>2.4.0</version>
+            <exclusions>
+                <exclusion>
+                     <groupId>org.bouncycastle</groupId>
+                      <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+                <exclusion>
+                      <groupId>org.bouncycastle</groupId>
+                      <artifactId>bcpkix-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- JSCEP does not use latest "Bouncy Castle" -->
+        <dependency>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+          <version>${project.bouncyCastleVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+              <artifactId>bcpkix-jdk15on</artifactId>
+              <version>${project.bouncyCastleVersion}</version>
+        </dependency>
+    </dependencies>
 
-                       <!--This plugin's configuration is used to store Eclipse m2e settings 
-                               only. It has no influence on the Maven build itself. -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.cm.AAF_CM</mainClass>
-                                                       <name>cm</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.cm.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/cm</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.class</include>
+                    </includes>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.cm.AAF_CM</mainClass>
+                            <name>cm</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.cm.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/cm</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
+                    <execution>
+                        <id>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-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>
+                    <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>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index 6c6505f..1a771ec 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-cmd</artifactId>
-       <name>AAF Auth Command</name>
-       <description>Command Line Processor for AAF Auth</description>
-       <packaging>jar</packaging>
+    <artifactId>aaf-auth-cmd</artifactId>
+    <name>AAF Auth Command</name>
+    <description>Command Line Processor for AAF Auth</description>
+    <packaging>jar</packaging>
 
-       <properties>
-               <maven.test.failure.ignore>false</maven.test.failure.ignore>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
+                    <execution>
+                        <id>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-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <classifier>tests</classifier>
-                                       <archive>
-                                               <manifest>
-                                                       <mainClass>org.onap.aaf.auth.cmd.AAFcli</mainClass>
-                                               </manifest>
-                                               <manifestEntries>
-                                                       <Sealed>true</Sealed>
-                                               </manifestEntries>
-                                       </archive>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>full</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assemble/auth-cmd.xml</descriptor>
-                                                       </descriptors>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       
-               </plugins>
-       </build>
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <classifier>tests</classifier>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.onap.aaf.auth.cmd.AAFcli</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <Sealed>true</Sealed>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>full</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assemble/auth-cmd.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+        </plugins>
+    </build>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>jline</groupId>
-                       <artifactId>jline</artifactId>
-                       <version>2.14.2</version>
-               </dependency>
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.14.2</version>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index a7ae68c..d471bf9 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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    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>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-core</artifactId>
-       <name>AAF Auth Core</name>
-       <description>Core Library for AAF Auth Components</description>
-       <packaging>jar</packaging>
+    <artifactId>aaf-auth-core</artifactId>
+    <name>AAF Auth Core</name>
+    <description>Core Library for AAF Auth Components</description>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+             <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
 
-       <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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
+    <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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-log4j</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-log4j</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.eclipse.jetty</groupId>
-                       <artifactId>jetty-servlet</artifactId>
-                       <scope>compile</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-               </dependency>
-       </dependencies>
-       
-       <build>
-           <plugins>
-               <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                               <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <configuration>
-                                               <excludes>
-                                                       <exclude>**/gen/**</exclude>
-                                                       <exclude>**/generated-sources/**</exclude>
-                                                       <exclude>**/yang-gen/**</exclude>
-                                                       <exclude>**/pax/**</exclude>
-                                               </excludes>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>pre-unit-test</id>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                               <propertyName>surefireArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>post-unit-test</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>pre-integration-test</id>
-                                                       <phase>pre-integration-test</phase>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                               <propertyName>failsafeArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <configuration>
+                        <excludes>
+                            <exclude>**/gen/**</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                            <exclude>**/yang-gen/**</exclude>
+                            <exclude>**/pax/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>pre-unit-test</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                <propertyName>surefireArgLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>post-unit-test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>pre-integration-test</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                <propertyName>failsafeArgLine</propertyName>
+                            </configuration>
+                        </execution>
 
-                                               <execution>
-                                                       <id>post-integration-test</id>
-                                                       <phase>post-integration-test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-          </plugins>
-       </build>
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+                        <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>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
 
index a4bf5e7..45feae1 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <artifactId>authparent</artifactId>
-               <relativePath>../pom.xml</relativePath>
-               <groupId>org.onap.aaf.authz</groupId>
-               <version>2.1.15-SNAPSHOT</version>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>authparent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <groupId>org.onap.aaf.authz</groupId>
+        <version>2.1.15-SNAPSHOT</version>
+    </parent>
 
-       <artifactId>aaf-auth-deforg</artifactId>
-       <name>AAF Auth Default Organization</name>
-       <description>Example Organization Module</description>
-       <packaging>jar</packaging>
+    <artifactId>aaf-auth-deforg</artifactId>
+    <name>AAF Auth Default Organization</name>
+    <description>Example Organization Module</description>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
 
-       <properties>
-               <maven.test.failure.ignore>false</maven.test.failure.ignore>
-               <!--  SONAR  -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <maven.test.failure.ignore>false</maven.test.failure.ignore>
+        <!--  SONAR  -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                       <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-javadoc-plugin</artifactId>
-                                       <version>2.10.4</version>
-                                       <configuration>
-                                               <failOnError>false</failOnError>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>attach-javadocs</id>
-                                                       <goals>
-                                                               <goal>jar</goal>
-                                                       </goals>
-                                               </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>
-                                                               <includes>
-                                                                       <include>**</include>
-                                                               </includes>
-                                                       </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>
-                                                               <includes>
-                                                                       <include>**</include>
-                                                               </includes>
-                                                               <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>
-       </build>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.4</version>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </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>
+                                <includes>
+                                    <include>**</include>
+                                </includes>
+                            </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>
+                                <includes>
+                                    <include>**</include>
+                                </includes>
+                                <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>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index fc86d4a..48a19ef 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-fs</artifactId>
-       <name>AAF Auth File Server (http)</name>
-       <description>Independent FileServer Component via HTTP (not S) for Public Files (i.e. CRLs) for AAF Auth</description>
+    <artifactId>aaf-auth-fs</artifactId>
+    <name>AAF Auth File Server (http)</name>
+    <description>Independent FileServer Component via HTTP (not S) for Public Files (i.e. CRLs) for AAF Auth</description>
 
-       <properties>
-               <maven.test.failure.ignore>true</maven.test.failure.ignore>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+    </properties>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.fs.AAF_FS</mainClass>
-                                                       <name>fs</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.fs.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/fs</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.fs.AAF_FS</mainClass>
+                            <name>fs</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.fs.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/fs</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
+                    <execution>
+                        <id>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-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>
-                       <plugins />
-               </pluginManagement>
-       </build>
+                    <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>
+            <plugins />
+        </pluginManagement>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 8dc9551..3796116 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
-
-       <artifactId>aaf-auth-gui</artifactId>
-       <name>AAF Auth GUI</name>
-       <description>GUI Component for AAF Auth Management</description>
-
-       <properties>
-               <maven.test.failure.ignore>true</maven.test.failure.ignore>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-client</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cmd</artifactId>
-               </dependency>
-
-               <!-- Add the Organizations you wish to support. You can delete ONAP if 
-                       you have something else Match with Property Entry: Organization.<root ns>, 
-                       i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-deforg</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-client</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-xgen</artifactId>
-               </dependency>
-
-
-
-       </dependencies>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <includes>
-                                               <include>**/*.class</include>
-                                       </includes>
-                               </configuration>
-                               <version>2.3.1</version>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.gui.AAF_GUI</mainClass>
-                                                       <name>gui</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.gui.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/gui</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                                       <jvmSettings>
-                                                               <extraArguments>
-                                                                       <extraArgument>-Daaf_cfa_web_path=$BASEDIR/theme/onap</extraArgument>
-                                                               </extraArguments>
-                                                       </jvmSettings>
-                                               </program>
-                                       </programs>
-                                       <copyConfigurationDirectory>true</copyConfigurationDirectory>
-                                       <configurationDirectory>theme</configurationDirectory>
-                                       <configurationSourceDirectory>theme</configurationSourceDirectory>
-                               </configuration>
-
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>aaf-auth-gui</artifactId>
+    <name>AAF Auth GUI</name>
+    <description>GUI Component for AAF Auth Management</description>
+
+    <properties>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cmd</artifactId>
+        </dependency>
+
+        <!-- Add the Organizations you wish to support. You can delete ONAP if 
+            you have something else Match with Property Entry: Organization.<root ns>, 
+            i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-deforg</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-xgen</artifactId>
+        </dependency>
+
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.class</include>
+                    </includes>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.gui.AAF_GUI</mainClass>
+                            <name>gui</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.gui.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/gui</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                            <jvmSettings>
+                                <extraArguments>
+                                    <extraArgument>-Daaf_cfa_web_path=$BASEDIR/theme/onap</extraArgument>
+                                </extraArguments>
+                            </jvmSettings>
+                        </program>
+                    </programs>
+                    <copyConfigurationDirectory>true</copyConfigurationDirectory>
+                    <configurationDirectory>theme</configurationDirectory>
+                    <configurationSourceDirectory>theme</configurationSourceDirectory>
+                </configuration>
+
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index 665d724..31f26a3 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============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==================================================== 
-       * -->
+    * 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-hello</artifactId>
-       <name>AAF Auth Hello Service</name>
-       <description>Hello Service Component for testing AAF Auth Access</description>
+    <artifactId>aaf-auth-hello</artifactId>
+    <name>AAF Auth Hello Service</name>
+    <description>Hello Service Component for testing AAF Auth Access</description>
 
-       <properties>
-               <skipTests>false</skipTests>
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <!-- 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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <skipTests>false</skipTests>
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <!-- 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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <includes>
-                                               <include>**/*.class</include>
-                                       </includes>
-                               </configuration>
-                               <version>2.3.1</version>
-                       </plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.class</include>
+                    </includes>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.hello.AAF_Hello</mainClass>
+                            <name>hello</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.hello.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/hello</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                       <!--This plugin's configuration is used to store Eclipse m2e settings 
-                               only. It has no influence on the Maven build itself. -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.hello.AAF_Hello</mainClass>
-                                                       <name>hello</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.hello.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/hello</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>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-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>
 
-                                       <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>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 8ca9c89..7d47bcc 100644 (file)
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-locate</artifactId>
-       <name>AAF Auth Locate</name>
-       <description>Location Service for AAF Auth Components</description>
+    <artifactId>aaf-auth-locate</artifactId>
+    <name>AAF Auth Locate</name>
+    <description>Location Service for AAF Auth Components</description>
 
-       <properties>
-               <maven.test.failure.ignore>true</maven.test.failure.ignore>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
-                       <artifactId>aaf-auth-client</artifactId>
-               </dependency>
-       
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+        </dependency>
+    
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cass</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cass</artifactId>
+        </dependency>
 
                 <!-- Add the Organizations you wish to support. You can delete ONAP if
                         you have something else Match with Property Entry: Organization.<root ns>,
                         <artifactId>aaf-auth-deforg</artifactId>
                 </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-rosetta</artifactId>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.jvnet.jaxb2.maven2</groupId>
-                               <artifactId>maven-jaxb2-plugin</artifactId>
-                               <version>0.8.2</version>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <schemaDirectory>src/main/xsd</schemaDirectory>
-                               </configuration>
-                       </plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.8.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.locate.AAF_Locate</mainClass>
+                            <id>locate</id>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.locate.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/locate</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.locate.AAF_Locate</mainClass>
-                                                       <id>locate</id>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.locate.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/locate</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>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-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>
 
-                                       <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>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index ec4c5be..725d8f1 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <artifactId>aaf-auth-oauth</artifactId>
-       <name>AAF Auth OAuth Service</name>
-       <description>OAuth Component for AAF Auth</description>
+    <artifactId>aaf-auth-oauth</artifactId>
+    <name>AAF Auth OAuth Service</name>
+    <description>OAuth Component for AAF Auth</description>
 
-       <properties>
-               <project.swmVersion>25</project.swmVersion>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <project.swmVersion>25</project.swmVersion>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cass</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cass</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <includes>
-                                               <include>**/*.class</include>
-                                       </includes>
-                               </configuration>
-                               <version>2.3.1</version>
-                       </plugin>
-                       <!--This plugin's configuration is used to store Eclipse m2e settings 
-                               only. It has no influence on the Maven build itself. -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.oauth.AAF_OAuth</mainClass>
-                                                       <name>oauth</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.oauth.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/oauth</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.class</include>
+                    </includes>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.oauth.AAF_OAuth</mainClass>
+                            <name>oauth</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.oauth.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/oauth</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
 
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
+                    <execution>
+                        <id>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-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>
+                    <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>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index 72713dd..ceae3e5 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2017 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==================================================== 
-       * -->
+    * org.onap.aaf * =========================================================================== 
+    * Copyright (c) 2017 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/maven-v4_0_0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>authparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
-
-       <artifactId>aaf-auth-service</artifactId>
-       <name>AAF Auth Service</name>
-       <description>Core API Component for AAF Auth</description>
-
-       <properties>
-               <maven.test.failure.ignore>true</maven.test.failure.ignore>
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <!-- 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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-auth-client</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-core</artifactId>
-               </dependency>
-
-               <!-- Add the Organizations you wish to support. You can delete ONAP if 
-                       you have something else Match with Property Entry: Organization.<root ns>, 
-                       i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-deforg</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-cass</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-oauth</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-rosetta</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.eclipse.jetty</groupId>
-                       <artifactId>jetty-servlet</artifactId>
-               </dependency>
-
-       </dependencies>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>*.properties</exclude>
-                                       </excludes>
-                               </configuration>
-                               <version>2.3.1</version>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>appassembler-maven-plugin</artifactId>
-                               <configuration>
-                                       <programs>
-                                               <program>
-                                                       <mainClass>org.onap.aaf.auth.service.AAF_Service</mainClass>
-                                                       <name>service</name>
-                                                       <commandLineArguments>
-                                                               <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.service.props</commandLineArgument>
-                                                               <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/service</commandLineArgument>
-                                                               <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
-                                                       </commandLineArguments>
-                                               </program>
-                                       </programs>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <!-- plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> 
-                               </plugin -->
-               </plugins>
-       </build>
-
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>aaf-auth-service</artifactId>
+    <name>AAF Auth Service</name>
+    <description>Core API Component for AAF Auth</description>
+
+    <properties>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <!-- 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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-core</artifactId>
+        </dependency>
+
+        <!-- Add the Organizations you wish to support. You can delete ONAP if 
+            you have something else Match with Property Entry: Organization.<root ns>, 
+            i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-deforg</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-cass</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-oauth</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>*.properties</exclude>
+                    </excludes>
+                </configuration>
+                <version>2.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <configuration>
+                    <programs>
+                        <program>
+                            <mainClass>org.onap.aaf.auth.service.AAF_Service</mainClass>
+                            <name>service</name>
+                            <commandLineArguments>
+                                <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.service.props</commandLineArgument>
+                                <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/service</commandLineArgument>
+                                <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument>
+                            </commandLineArguments>
+                        </program>
+                    </programs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> 
+                </plugin -->
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index fb1f79e..51bfecd 100644 (file)
@@ -13,3 +13,4 @@
 /*.jks
 /sdnc
 /working
+/target
index 3094eab..703abc5 100755 (executable)
@@ -47,14 +47,14 @@ if [ $# -gt 0 ]; then
     fi
 fi
 
-echo "$0: AAF_COMPONENTS=$AAF_COMPONENTS DOCKER_PULL_REGISTRY=$DOCKER_PULL_REGISTRY"
+grep -v '#' d.props | grep '=' | grep -v -e "=$"
 
 DOCKER=${DOCKER:=docker}
 
 echo "Building Containers for aaf components, version $VERSION"
-
 # AAF_cass now needs a version...
 cd ../auth-cass/docker
+pwd
 bash ./dbuild.sh $DOCKER_PULL_REGISTRY
 cd -
 
diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
new file mode 100644 (file)
index 0000000..540513e
--- /dev/null
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2017 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>authparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>aaf-auth-docker</artifactId>
+    <name>AAF Docker Build</name>
+    <description>Docker Build</description>
+    <!-- Build Docker with "cd < this dir>; mvn -N exec:exec -Pbuild-docker -->
+
+    <profiles>
+        <profile>
+            <id>build-docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.6.0</version>
+                        <executions>
+                            <execution>
+                                <id>Docker Build</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <executable>bash</executable>
+                            <commandlineArgs>-c "pwd; bash dbuild.sh"</commandlineArgs>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+
+
index 071c184..2b888cb 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">
+    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>
-       <parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.15-SNAPSHOT</version>
     </parent>
-       <artifactId>authparent</artifactId>
-       <name>AAF Auth Parent</name>
-       <packaging>pom</packaging>
+    <artifactId>authparent</artifactId>
+    <name>AAF Auth Parent</name>
+    <packaging>pom</packaging>
 
-       
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
-               <!--  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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-               <!-- We have to up these versions from the original to avoid Security Errors -->
-               <project.nettyVersion>4.1.22.Final</project.nettyVersion>
-               <project.project.ext_root_dir>/opt/app/osaaf</project.project.ext_root_dir>
-       </properties>
+    
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
+        <!--  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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+        <!-- We have to up these versions from the original to avoid Security Errors -->
+        <project.nettyVersion>4.1.22.Final</project.nettyVersion>
+        <project.project.ext_root_dir>/opt/app/osaaf</project.project.ext_root_dir>
+    </properties>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.8</source>
-                                               <target>1.8</target>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-deploy-plugin</artifactId>
-                                       <version>2.6</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
-                               </plugin>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                        <useSystemClassLoader>false</useSystemClassLoader>
+                    </configuration>
+                </plugin>
 
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                               <useSystemClassLoader>false</useSystemClassLoader>
-                                       </configuration>
-                               </plugin>
-
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-failsafe-plugin</artifactId>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>integration-test</id>
-                                                       <goals>
-                                                               <goal>integration-test</goal>
-                                                               <goal>verify</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                               
-                               <!--  Builds O/S Command line ready jars and scripts, ready to run/zip -->
-                               <plugin>
-                                       <groupId>org.codehaus.mojo</groupId>
-                                       <artifactId>appassembler-maven-plugin</artifactId>
-                                       <version>1.10</version>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               <goal>assemble</goal>
-                                                       </goals>
-                                                       <phase>install</phase>
-                                               </execution>
-                                       </executions>
-                                       <configuration>
-                                               <programs/> <!-- this set in projects that have programs -->
-                                               <assembleDirectory>../aaf_${project.version}</assembleDirectory>
-                                               <copyConfigurationDirectory>true</copyConfigurationDirectory>
-                                               <configurationDirectory>etc</configurationDirectory>
-                                               <repositoryName>lib</repositoryName>
-                                               <includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
-                                               <repositoryLayout>flat</repositoryLayout>
-                                       </configuration>
-                               </plugin>
-                               
-                               <!-- Build Docker Image -->
-                               <plugin>
-                                       <groupId>com.spotify</groupId>
-                                       <artifactId>docker-maven-plugin</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <imageName>onap/osaaf/${project.artifactId}</imageName>
-                                               <!-- <dockerDirectory>${dockerLocation}</dockerDirectory> -->
-                                               <dockerDirectory>${basedir}/src/main/resources/docker</dockerDirectory>
-                                               <imageTags>
-                                                       <imageTag>latest</imageTag>
-                                                       <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
-                                                       <imageTag>${project.docker.latesttag.version}</imageTag>
-                                               </imageTags>
-                                               <forceTags>true</forceTags>
-                                               <!-- <resources> <resource> <targetPath>/</targetPath> <directory>${project.build.directory}/opt</directory> 
-                                                       <filtering>true</filtering> <includes> <include>**/**</include> </includes> 
-                                                       </resource> </resources> -->
-                                               <resources>
-                                                       <resource>
-                                                               <targetPath>/</targetPath>
-                                                               <directory>${project.build.directory}/opt</directory>
-                                                               <include>${project.build.finalName}.jar</include>
-                                                       </resource>
-                                                       <resource>
-                                                               <targetPath>/</targetPath>
-                                                               <directory>${project.build.directory}</directory>
-                                                               <include>**/**</include>
-                                                       </resource>
-                                               </resources>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>build-image</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>build</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-                                                       </configuration>
-                                               </execution>
-                               
-                                               <execution>
-                                                       <id>tag-image-project-version</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>tag</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <image>onap/osaaf/${project.artifactId}</image>
-                                                               <newName>${docker.push.registry}/onap/osaaf/${project.artifactId}:${project.version}</newName>
-                                                               <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                                       </configuration>
-                                               </execution>
-                               
-                                               <execution>
-                                                       <id>tag-image-latest</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>tag</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <image>onap/aaf/authz-service</image>
-                                                               <newName>${docker.push.registry}/onap/osaaf/${project.artifactId}:latest</newName>
-                                                               <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                                       </configuration>
-                                               </execution>
-                               
-                                               <execution>
-                                                       <id>push-image-latest</id>
-                                                       <phase>deploy</phase>
-                                                       <goals>
-                                                               <goal>push</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <imageName>${docker.push.registry}/onap/osaaf/${project.artifactId}:${project.version}</imageName>
-                                                               <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                                       </configuration>
-                                               </execution>
-                               
-                                               <execution>
-                                                       <id>push-image</id>
-                                                       <phase>deploy</phase>
-                                                       <goals>
-                                                               <goal>push</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <imageName>${docker.push.registry}/onap/osaaf/${project.artifactId}:latest</imageName>
-                                                               <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>integration-test</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                
+                <!--  Builds O/S Command line ready jars and scripts, ready to run/zip -->
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>appassembler-maven-plugin</artifactId>
+                    <version>1.10</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>assemble</goal>
+                            </goals>
+                            <phase>install</phase>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <programs/> <!-- this set in projects that have programs -->
+                        <assembleDirectory>../aaf_${project.version}</assembleDirectory>
+                        <copyConfigurationDirectory>true</copyConfigurationDirectory>
+                        <configurationDirectory>etc</configurationDirectory>
+                        <repositoryName>lib</repositoryName>
+                        <includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
+                        <repositoryLayout>flat</repositoryLayout>
+                    </configuration>
+                </plugin>
+                
+                <!-- Build Docker Image -->
+                <plugin>
+                    <groupId>com.spotify</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <imageName>onap/osaaf/${project.artifactId}</imageName>
+                        <!-- <dockerDirectory>${dockerLocation}</dockerDirectory> -->
+                        <dockerDirectory>${basedir}/src/main/resources/docker</dockerDirectory>
+                        <imageTags>
+                            <imageTag>latest</imageTag>
+                            <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
+                            <imageTag>${project.docker.latesttag.version}</imageTag>
+                        </imageTags>
+                        <forceTags>true</forceTags>
+                        <!-- <resources> <resource> <targetPath>/</targetPath> <directory>${project.build.directory}/opt</directory> 
+                            <filtering>true</filtering> <includes> <include>**/**</include> </includes> 
+                            </resource> </resources> -->
+                        <resources>
+                            <resource>
+                                <targetPath>/</targetPath>
+                                <directory>${project.build.directory}/opt</directory>
+                                <include>${project.build.finalName}.jar</include>
+                            </resource>
+                            <resource>
+                                <targetPath>/</targetPath>
+                                <directory>${project.build.directory}</directory>
+                                <include>**/**</include>
+                            </resource>
+                        </resources>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>build-image</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>build</goal>
+                            </goals>
+                            <configuration>
+                                <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+                            </configuration>
+                        </execution>
+                
+                        <execution>
+                            <id>tag-image-project-version</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>tag</goal>
+                            </goals>
+                            <configuration>
+                                <image>onap/osaaf/${project.artifactId}</image>
+                                <newName>${docker.push.registry}/onap/osaaf/${project.artifactId}:${project.version}</newName>
+                                <skipDockerTag>${skip.docker.push}</skipDockerTag>
+                            </configuration>
+                        </execution>
+                
+                        <execution>
+                            <id>tag-image-latest</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>tag</goal>
+                            </goals>
+                            <configuration>
+                                <image>onap/aaf/authz-service</image>
+                                <newName>${docker.push.registry}/onap/osaaf/${project.artifactId}:latest</newName>
+                                <skipDockerTag>${skip.docker.push}</skipDockerTag>
+                            </configuration>
+                        </execution>
+                
+                        <execution>
+                            <id>push-image-latest</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>push</goal>
+                            </goals>
+                            <configuration>
+                                <imageName>${docker.push.registry}/onap/osaaf/${project.artifactId}:${project.version}</imageName>
+                                <skipDockerPush>${skip.docker.push}</skipDockerPush>
+                            </configuration>
+                        </execution>
+                
+                        <execution>
+                            <id>push-image</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>push</goal>
+                            </goals>
+                            <configuration>
+                                <imageName>${docker.push.registry}/onap/osaaf/${project.artifactId}:latest</imageName>
+                                <skipDockerPush>${skip.docker.push}</skipDockerPush>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.7.201606060606</version>
+                <configuration>
+                    <dumpOnExit>true</dumpOnExit>
+                    <includes>
+                        <include>org.onap.aaf.*</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                    <execution>
                         <goals>
                             <goal>merge</goal>
                         </goals>
                             <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
                         </configuration>
                     </execution>
-                               </executions>
-                       </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+                </executions>
+            </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-       </dependencies>
+    </dependencies>
 
-       <modules>
-               <!-- <module>auth-client</module> complile manually with mvn -N independently -->
-               <module>auth-core</module>
-               <module>auth-cass</module>
-               <module>auth-deforg</module>
+    <modules>
+        <!-- <module>auth-client</module> complile manually with mvn -N independently -->
+        <module>auth-core</module>
+        <module>auth-cass</module>
+        <module>auth-deforg</module>
 
-               <module>auth-service</module>
-               <module>auth-cmd</module>
-               <module>auth-batch</module>
+        <module>auth-service</module>
+        <module>auth-cmd</module>
+        <module>auth-batch</module>
 
-               <module>auth-gui</module>
-               <module>auth-locate</module>
-               <module>auth-oauth</module>
-               <module>auth-certman</module>
-               <module>auth-fs</module>
-               <module>auth-hello</module>
-       </modules>
+        <module>auth-gui</module>
+        <module>auth-locate</module>
+        <module>auth-oauth</module>
+        <module>auth-certman</module>
+        <module>auth-fs</module>
+        <module>auth-hello</module>
+    </modules>
 
 
-</project>     
+</project>    
index 026f9ee..44710d9 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>com.att.cadi</groupId>
-               <artifactId>parent</artifactId>
-               <version>1.2.2</version>
-               <relativePath>..</relativePath>
-       </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.att.cadi</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.2.2</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <name>CADI AAF (Application Authorization Framework) LUR</name>
-       <packaging>jar</packaging>
-       <artifactId>cadi-aaf</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <name>CADI AAF (Application Authorization Framework) LUR</name>
+    <packaging>jar</packaging>
+    <artifactId>cadi-aaf</artifactId>
 
-       <dependencies>
-               <dependency>
-                       <groupId>com.att.authz</groupId>
-                       <artifactId>authz-client</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.att.authz</groupId>
+            <artifactId>authz-client</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.att.cadi</groupId>
-                       <artifactId>cadi-client</artifactId>
-               </dependency>
-               
-               <dependency>
-                       <groupId>com.att.aft</groupId>
-                       <artifactId>dme2</artifactId>
-                       <exclusions>
-                     <exclusion> 
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                     </exclusion>
-                     <exclusion> 
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                     </exclusion>
+        <dependency>
+            <groupId>com.att.cadi</groupId>
+            <artifactId>cadi-client</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.att.aft</groupId>
+            <artifactId>dme2</artifactId>
+            <exclusions>
+              <exclusion> 
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+              </exclusion>
+              <exclusion> 
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
             </exclusions>
-               </dependency>
+        </dependency>
 
-               <!-- dependency>
-               <groupId>org.apache.cassandra</groupId>
-               <artifactId>cassandra-all</artifactId>
-               <version>2.1.2</version>
-               <scope>compile</scope>
-               <exclusions>
-                     <exclusion> 
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                     </exclusion>
-                     <exclusion> 
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                     </exclusion>
-                   </exclusions> 
-               </dependency-->
-               
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jaxb2-maven-plugin</artifactId>
-                               <version>1.3</version>
-                               <executions>
-                                       <execution>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>xjc</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <schemaDirectory>src/main/xsd</schemaDirectory>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestEntries>
-                                                       <Sealed>true</Sealed>
-                                               </manifestEntries>
-                                       </archive>
+        <!-- dependency>
+            <groupId>org.apache.cassandra</groupId>
+            <artifactId>cassandra-all</artifactId>
+            <version>2.1.2</version>
+            <scope>compile</scope>
+            <exclusions>
+              <exclusion> 
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+              </exclusion>
+              <exclusion> 
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
+            </exclusions> 
+        </dependency-->
+        
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Sealed>true</Sealed>
+                        </manifestEntries>
+                    </archive>
 
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>test-jar</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>test-jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               
-                       </plugin>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>test-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </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>
-                               <version>2.4</version>
-                               <configuration>
-                                       <classifier>tests</classifier>
-                                       <archive>
-                                               <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>
+            <!-- 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>
+                <version>2.4</version>
+                <configuration>
+                    <classifier>tests</classifier>
+                    <archive>
+                        <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>
 
-                       <plugin>
-                               <!-- 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>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>sign-full</id>
-                                               <goals>
-                                                       <goal>sign</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <archive>target/${project.artifactId}-${project.version}-full.jar</archive>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>verify-full</id>
-                                               <goals>
-                                                       <goal>verify</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <archive>target/${project.artifactId}-${project.version}-full.jar</archive>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+            <plugin>
+                <!-- 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>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>sign-full</id>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                        <configuration>
+                            <archive>target/${project.artifactId}-${project.version}-full.jar</archive>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>verify-full</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <archive>target/${project.artifactId}-${project.version}-full.jar</archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jaxb2-maven-plugin</artifactId>
-                               <version>1.3</version>
-                               <executions>
-                                       <execution>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>xjc</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <schemaDirectory>src/main/xsd</schemaDirectory>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.6</version>
-                               <configuration>
-                                       <skip>false</skip>
-                               </configuration>
-                       </plugin>
-               </plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
 
-               <pluginManagement>
-                       <plugins>
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore></ignore>
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+        <pluginManagement>
+            <plugins>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 
 </project>
index b5767b2..07737f5 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</groupId>
-               <artifactId>cadiparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    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</groupId>
+        <artifactId>cadiparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>aaf-cadi-aaf</artifactId>
-       <name>AAF CADI AAF Connection Library</name>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-cadi-aaf</artifactId>
+    <name>AAF CADI AAF Connection Library</name>
+    <packaging>jar</packaging>
 
-       <properties>
-       <!--  SONAR  -->
-       <!-- <sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <properties>
+    <!--  SONAR  -->
+    <!-- <sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-auth-client</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-client</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-client</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <classifier>tests</classifier>
-                                       <archive>
-                                               <manifest>
-                                                       <mainClass>org.onap.aaf.cadi.configure.Agent</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>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <classifier>tests</classifier>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.onap.aaf.cadi.configure.Agent</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>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 38bee29..2a2029c 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</groupId>
-               <artifactId>cadiparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>cadiparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <artifactId>aaf-cadi-client</artifactId>
-       <name>AAF CADI Client</name>
-       <packaging>jar</packaging>
-       <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-cadi-client</artifactId>
+    <name>AAF CADI Client</name>
+    <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
 
-       <properties>
-       <scijava.jvm.version>1.8</scijava.jvm.version>
-               <!--  SONAR  -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+    <scijava.jvm.version>1.8</scijava.jvm.version>
+        <!--  SONAR  -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-misc-rosetta</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
 
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <scope>compile</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jarsigner-plugin</artifactId>
-                               <version>1.4</version>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jarsigner-plugin</artifactId>
+                <version>1.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 337262d..168ae29 100644 (file)
 <!-- * ============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====================================================
-       * -->
+    * 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">
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>cadiparent</artifactId>
-               <relativePath>..</relativePath>
-               <version>2.1.15-SNAPSHOT</version>
-       </parent>
+    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</groupId>
+        <artifactId>cadiparent</artifactId>
+        <relativePath>..</relativePath>
+        <version>2.1.15-SNAPSHOT</version>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <name>AAF CADI Core Framework</name>
-       <artifactId>aaf-cadi-core</artifactId>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <name>AAF CADI Core Framework</name>
+    <artifactId>aaf-cadi-core</artifactId>
+    <packaging>jar</packaging>
 
-       <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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <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.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
-       <dependencies>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <!-- 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>
-                               <version>1.4</version>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifest>
-                                                       <mainClass>org.onap.aaf.cadi.CmdLine</mainClass>
-                                               </manifest>
-                                               <manifestEntries>
-                                                       <Sealed>true</Sealed>
-                                               </manifestEntries>
-                                       </archive>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>test-jar</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>test-jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>**/gen/**</exclude>
-                                               <exclude>**/generated-sources/**</exclude>
-                                               <exclude>**/yang-gen/**</exclude>
-                                               <exclude>**/pax/**</exclude>
-                                       </excludes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                       <propertyName>surefireArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                       <propertyName>failsafeArgLine</propertyName>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-integration-test</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <!-- 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>
+                <version>1.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.onap.aaf.cadi.CmdLine</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <Sealed>true</Sealed>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>test-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/gen/**</exclude>
+                        <exclude>**/generated-sources/**</exclude>
+                        <exclude>**/yang-gen/**</exclude>
+                        <exclude>**/pax/**</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 14d3f77..139ae42 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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.aaf.authz</groupId>
-               <artifactId>cadiparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       
-       <name>AAF CADI Sample OAuth EndUser</name>
-       <artifactId>aaf-cadi-oauth-enduser</artifactId>
-       <packaging>jar</packaging>
+    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>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>cadiparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    
+    <name>AAF CADI Sample OAuth EndUser</name>
+    <artifactId>aaf-cadi-oauth-enduser</artifactId>
+    <packaging>jar</packaging>
 
-       <properties>
-       <!--  SONAR  -->
-       <sonar.skip>true</sonar.skip>
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
-       </dependencies>
+    <properties>
+    <!--  SONAR  -->
+    <sonar.skip>true</sonar.skip>
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.8</source>
-                                               <target>1.8</target>
-                                       </configuration>
-                               </plugin>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.4</version>
-                                       <configuration>
-                                               <archive>
-                                                       <manifest>
-                                                               <mainClass>org.onap.aaf.cadi.enduser.OAuthExample</mainClass>
-                                                       </manifest>
-                                               </archive>
-                                               <descriptors>
-                                                       <descriptor>src/main/assemble/cadi-oauth-enduser-assemble.xml</descriptor>
-                                               </descriptors>
-                                       </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>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <mainClass>org.onap.aaf.cadi.enduser.OAuthExample</mainClass>
+                            </manifest>
+                        </archive>
+                        <descriptors>
+                            <descriptor>src/main/assemble/cadi-oauth-enduser-assemble.xml</descriptor>
+                        </descriptors>
+                    </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-deploy-plugin</artifactId>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
-       
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+                            <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>
+                    <version>2.8.1</version>
+                    <configuration>
+                        <skip>false</skip>
+                    </configuration>
+    
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-       
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index fa1dd0f..3dd5d0a 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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-           <groupId>org.onap.aaf.authz</groupId>
-           <artifactId>parent</artifactId>
-           <version>2.1.15-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
     </parent>
-       <artifactId>cadiparent</artifactId>
-       <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-       <inceptionYear>2015-07-20</inceptionYear>
-       <organization>
-               <name>ONAP</name>
-       </organization>
-       <packaging>pom</packaging>
-       
-       <properties>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-       
+    <artifactId>cadiparent</artifactId>
+    <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
+    <inceptionYear>2015-07-20</inceptionYear>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+    
 
-       <!-- ============================================================== -->
-       <!-- Define the major contributors and developers of CADI -->
-       <!-- ============================================================== -->
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <!-- ============================================================== -->
+    <!-- Define the major contributors and developers of CADI -->
+    <!-- ============================================================== -->
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <scope>test</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-       <!-- ============================================================== -->
-       <!-- Define sub-projects (modules) -->
-       <!-- ============================================================== -->
-       <modules>
-               <module>core</module>
-               <module>client</module>
-               <module>aaf</module>
-               <module>oauth-enduser</module>
-               <module>servlet-sample</module>
-       </modules>
+    <!-- ============================================================== -->
+    <!-- Define sub-projects (modules) -->
+    <!-- ============================================================== -->
+    <modules>
+        <module>core</module>
+        <module>client</module>
+        <module>aaf</module>
+        <module>oauth-enduser</module>
+        <module>servlet-sample</module>
+    </modules>
 
 
-       <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               <plugins>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
+    <!-- ============================================================== -->
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
-                               </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>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
+                <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.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
-                               </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>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                               <useSystemClassLoader>false</useSystemClassLoader>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                        <useSystemClassLoader>false</useSystemClassLoader>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </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>
-       </build>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </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>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index 1533ad9..071fce7 100644 (file)
@@ -1,95 +1,95 @@
 <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</groupId>
-               <artifactId>cadiparent</artifactId>
-               <relativePath>..</relativePath>
-               <version>2.1.15-SNAPSHOT</version>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
-       <name>CADI Servlet Sample (Test Only)</name>
-       <artifactId>aaf-cadi-servlet-sample</artifactId>
-       <packaging>jar</packaging>
-       
-       <properties>
-               <!-- SONAR -->
-               <sonar.skip>true</sonar.skip>
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
-               <project.bouncyCastleVersion>1.60</project.bouncyCastleVersion>
-       </properties>
-       <dependencies>
-               <!-- needs to be first to avoid jar signer implications for servlet api  -->
-               <dependency>
-                       <groupId>org.eclipse.jetty</groupId>
-                       <artifactId>jetty-webapp</artifactId>
-                       <version>${project.jettyVersion}</version>
-               </dependency>
+    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</groupId>
+        <artifactId>cadiparent</artifactId>
+        <relativePath>..</relativePath>
+        <version>2.1.15-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <name>CADI Servlet Sample (Test Only)</name>
+    <artifactId>aaf-cadi-servlet-sample</artifactId>
+    <packaging>jar</packaging>
+    
+    <properties>
+        <!-- SONAR -->
+        <sonar.skip>true</sonar.skip>
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
+        <project.bouncyCastleVersion>1.60</project.bouncyCastleVersion>
+    </properties>
+    <dependencies>
+         <!-- needs to be first to avoid jar signer implications for servlet api  -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${project.jettyVersion}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-               </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+        </dependency>
 
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>sample</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assemble/servlet_sample.xml</descriptor>
-                                                       </descriptors>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>3.1</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>sample</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assemble/servlet_sample.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.1</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
index a0c6e4b..a0a5f93 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</groupId>
-               <artifactId>miscparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    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</groupId>
+        <artifactId>miscparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>aaf-misc-env</artifactId>
-       <name>AAF Misc Env</name>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-misc-env</artifactId>
+    <name>AAF Misc Env</name>
+    <packaging>jar</packaging>
 
-       <properties>
-               <!-- SONAR -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-               <jacoco.version>0.7.7.201606060606</jacoco.version>
-               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-               <!-- Default Sonar configuration -->
-               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
-                       below -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+    <properties>
+        <!-- SONAR -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+        <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+            below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               <plugins>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
+    <!-- ============================================================== -->
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                               <propertyName>surefireArgLine</propertyName>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                        <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                        <propertyName>surefireArgLine</propertyName>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
-                               </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>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
+                <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.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
-                               </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>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </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>
-       </build>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </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>
+    </build>
 
-       <dependencies>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
-               </dependency>
-               
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
+        </dependency>
+        
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <scope>test</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
 
index 214805c..5e662f7 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</groupId>
-               <artifactId>miscparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    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</groupId>
+        <artifactId>miscparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>aaf-misc-log4j</artifactId>
-       <name>AAF Misc Log4J</name>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-misc-log4j</artifactId>
+    <name>AAF Misc Log4J</name>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <properties>
-       <!--  SONAR  -->
-           <!--<sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+    <properties>
+    <!--  SONAR  -->
+        <!--<sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+        <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</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
 <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               <plugins>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
-                               </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>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
+                <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.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
-                               </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>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </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>
-       </build>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </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>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 47ec26c..e8cb791 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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
+    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>
+    <parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
        <version>2.1.15-SNAPSHOT</version>
     </parent>
-       <artifactId>miscparent</artifactId>
-       <name>AAF Misc Parent</name>
-       <packaging>pom</packaging>
+    <artifactId>miscparent</artifactId>
+    <name>AAF Misc Parent</name>
+    <packaging>pom</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-       <modules>
-               <module>env</module>
-               <module>xgen</module>
-               <module>rosetta</module>
-               <module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
-       </modules>
-       
-       <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               <plugins>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
+    <modules>
+        <module>env</module>
+        <module>xgen</module>
+        <module>rosetta</module>
+        <module>log4j</module> <!--  note: generates log4j, to avoid Jar conflict -->
+    </modules>
+    
+    <!-- ============================================================== -->
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
-                               </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>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
+                <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.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
-                               </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>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                               <useSystemClassLoader>false</useSystemClassLoader>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                        <useSystemClassLoader>false</useSystemClassLoader>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </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>
-       </build>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </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>
+    </build>
 
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 </project>
index 53295ab..c87c81e 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</groupId>
-               <artifactId>miscparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    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</groupId>
+        <artifactId>miscparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>aaf-misc-rosetta</artifactId>
-       <name>AAF Misc Rosetta</name>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-misc-rosetta</artifactId>
+    <name>AAF Misc Rosetta</name>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <properties>
-       <!--  SONAR  -->
-       <scijava.jvm.version>1.8</scijava.jvm.version>
-       <!-- <sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+    <properties>
+    <!--  SONAR  -->
+    <scijava.jvm.version>1.8</scijava.jvm.version>
+    <!-- <sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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>
+        <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</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-                       
+            
 
-                               <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
+                <!-- ============================================================== -->
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                               <groupId>org.jvnet.jaxb2.maven2</groupId>
-                               <artifactId>maven-jaxb2-plugin</artifactId>
-                               <version>0.8.2</version>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <schemaDirectory>src/main/xsd</schemaDirectory>
-                               </configuration>
-                       </plugin>
-                       
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <version>0.8.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <schemaDirectory>src/main/xsd</schemaDirectory>
+                </configuration>
+            </plugin>
+            
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-deploy-plugin</artifactId>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </configuration>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <configuration>
+                        <skip>false</skip>
+                    </configuration>
 
-                               </plugin>
+                </plugin>
 
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                               </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                </plugin>
 
-                               <!-- Maven surefire plugin for testing -->
-                               <plugin>
-                                       <artifactId>maven-surefire-plugin</artifactId>
-                                       <configuration>
-                                       <skipTests>false</skipTests>
-                                       <includes>
-                                               <include>**/JU*.java</include>
-                                       </includes>
-                                       <excludes>
-                                       </excludes>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                    <skipTests>false</skipTests>
+                    <includes>
+                        <include>**/JU*.java</include>
+                    </includes>
+                    <excludes>
+                    </excludes>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <configuration>
-                                               <excludes>
-                                                       <exclude>**/gen/**</exclude>
-                                                       <exclude>**/generated-sources/**</exclude>
-                                                       <exclude>**/yang-gen/**</exclude>
-                                                       <exclude>**/pax/**</exclude>
-                                               </excludes>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>pre-unit-test</id>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                                                               <propertyName>surefireArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>post-unit-test</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>pre-integration-test</id>
-                                                       <phase>pre-integration-test</phase>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                                                               <propertyName>failsafeArgLine</propertyName>
-                                                       </configuration>
-                                               </execution>
-                                               <execution>
-                                                       <id>post-integration-test</id>
-                                                       <phase>post-integration-test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-       </build>
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <configuration>
+                        <excludes>
+                            <exclude>**/gen/**</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                            <exclude>**/yang-gen/**</exclude>
+                            <exclude>**/pax/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>pre-unit-test</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                <propertyName>surefireArgLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>post-unit-test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>pre-integration-test</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                <propertyName>failsafeArgLine</propertyName>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>post-integration-test</id>
+                            <phase>post-integration-test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+    </build>
 
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
 
 </project>
index 8a08d5b..1cf84cd 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</groupId>
-               <artifactId>miscparent</artifactId>
-               <version>2.1.15-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
+    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</groupId>
+        <artifactId>miscparent</artifactId>
+        <version>2.1.15-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>aaf-misc-xgen</artifactId>
-       <name>AAF Misc XGen</name>
-       <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>aaf-misc-xgen</artifactId>
+    <name>AAF Misc XGen</name>
+    <packaging>jar</packaging>
 
-       <developers>
-               <developer>
-                       <name>Jonathan Gathman</name>
-                       <email>jonathan.gathman@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Architect</role>
-                               <role>Lead Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Gabe Maurer</name>
-                       <email>gabe.maurer@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Ian Howell</name>
-                       <email>ian.howell@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-               <developer>
-                       <name>Sai Gandham</name>
-                       <email>sai.gandham@att.com</email>
-                       <organization>ATT</organization>
-                       <roles>
-                               <role>Developer</role>
-                       </roles>
-               </developer>
-       </developers>
+    <developers>
+        <developer>
+            <name>Jonathan Gathman</name>
+            <email>jonathan.gathman@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Architect</role>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabe Maurer</name>
+            <email>gabe.maurer@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Ian Howell</name>
+            <email>ian.howell@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Sai Gandham</name>
+            <email>sai.gandham@att.com</email>
+            <organization>ATT</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-       <properties>
-               <!--  SONAR  -->
-               <!-- <sonar.skip>true</sonar.skip> -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <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</groupId>
-                       <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-       
-       <!-- ============================================================== -->
-       <!-- Define common plugins and make them available for all modules -->
-       <!-- ============================================================== -->
-       <build>
-               <testSourceDirectory>src/test/java</testSourceDirectory>
-               <plugins>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <inherited>true</inherited>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
-                                       <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <outputDirectory>target</outputDirectory>
-                                               <archive>
-                                                       <manifestEntries>
-                                                               <Sealed>true</Sealed>
-                                                       </manifestEntries>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+    <properties>
+        <!--  SONAR  -->
+        <!-- <sonar.skip>true</sonar.skip> -->
+         <jacoco.version>0.7.7.201606060606</jacoco.version>
+        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <!-- Default Sonar configuration -->
+        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+        <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+        
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <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</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <!-- ============================================================== -->
+    <!-- Define common plugins and make them available for all modules -->
+    <!-- ============================================================== -->
+    <build>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <plugins>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.3.2</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <version>2.4</version>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <outputDirectory>target</outputDirectory>
+                        <archive>
+                            <manifestEntries>
+                                <Sealed>true</Sealed>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
 
-                               <!-- Define the javadoc plugin -->
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
-                                       <configuration>
-                                               <excludePackageNames>org.opendaylight.*</excludePackageNames>
-                                       </configuration>
-                               </plugin>
+                <!-- Define the javadoc plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10</version>
+                    <configuration>
+                        <excludePackageNames>org.opendaylight.*</excludePackageNames>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
-                                       <configuration>
-                                               <goals>-s ${mvn.settings} deploy</goals>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <goals>-s ${mvn.settings} deploy</goals>
+                    </configuration>
+                </plugin>
 
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
-                               </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>
-                                       <version>2.8.1</version>
-                                       <configuration>
-                                               <skip>false</skip>
-                                       </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>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
-                               </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>
-                                       <version>2.17</version>
-                                       <configuration>
-                                               <skipTests>false</skipTests>
-                                               <includes>
-                                                       <include>**/JU*.java</include>
-                                               </includes>
-                                               <excludes>
-                                               </excludes>
-                                       </configuration>
-                               </plugin>
+                <!-- Maven surefire plugin for testing -->
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.17</version>
+                    <configuration>
+                        <skipTests>false</skipTests>
+                        <includes>
+                            <include>**/JU*.java</include>
+                        </includes>
+                        <excludes>
+                        </excludes>
+                    </configuration>
+                </plugin>
 
-                               <!--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>
-                                       <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               <pluginExecution>
-                                                                       <pluginExecutionFilter>
-                                                                               <groupId>
-                                                                                       org.codehaus.mojo
-                                                                               </groupId>
-                                                                               <artifactId>
-                                                                                       jaxb2-maven-plugin
-                                                                               </artifactId>
-                                                                               <versionRange>
-                                                                                       [1.3,)
-                                                                               </versionRange>
-                                                                               <goals>
-                                                                                       <goal>xjc</goal>
-                                                                               </goals>
-                                                                       </pluginExecutionFilter>
-                                                                       <action>
-                                                                               <ignore />
-                                                                       </action>
-                                                               </pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </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>
-       </build>
-       
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>AAF Release Repository</name>
-                       <url>${nexusproxy}${releaseNexusPath}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>AAF Snapshot Repository</name>
-                       <url>${nexusproxy}${snapshotNexusPath}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
-               
-               
+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            jaxb2-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.3,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>xjc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </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>
+    </build>
+    
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>AAF Release Repository</name>
+            <url>${nexusproxy}${releaseNexusPath}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>AAF Snapshot Repository</name>
+            <url>${nexusproxy}${snapshotNexusPath}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
+        
+        
 </project>
diff --git a/pom.xml b/pom.xml
index ea73258..5e6c358 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                    <skip>false</skip>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
                 </executions>
             </plugin>
 
+
         </plugins>
     </build>
     <modules>
                 <artifactId>aaf-cadi-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-aaf</artifactId>
                 <groupId>org.onap.aaf.authz</groupId>
                 <artifactId>aaf-cadi-cass</artifactId>
                 <version>${project.version}</version>
-            </dependency><dependency>
+            </dependency>
+            <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.0.1</version>
             </dependency>
-            
-            <!-- JettyVersion is partly covered in "OParent" 
-              dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency><dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</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-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-util</artifactId>
-                <version>${project.jettyVersion}</version>
-            </dependency>
-             -->
+            <!-- JettyVersion is partly covered in "OParent" dependency> <groupId>org.eclipse.jetty</groupId> 
+                <artifactId>jetty-servlet</artifactId> <version>${project.jettyVersion}</version> 
+                </dependency><dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</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-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-util</artifactId> 
+                <version>${project.jettyVersion}</version> </dependency> -->
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>mail</artifactId>
                 <version>1.4.7</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito</artifactId>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
-            
+
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.17</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.10</version>
                 <scope>test</scope>
             </dependency>
-            
+
         </dependencies>
     </dependencyManagement>
 
-
-
-
-
     <distributionManagement>
         <repository>
             <id>ecomp-releases</id>
             <url>dav:${nexusproxy}${sitePath}</url>
         </site>
     </distributionManagement>
-
 </project>