Upgrade to policy/parent 93/63793/4
authorPamela Dragosh <pdragosh@research.att.com>
Thu, 30 Aug 2018 11:51:13 +0000 (07:51 -0400)
committerPamela Dragosh <pdragosh@research.att.com>
Thu, 30 Aug 2018 13:14:45 +0000 (09:14 -0400)
Change from oparent to policy/parent which inherit from
the latest oparent. The latest oparent has dependencyManagement
recommendations from the ONAP Security sub committee that
the policy team is adhering as part of the effort to consolidate
security work across projects.

Change-Id: I1a43fc5a04dbc8c4cb2b7bedbca67ad3e9dd120b
Issue-ID: INT-619
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
14 files changed:
BRMSGateway/pom.xml
LogParser/pom.xml
ONAP-PAP-REST/pom.xml
ONAP-PDP-REST/pom.xml
ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/jmx/ServerContextImpl.java
ONAP-PDP/pom.xml
ONAP-REST/pom.xml
ONAP-SDK-APP/pom.xml
ONAP-XACML/pom.xml
POLICY-SDK-APP/pom.xml
PolicyEngineAPI/pom.xml
PolicyEngineClient/pom.xml
PolicyEngineUtils/pom.xml
pom.xml

index 7ae6449..2a3ad50 100644 (file)
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.10</version>
         </dependency>
         <dependency>
             <groupId>com.att.nsa</groupId>
             <artifactId>cambriaClient</artifactId>
-            <version>0.0.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -94,7 +92,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
         </dependency>
     </dependencies>
     <build>
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2</version>
                 <configuration>
                     <archive>
                         <manifest>
index 0f38c57..77cd2c9 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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>LogParser</artifactId>
-       <dependencies>
-               <dependency>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>LogParser</artifactId>
+    <dependencies>
+        <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-               <dependency>
+        <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
             <version>2.1.1</version>
-        </dependency> 
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>ONAP-Logging</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>integrity-monitor</artifactId>
-                       <version>${project.version}</version>                   
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-api</artifactId>
-                       <version>2.8.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-core</artifactId>
-                       <version>2.8.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>eclipselink</artifactId>
-                       <version>2.6.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineUtils</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                                       <artifactId>dme2</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.json</groupId>
-                                       <artifactId>json</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                                       <artifactId>dmaapClient</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.att.nsa</groupId>
-                                       <artifactId>cambriaClient</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.onap.aaf.cadi</groupId>
-                                       <artifactId>cadi-aaf</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin> 
-                               <!-- Build an executable JAR --> 
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.2</version>
-                               <configuration>
-                                       <archive>
-                                               <manifest>
-                                                       <addClasspath>true</addClasspath>
-                                                       <classpathPrefix>lib/</classpathPrefix>
-                                                       <mainClass>org.onap.xacml.parser.ParseLog</mainClass>
-                                               </manifest>
-                                       </archive>
-                                       <descriptorRefs>
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>
-                                       </descriptorRefs>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>make-assembly</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-               </plugin>
-               <plugin>
-                               <artifactId>maven-checkstyle-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>onap-java-style</id>
-                                               <goals>
-                                                       <goal>check</goal>
-                                               </goals>
-                                               <phase>process-sources</phase>
-                                               <configuration>
-                                                       <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-                                                               with minor changes -->
-                                                       <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                                                       <!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-                                                               sources directory -->
-                                                       <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                                                       <includeResources>true</includeResources>
-                                                       <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                                                       <includeTestResources>true</includeTestResources>
-                                                       <excludes>
-                                                       </excludes>
-                                                       <consoleOutput>true</consoleOutput>
-                                                       <failOnViolation>true</failOnViolation>
-                                                       <violationSeverity>warning</violationSeverity>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.onap.oparent</groupId>
-                                               <artifactId>checkstyle</artifactId>
-                                               <version>0.1.1</version>
-                                               <scope>compile</scope>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
-               </plugins>
-       </build>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>ONAP-Logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>integrity-monitor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineUtils</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+                    <artifactId>dmaapClient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.att.nsa</groupId>
+                    <artifactId>cambriaClient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.cadi</groupId>
+                    <artifactId>cadi-aaf</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin> 
+                <!-- Build an executable JAR -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>org.onap.xacml.parser.ParseLog</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>onap-java-style</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
+                                with minor changes -->
+                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
+                                sources directory -->
+                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                            <includeResources>true</includeResources>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            <includeTestResources>true</includeTestResources>
+                            <excludes>
+                            </excludes>
+                            <consoleOutput>true</consoleOutput>
+                            <failOnViolation>true</failOnViolation>
+                            <violationSeverity>warning</violationSeverity>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.onap.oparent</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>${oparent.version}</version>
+                        <scope>compile</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 54b99b5..94e0aff 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>
-       <artifactId>ONAP-PAP-REST</artifactId>
-       <description>ONAP-PAP-REST</description>
-       <packaging>war</packaging>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.1</version>
-                               <configuration>
-                                       <attachClasses>true</attachClasses>
-                                       <webResources>
-                                               <webResource>
-                                                       <directory>src/main/java/</directory>
-                                                       <targetPath>WEB-INF/classes/</targetPath>
-                                                       <includes>
-                                                               <include>hibernate.cfg.xml</include>
-                                                       </includes>
-                                               </webResource>
-                                       </webResources>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.2</version>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <!-- To support integrity-audit audit of BackupMonitorEntity table -->
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineUtils</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                                       <artifactId>dme2</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.json</groupId>
-                                       <artifactId>json</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                                       <artifactId>dmaapClient</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.att.nsa</groupId>
-                                       <artifactId>cambriaClient</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.onap.aaf.cadi</groupId>
-                                       <artifactId>cadi-aaf</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-                       <version>3.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>ONAP-PDP</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.json</groupId>
-                                       <artifactId>json</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>ONAP-Logging</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.servlet</groupId>
-                                       <artifactId>servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-compress</artifactId>
-                       <version>1.8</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-fileupload</groupId>
-                       <artifactId>commons-fileupload</artifactId>
-                       <version>${commons.fileupload.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-core</artifactId>
-                       <version>2.8.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>apache-log4j-extras</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>io.netty</groupId>
-                       <artifactId>netty</artifactId>
-                       <version>3.9.7.Final</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>14.0.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.jgit</groupId>
-                       <artifactId>org.eclipse.jgit</artifactId>
-                       <version>3.2.0.201312181205-r</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-jdbc</artifactId>
-                       <version>8.0.24</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.github.fge</groupId>
-                       <artifactId>json-patch</artifactId>
-                       <version>1.9</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>eclipselink</artifactId>
-                       <version>2.6.0</version>
-               </dependency>
-               <dependency>
+<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>
+    <artifactId>ONAP-PAP-REST</artifactId>
+    <description>ONAP-PAP-REST</description>
+    <packaging>war</packaging>
+    <parent>
+        <groupId>org.onap.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                    <webResources>
+                        <webResource>
+                            <directory>src/main/java/</directory>
+                            <targetPath>WEB-INF/classes/</targetPath>
+                            <includes>
+                                <include>hibernate.cfg.xml</include>
+                            </includes>
+                        </webResource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <!-- To support integrity-audit audit of BackupMonitorEntity table -->
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineUtils</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+                    <artifactId>dmaapClient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.att.nsa</groupId>
+                    <artifactId>cambriaClient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.aaf.cadi</groupId>
+                    <artifactId>cadi-aaf</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>ONAP-PDP</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>ONAP-Logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.8</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.9.7.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>3.2.0.201312181205-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>8.0.24</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.fge</groupId>
+            <artifactId>json-patch</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
             <version>2.1.1</version>
         </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-tx</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context-support</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-orm</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-core</artifactId>
-                       <version>${hibernate.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-validator</artifactId>
-                       <version>5.4.2.Final</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/org.json/json -->
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20160810</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jaxb-annotations</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jsonSchema</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>
-                       <artifactId>jackson-dataformat-xml</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.elasticsearch</groupId>
-                       <artifactId>elasticsearch</artifactId>
-                       <version>6.2.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>io.searchbox</groupId>
-                       <artifactId>jest</artifactId>
-                       <version>2.0.4</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>commons-logging</groupId>
-                                       <artifactId>commons-logging</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>args4j</groupId>
-                       <artifactId>args4j</artifactId>
-                       <version>2.32</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-dbcp -->
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-dbcp</artifactId>
-                       <version>8.5.9</version>
-               </dependency>
-       </dependencies>
-       <properties>
-               <springframework.version>4.3.15.RELEASE</springframework.version>
-               <hibernate.version>4.3.10.Final</hibernate.version>
-               <projectversion>2.0.2</projectversion>
-       </properties>
+        <dependency>
+            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+            <artifactId>policy-yaml</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.2.Final</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.json/json -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160810</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>6.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>2.0.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
+            <version>2.32</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-dbcp -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>8.5.9</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <springframework.version>4.3.15.RELEASE</springframework.version>
+        <hibernate.version>4.3.10.Final</hibernate.version>
+        <projectversion>2.0.2</projectversion>
+    </properties>
 </project>
index a301c19..aa54f1b 100644 (file)
   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.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>ONAP-PDP-REST</artifactId>
-       <description>ONAP PDP REST</description>
-       <properties>
-               <springframework.version>4.3.15.RELEASE</springframework.version>
-       </properties>
-       <packaging>war</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.1</version>
-                               <configuration>
-                                       <attachClasses>true</attachClasses>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>ONAP-PDP</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.servlet</groupId>
-                                       <artifactId>servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>apache-log4j-extras</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>19.0</version>
-               </dependency>
-               <dependency>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>ONAP-PDP-REST</artifactId>
+    <description>ONAP PDP REST</description>
+    <properties>
+        <springframework.version>4.3.15.RELEASE</springframework.version>
+    </properties>
+    <packaging>war</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>ONAP-PDP</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>apache-log4j-extras</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
             <version>2.1.1</version>
         </dependency>
-               <dependency>
-                       <groupId>postgresql</groupId>
-                       <artifactId>postgresql</artifactId>
-                       <version>9.1-901.jdbc4</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <version>${springframework.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.awaitility</groupId>
-                       <artifactId>awaitility</artifactId>
-                       <version>3.0.0</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.hsqldb</groupId>
-                       <artifactId>hsqldb</artifactId>
-                       <version>2.3.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       <version>1.18</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-core</artifactId>
-                       <version>1.18</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.websocket</groupId>
-                       <artifactId>javax.websocket-api</artifactId>
-                       <version>1.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.nsa</groupId>
-                       <artifactId>cambriaClient</artifactId>
-                       <version>0.0.1</version>
-                       <exclusions>
-                               <exclusion>
-                                       <artifactId>slf4j-log4j12</artifactId>
-                                       <groupId>org.slf4j</groupId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.aft</groupId>
-                       <artifactId>dme2</artifactId>
-                       <version>3.1.200-oss</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>io.springfox</groupId>
-                       <artifactId>springfox-swagger2</artifactId>
-                       <version>2.5.0</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.fasterxml.jackson.core</groupId>
-                                       <artifactId>jackson-annotations</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>io.springfox</groupId>
-                       <artifactId>springfox-swagger-ui</artifactId>
-                       <version>2.7.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineAPI</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.glassfish.tyrus</groupId>
-                                       <artifactId>tyrus-client</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.glassfish.tyrus</groupId>
-                                       <artifactId>tyrus-container-grizzly-client</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>javax.persistence</groupId>
-                                       <artifactId>persistence-api</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                                       <artifactId>dme2</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>9.1-901.jdbc4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
+            <version>1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.att.nsa</groupId>
+            <artifactId>cambriaClient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.att.aft</groupId>
+            <artifactId>dme2</artifactId>
+            <version>3.1.200-oss</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineAPI</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-container-grizzly-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
index d936fbe..2f8683c 100644 (file)
@@ -7,9 +7,9 @@
  * 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.
@@ -40,318 +40,360 @@ import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
-public class ServerContextImpl implements ServletContext{
-
-       @Override
-       public String getContextPath() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public ServletContext getContext(String uripath) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public int getMajorVersion() {
-               // TODO Auto-generated method stub
-               return 0;
-       }
-
-       @Override
-       public int getMinorVersion() {
-               // TODO Auto-generated method stub
-               return 0;
-       }
-
-       @Override
-       public int getEffectiveMajorVersion() {
-               // TODO Auto-generated method stub
-               return 0;
-       }
-
-       @Override
-       public int getEffectiveMinorVersion() {
-               // TODO Auto-generated method stub
-               return 0;
-       }
-
-       @Override
-       public String getMimeType(String file) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Set<String> getResourcePaths(String path) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public URL getResource(String path) throws MalformedURLException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public InputStream getResourceAsStream(String path) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public RequestDispatcher getRequestDispatcher(String path) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public RequestDispatcher getNamedDispatcher(String name) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Servlet getServlet(String name) throws ServletException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Enumeration<Servlet> getServlets() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Enumeration<String> getServletNames() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public void log(String msg) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public void log(Exception exception, String msg) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public void log(String message, Throwable throwable) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public String getRealPath(String path) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public String getServerInfo() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public String getInitParameter(String name) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Enumeration<String> getInitParameterNames() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public boolean setInitParameter(String name, String value) {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       @Override
-       public Object getAttribute(String name) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Enumeration<String> getAttributeNames() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public void setAttribute(String name, Object object) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public void removeAttribute(String name) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public String getServletContextName() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Dynamic addServlet(String servletName, String className) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Dynamic addServlet(String servletName, Servlet servlet) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public ServletRegistration getServletRegistration(String servletName) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public FilterRegistration getFilterRegistration(String filterName) {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public SessionCookieConfig getSessionCookieConfig() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public void addListener(String className) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public <T extends EventListener> void addListener(T t) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public void addListener(Class<? extends EventListener> listenerClass) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public JspConfigDescriptor getJspConfigDescriptor() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public ClassLoader getClassLoader() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public void declareRoles(String... roleNames) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       @Override
-       public String getVirtualServerName() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
+public class ServerContextImpl implements ServletContext {
+
+    @Override
+    public String getContextPath() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ServletContext getContext(String uripath) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public int getMajorVersion() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getMinorVersion() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public String getMimeType(String file) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Set<String> getResourcePaths(String path) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public URL getResource(String path) throws MalformedURLException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String path) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String path) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getNamedDispatcher(String name) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Servlet getServlet(String name) throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration<Servlet> getServlets() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getServletNames() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void log(String msg) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void log(Exception exception, String msg) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void log(String message, Throwable throwable) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public String getRealPath(String path) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getServerInfo() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getInitParameter(String name) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean setInitParameter(String name, String value) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public Object getAttribute(String name) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String name, Object object) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void removeAttribute(String name) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public String getServletContextName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, String className) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Servlet servlet) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String servletName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(
+            String filterName, Class<? extends Filter> filterClass) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void addListener(String className) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void declareRoles(String... roleNames) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public String getVirtualServerName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Dynamic addJspFile(String arg0, String arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getRequestCharacterEncoding() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getResponseCharacterEncoding() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public int getSessionTimeout() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public void setRequestCharacterEncoding(String arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void setResponseCharacterEncoding(String arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void setSessionTimeout(int arg0) {
+        // TODO Auto-generated method stub
+
+    }
 }
index a616edd..ef42d1d 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>
-       <artifactId>ONAP-PDP</artifactId>
-       <description>ONAP-PDP</description>
-       <packaging>jar</packaging>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <version>${project.version}</version>
-                       <artifactId>ONAP-REST</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>${httpclient.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpcore</artifactId>
-                       <version>4.4.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.10</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.2</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.servlet</groupId>
-                                       <artifactId>servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>19.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml-pdp</artifactId>
-                       <version>1.0.1</version>
-                       <exclusions>
-                               <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We 
-                                       are not using that PIP and can safely exclude this jar to resolve CLM issue. -->
-                               <exclusion>
-                                       <groupId>commons-collections</groupId>
-                                       <artifactId>commons-collections</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>policy-endpoints</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-checkstyle-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>onap-java-style</id>
-                                               <goals>
-                                                       <goal>check</goal>
-                                               </goals>
-                                               <phase>process-sources</phase>
-                                               <configuration>
-                                                       <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-                                                               with minor changes -->
-                                                       <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-                                                       <!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-                                                               sources directory -->
-                                                       <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                                                       <includeResources>true</includeResources>
-                                                       <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                                                       <includeTestResources>true</includeTestResources>
-                                                       <excludes>
-                                                       </excludes>
-                                                       <consoleOutput>true</consoleOutput>
-                                                       <failOnViolation>true</failOnViolation>
-                                                       <violationSeverity>warning</violationSeverity>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.onap.oparent</groupId>
-                                               <artifactId>checkstyle</artifactId>
-                                               <version>0.1.1</version>
-                                               <scope>compile</scope>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
-               </plugins>
-       </build>
+<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>
+    <artifactId>ONAP-PDP</artifactId>
+    <description>ONAP-PDP</description>
+    <packaging>jar</packaging>
+    <parent>
+        <groupId>org.onap.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <version>${project.version}</version>
+            <artifactId>ONAP-REST</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.att.research.xacml</groupId>
+            <artifactId>xacml-pdp</artifactId>
+            <version>1.0.1</version>
+            <exclusions>
+                <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We 
+                    are not using that PIP and can safely exclude this jar to resolve CLM issue. -->
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>onap-java-style</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
+                                with minor changes -->
+                            <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                            <!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
+                                sources directory -->
+                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                            <includeResources>true</includeResources>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            <includeTestResources>true</includeTestResources>
+                            <excludes>
+                            </excludes>
+                            <consoleOutput>true</consoleOutput>
+                            <failOnViolation>true</failOnViolation>
+                            <violationSeverity>warning</violationSeverity>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.onap.oparent</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>${oparent.version}</version>
+                        <scope>compile</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index 656d1ab..be5fe6e 100644 (file)
   -->
 <!-- Apache Maven 2 POM generated by Apache Ivy http://ant.apache.org/ivy/ 
        Apache Ivy version: 2.0.0-beta1 20071206070608 -->
-<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.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>ONAP-REST</artifactId>
-       <description>ONAP REST</description>
-       <packaging>jar</packaging>
-       <dependencies>
-           <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
-               <dependency>
-                   <groupId>org.yaml</groupId>
-                   <artifactId>snakeyaml</artifactId>
-                   <version>1.16</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <version>${project.version}</version>
-                       <artifactId>ONAP-XACML</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineAPI</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.glassfish.tyrus</groupId>
-                                       <artifactId>tyrus-client</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.glassfish.tyrus</groupId>
-                                       <artifactId>tyrus-container-grizzly-client</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>javax.persistence</groupId>
-                                       <artifactId>persistence-api</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                                       <artifactId>dme2</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.servlet</groupId>
-                                       <artifactId>servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>14.0.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.8.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.emf</groupId>
-                       <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-                       <version>2.11.0-v20150123-0347</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.emf</groupId>
-                       <artifactId>org.eclipse.emf.ecore</artifactId>
-                       <version>2.11.0-v20150123-0347</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.emf</groupId>
-                       <artifactId>org.eclipse.emf.common</artifactId>
-                       <version>2.11.0-v20150123-0347</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>[20090211,)</version>
-               </dependency>
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-tx</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context-support</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-orm</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-core</artifactId>
-                       <version>${hibernate.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-validator</artifactId>
-                       <version>5.4.2.Final</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-dbcp</artifactId>
-                       <version>8.5.9</version>
-               </dependency>           
-       </dependencies>
-       <properties>
-               <springframework.version>4.3.15.RELEASE</springframework.version>
-               <hibernate.version>4.3.10.Final</hibernate.version>
-       </properties>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>ONAP-REST</artifactId>
+    <description>ONAP REST</description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <springframework.version>4.3.15.RELEASE</springframework.version>
+        <hibernate.version>4.3.10.Final</hibernate.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.16</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <version>${project.version}</version>
+            <artifactId>ONAP-XACML</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineAPI</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-container-grizzly-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
+            <version>2.11.0-v20150123-0347</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>org.eclipse.emf.ecore</artifactId>
+            <version>2.11.0-v20150123-0347</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.emf</groupId>
+            <artifactId>org.eclipse.emf.common</artifactId>
+            <version>2.11.0-v20150123-0347</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>[20090211,)</version>
+        </dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.2.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>8.5.9</version>
+        </dependency>
+    </dependencies>
 </project>
index ec9bfc2..f08b76d 100644 (file)
   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.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>ONAP-SDK-APP</artifactId>
-       <packaging>war</packaging>
-       <properties>
-               <encoding>UTF-8</encoding>
-               <epsdk.version>2.3.1</epsdk.version>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
-               <hibernate.version>4.3.11.Final</hibernate.version>
-               <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
-               <skipassembly>true</skipassembly>
-               <!-- Tests usually require some setup that maven cannot do, so skip. -->
-               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
-               <!-- Version number gets stored only here -->
-               <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
-               <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
-       </properties>
-       <profiles>
-               <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
-               <profile>
-                       <id>doclint-java8-disable</id>
-                       <activation>
-                               <jdk>[1.8,)</jdk>
-                       </activation>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-javadoc-plugin</artifactId>
-                                               <version>2.10.4</version>
-                                               <configuration>
-                                                       <additionalparam>-Xdoclint:none</additionalparam>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>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>
-                               <configuration>
-                                       <skipTests>${skiptests}</skipTests>
-                                       <includes>
-                                               <include>**/Test*.java</include>
-                                               <include>**/*Test.java</include>
-                                               <include>**/*TestCase.java</include>
-                                       </includes>
-                                       <additionalClasspathElements>
-                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
-                                       </additionalClasspathElements>
-                                       <systemPropertyVariables>
-                                               <container.classpath>classpath:</container.classpath>
-                                       </systemPropertyVariables>
-                               </configuration>
-                       </plugin>
-                       <!-- add version number to manifest -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.1</version>
-                               <configuration>
-                                       <attachClasses>true</attachClasses>
-                                       <archive>
-                                               <manifest>
-                                                       <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                               </manifest>
-                                               <manifestEntries>
-                                                       <Build-Number>${project.version}</Build-Number>
-                                                       <Build-Time>${maven.build.timestamp}</Build-Time>
-                                               </manifestEntries>
-                                       </archive>
-                                       <overlays>
-                                               <overlay>
-                                                       <groupId>org.onap.portal.sdk</groupId>
-                                                       <artifactId>epsdk-app-overlay</artifactId>
-                                                       <excludes>
-                                                               <exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
-                                                       </excludes>
-                                               </overlay>
-                                               <overlay>
-                                                       <groupId>org.onap.policy.engine</groupId>
-                                                       <artifactId>POLICY-SDK-APP</artifactId>
-                                               </overlay>
-                                       </overlays>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>3.0.0</version>
-                               <configuration>
-                                       <skipAssembly>${skipassembly}</skipAssembly>
-                                       <descriptors>
-                                               <descriptor>${basedir}/distribution.xml</descriptor>
-                                       </descriptors>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>make-assembly</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <!-- parent specifies the<version>2.8</version> -->
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>io.fabric8</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.22.0</version>
-                               <configuration>
-                                       <verbose>true</verbose>
-                                       <images>
-                                               <image>
-                                                       <name>onap/portal-sdk:${project.version}</name>
-                                                       <build>
-                                                               <from>frolvlad/alpine-oraclejdk8:slim</from>
-                                                               <assembly>
-                                                                       <descriptorRef>artifact</descriptorRef>
-                                                               </assembly>
-                                                               <runCmds>
-                                                                       <!-- must be all on one line; use CDATA to turn off the Eclipse 
-                                                                               formatter -->
-                                                                       <run><![CDATA[wget -q ${tomcat.download.path}/${tomcat.download.name}.tar.gz]]></run>
-                                                                       <run>tar -xzf ${tomcat.download.name}.tar.gz</run>
-                                                                       <run>rm -f ${tomcat.download.name}.tar.gz</run>
-                                                                       <run>rm -fr ${tomcat.download.name}/webapps/[a-z]*</run>
-                                                                       <run>mkdir -p /opt</run>
-                                                                       <run>mv ${tomcat.download.name} /opt</run>
-                                                                       <run><![CDATA[mv /maven/*.war /opt/${tomcat.download.name}/webapps/ONAPPORTALSDK.war]]></run>
-                                                               </runCmds>
-                                                               <cmd>
-                                                                       <shell>/opt/${tomcat.download.name}/bin/catalina.sh run</shell>
-                                                               </cmd>
-                                                       </build>
-                                               </image>
-                                       </images>
-                               </configuration>
-                       </plugin>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>ONAP-SDK-APP</artifactId>
+    <packaging>war</packaging>
+    <properties>
+        <encoding>UTF-8</encoding>
+        <epsdk.version>2.3.1</epsdk.version>
+        <springframework.version>4.2.0.RELEASE</springframework.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
+        <skipassembly>true</skipassembly>
+        <!-- Tests usually require some setup that maven cannot do, so skip. -->
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
+        <!-- Version number gets stored only here -->
+        <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
+        <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
+    </properties>
+    <profiles>
+        <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <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-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skiptests}</skipTests>
+                    <includes>
+                        <include>**/Test*.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <systemPropertyVariables>
+                        <container.classpath>classpath:</container.classpath>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <!-- add version number to manifest -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Build-Number>${project.version}</Build-Number>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                        </manifestEntries>
+                    </archive>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.onap.portal.sdk</groupId>
+                            <artifactId>epsdk-app-overlay</artifactId>
+                            <excludes>
+                                <exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
+                            </excludes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.onap.policy.engine</groupId>
+                            <artifactId>POLICY-SDK-APP</artifactId>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <skipAssembly>${skipassembly}</skipAssembly>
+                    <descriptors>
+                        <descriptor>${basedir}/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <!-- parent specifies the<version>2.8</version> -->
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.22.0</version>
+                <configuration>
+                    <verbose>true</verbose>
+                    <images>
+                        <image>
+                            <name>onap/portal-sdk:${project.version}</name>
+                            <build>
+                                <from>frolvlad/alpine-oraclejdk8:slim</from>
+                                <assembly>
+                                    <descriptorRef>artifact</descriptorRef>
+                                </assembly>
+                                <runCmds>
+                                    <!-- must be all on one line; use CDATA to turn off the Eclipse 
+                                        formatter -->
+                                    <run><![CDATA[wget -q ${tomcat.download.path}/${tomcat.download.name}.tar.gz]]></run>
+                                    <run>tar -xzf
+                                        ${tomcat.download.name}.tar.gz</run>
+                                    <run>rm -f
+                                        ${tomcat.download.name}.tar.gz</run>
+                                    <run>rm -fr
+                                        ${tomcat.download.name}/webapps/[a-z]*</run>
+                                    <run>mkdir -p /opt</run>
+                                    <run>mv ${tomcat.download.name} /opt</run>
+                                    <run><![CDATA[mv /maven/*.war /opt/${tomcat.download.name}/webapps/ONAPPORTALSDK.war]]></run>
+                                </runCmds>
+                                <cmd>
+                                    <shell>/opt/${tomcat.download.name}/bin/catalina.sh
+                                        run</shell>
+                                </cmd>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>
 
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Policy overlay war -->
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>POLICY-SDK-APP</artifactId>
-                       <version>${project.version}</version>
-                       <type>war</type>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.onap.portal.sdk</groupId>
-                                       <artifactId>epsdk-core</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>POLICY-SDK-APP</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-                       <classifier>classes</classifier>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.onap.portal.sdk</groupId>
-                                       <artifactId>epsdk-core</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineUtils</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                                       <artifactId>dme2</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <!-- SDK overlay war -->
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-app-overlay</artifactId>
-                       <version>${epsdk.version}</version>
-                       <type>war</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-app-common</artifactId>
-                       <version>${epsdk.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <!-- SDK components -->
-               <!--
-               CLM security fix - force use of commons-collections 3.2.2.
-               Remove this if a new version of epsdk-core is upgraded
-               to not use esapi (and then subsequently commons-collections v3.2
-                -->
-               <dependency>
-                   <groupId>commons-collections</groupId>
-                   <artifactId>commons-collections</artifactId>
-                   <version>3.2.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-core</artifactId>
-                       <version>${epsdk.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>mysql</groupId>
-                                       <artifactId>mysql-connector-java</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>commons-collections</groupId>
-                                       <artifactId>commons-collections</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.thoughtworks.xstream</groupId>
-                                       <artifactId>xstream</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-analytics</artifactId>
-                       <version>${epsdk.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.oracle</groupId>
-                                       <artifactId>ojdbc6</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-workflow</artifactId>
-                       <version>${epsdk.version}</version>
-               </dependency>
-               <!-- bridge to implement commons-logging using slf4j -->
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-                       <version>1.7.12</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.mchange</groupId>
-                       <artifactId>c3p0</artifactId>
-                       <version>0.9.5.2</version>
-               </dependency>
-               <!-- Maria DB -->
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.2.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-dbcp</groupId>
-                       <artifactId>commons-dbcp</artifactId>
-                       <version>1.4</version>
-               </dependency>
-               <!-- Quartz -->
-               <dependency>
-                       <groupId>org.quartz-scheduler</groupId>
-                       <artifactId>quartz</artifactId>
-                       <version>2.2.1</version>
-                       <exclusions>
-                               <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
-                               <exclusion>
-                                       <groupId>c3p0</groupId>
-                                       <artifactId>c3p0</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-               </dependency>
-       </dependencies>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- Policy overlay war -->
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>POLICY-SDK-APP</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.onap.portal.sdk</groupId>
+                    <artifactId>epsdk-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>POLICY-SDK-APP</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <classifier>classes</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.onap.portal.sdk</groupId>
+                    <artifactId>epsdk-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineUtils</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- SDK overlay war -->
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-overlay</artifactId>
+            <version>${epsdk.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-app-common</artifactId>
+            <version>${epsdk.version}</version>
+            <type>jar</type>
+        </dependency>
+        <!-- SDK components -->
+        <!--
+        CLM security fix - force use of commons-collections 3.2.2.
+        Remove this if a new version of epsdk-core is upgraded
+        to not use esapi (and then subsequently commons-collections v3.2
+        -->
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-core</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-analytics</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle</groupId>
+                    <artifactId>ojdbc6</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-workflow</artifactId>
+            <version>${epsdk.version}</version>
+        </dependency>
+        <!-- bridge to implement commons-logging using slf4j -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.12</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.5.2</version>
+        </dependency>
+        <!-- Maria DB -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- Quartz -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.2.1</version>
+            <exclusions>
+                <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+                <exclusion>
+                    <groupId>c3p0</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+    </dependencies>
 </project>
index bc3281f..ecaaab9 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>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>ONAP-XACML</artifactId>
-       <packaging>jar</packaging>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <version>${project.version}</version>
-                       <artifactId>PolicyEngineUtils</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>commons-cli</groupId>
-                       <artifactId>commons-cli</artifactId>
-                       <version>1.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpcore</artifactId>
-                       <version>4.4.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml</artifactId>
-                       <version>1.0.1</version>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>ONAP-XACML</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <version>${project.version}</version>
+            <artifactId>PolicyEngineUtils</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.att.research.xacml</groupId>
+            <artifactId>xacml</artifactId>
+            <version>1.0.1</version>
             <exclusions>
             <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We
-            are not using that PIP and can safely exclude this jar to resolve CLM issue.
-             -->
-              <exclusion>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-              </exclusion>
+                are not using that PIP and can safely exclude this jar to resolve CLM issue.
+                -->
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
             </exclusions>
-               </dependency>
-       </dependencies>
+        </dependency>
+    </dependencies>
 </project>
index 1160a8f..9252114 100644 (file)
   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.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>POLICY-SDK-APP</artifactId>
-       <packaging>war</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.1</version>
-                               <configuration>
-                                       <attachClasses>true</attachClasses>
-                                       <!-- <warSourceDirectory>WebContent</warSourceDirectory> -->
-                                       <failOnMissingWebXml>false</failOnMissingWebXml>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>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>
-                               <configuration>
-                                       <skipTests>${skiptests}</skipTests>
-                                       <includes>
-                                               <include>**/Test*.java</include>
-                                               <include>**/*Test.java</include>
-                                               <include>**/*TestCase.java</include>
-                                       </includes>
-                                       <additionalClasspathElements>
-                                               <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
-                                       </additionalClasspathElements>
-                                       <systemPropertyVariables>
-                                               <container.classpath>classpath:</container.classpath>
-                                       </systemPropertyVariables>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <properties>
-               <encoding>UTF-8</encoding>
-               <epsdk.version>2.3.1</epsdk.version>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
-               <hibernate.version>4.3.11.Final</hibernate.version>
-               <logback.version>1.2.3</logback.version>
-               <skipassembly>true</skipassembly>
-               <skiptests>false</skiptests>
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>               
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.portal.sdk</groupId>
-                       <artifactId>epsdk-core</artifactId>
-                       <version>${epsdk.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>mysql</groupId>
-                               <artifactId>mysql-connector-java</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.thoughtworks.xstream</groupId>
-                                       <artifactId>xstream</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-       <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>${springframework.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>commons-logging</groupId>
-                                       <artifactId>commons-logging</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-tx</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context-support</artifactId>
-                       <version>${springframework.version}</version>
-               </dependency>
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-core</artifactId>
-                       <version>${hibernate.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-validator</artifactId>
-                       <version>5.4.2.Final</version>
-               </dependency>
-               <!-- Javax Mail -->
-               <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>mail</artifactId>
-                       <version>1.4.7</version>
-               </dependency>
-                       <!-- Mapper -->
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jaxb-annotations</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jsonSchema</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>
-                       <artifactId>jackson-dataformat-xml</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.8.0</version>
-               </dependency>
-               <!-- Elastic Search -->
-               <dependency>
-                       <groupId>org.elasticsearch</groupId>
-                       <artifactId>elasticsearch</artifactId>
-                       <version>6.2.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20160212</version>
-               </dependency>
-               <dependency>
-                       <groupId>io.searchbox</groupId>
-                       <artifactId>jest</artifactId>
-                       <version>2.0.0</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>commons-logging</groupId>
-                                       <artifactId>commons-logging</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.apache.httpcomponents</groupId>
-                                       <artifactId>httpclient</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>ONAP-PDP</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>commons-logging</groupId>
-                                       <artifactId>commons-logging</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.apache.httpcomponents</groupId>
-                                       <artifactId>httpcore</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                               <artifactId>dme2</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>commons-fileupload</groupId>
-                       <artifactId>commons-fileupload</artifactId>
-                       <version>${commons.fileupload.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-compress</artifactId>
-                       <version>1.8</version>
-               </dependency>
-               <dependency>
-                       <groupId>args4j</groupId>
-                       <artifactId>args4j</artifactId>
-                       <version>2.32</version>
-               </dependency>
-               <dependency>
-               <groupId>org.apache.poi</groupId>
-               <artifactId>poi</artifactId>
-               <version>3.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.poi</groupId>
-                       <artifactId>poi-ooxml</artifactId>
-                       <version>3.17</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/com.esotericsoftware.yamlbeans/yamlbeans -->
-               <dependency>
-                   <groupId>com.esotericsoftware.yamlbeans</groupId>
-                   <artifactId>yamlbeans</artifactId>
-                   <version>1.08</version>
-               </dependency>           
-               <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
-               <dependency>
-                   <groupId>org.yaml</groupId>
-                   <artifactId>snakeyaml</artifactId>
-                   <version>1.16</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-jdbc</artifactId>
-                       <version>8.0.24</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat</groupId>
-                       <artifactId>tomcat-dbcp</artifactId>
-                       <version>8.5.9</version>
-               </dependency>
-       </dependencies>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>POLICY-SDK-APP</artifactId>
+    <packaging>war</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                    <!-- <warSourceDirectory>WebContent</warSourceDirectory> -->
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <plugin>
+                <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-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>${skiptests}</skipTests>
+                    <includes>
+                        <include>**/Test*.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <systemPropertyVariables>
+                        <container.classpath>classpath:</container.classpath>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <encoding>UTF-8</encoding>
+        <epsdk.version>2.3.1</epsdk.version>
+        <springframework.version>4.2.0.RELEASE</springframework.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <logback.version>1.2.3</logback.version>
+        <skipassembly>true</skipassembly>
+        <skiptests>false</skiptests>
+        <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.portal.sdk</groupId>
+            <artifactId>epsdk-core</artifactId>
+            <version>${epsdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>5.4.2.Final</version>
+        </dependency>
+        <!-- Javax Mail -->
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+        <!-- Mapper -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <!-- Elastic Search -->
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>6.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160212</version>
+        </dependency>
+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>ONAP-PDP</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.att.aft</groupId>
+                    <artifactId>dme2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.8</version>
+        </dependency>
+        <dependency>
+            <groupId>args4j</groupId>
+            <artifactId>args4j</artifactId>
+            <version>2.32</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.esotericsoftware.yamlbeans/yamlbeans -->
+        <dependency>
+            <groupId>com.esotericsoftware.yamlbeans</groupId>
+            <artifactId>yamlbeans</artifactId>
+            <version>1.08</version>
+        </dependency>          
+        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>8.0.24</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>8.5.9</version>
+        </dependency>
+    </dependencies>
 </project>
index c27a4be..0a7c8fc 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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>PolicyEngineAPI</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.glassfish</groupId>
-                       <artifactId>javax.json</artifactId>
-                       <version>1.0.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>${httpclient.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>14.0.1</version>
-               </dependency>
-               <dependency>
-               <groupId>commons-fileupload</groupId>
-               <artifactId>commons-fileupload</artifactId>
-               <version>${commons.fileupload.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.websocket</groupId>
-                       <artifactId>javax.websocket-api</artifactId>
-                       <version>1.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.java-websocket</groupId>
-                       <artifactId>Java-WebSocket</artifactId>
-                       <version>1.3.8</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>4.3.15.RELEASE</version>
-               </dependency>
-               <dependency>
-                   <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.8.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <version>1.2.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.nsa</groupId>
-                       <artifactId>cambriaClient</artifactId>
-                       <version>0.0.1</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.slf4j</groupId>
-                                       <artifactId>slf4j-log4j12</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>ONAP-XACML</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.2</version>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <!-- Dependency version for Clients who need it -->
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.2</version>
-                               <configuration>
-                                       <descriptorRefs>
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>
-                                       </descriptorRefs>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>make-assembly</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>PolicyEngineAPI</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.java-websocket</groupId>
+            <artifactId>Java-WebSocket</artifactId>
+            <version>1.3.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.3.15.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.att.nsa</groupId>
+            <artifactId>cambriaClient</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>ONAP-XACML</artifactId>
+            <version>${project.version}</version>
+        </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>
+                <!-- Dependency version for Clients who need it -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
index f13923f..1027236 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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>PolicyEngineClient</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.engine</groupId>
-                       <artifactId>PolicyEngineAPI</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.googlecode.json-simple</groupId>
-                       <artifactId>json-simple</artifactId>
-                       <version>1.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>${httpclient.version}</version>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.2</version>
-                               <configuration>
-                                       <source>1.8</source>
-                                       <target>1.8</target>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>PolicyEngineClient</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.engine</groupId>
+            <artifactId>PolicyEngineAPI</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</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>
+        </plugins>
+    </build>
 </project>
index c62c5e7..f263bf9 100644 (file)
   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.policy.engine</groupId>
-               <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>PolicyEngineUtils</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>integrity-monitor</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>integrity-audit</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>ONAP-Logging</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>eclipselink</artifactId>
-                       <version>2.6.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>2.1.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.github.fge</groupId>
-                       <artifactId>json-patch</artifactId>
-                       <version>1.9</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.maven</groupId>
-                       <artifactId>maven-model</artifactId>
-                       <version>3.5.3</version>
-               </dependency>
-               <!--
-               CLM security fix - force use of xstream
-               Remove this if a new version of drools-verifier is upgraded
-               that upgrades to xstream.
-                -->
-               <dependency>
-                   <groupId>com.thoughtworks.xstream</groupId>
-                   <artifactId>xstream</artifactId>
-                   <version>1.4.10</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-verifier</artifactId>
-                       <version>6.5.0.Final</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.google.guava</groupId>
-                                       <artifactId>guava</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>com.lowagie</groupId>
-                               <artifactId>itext</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                   <groupId>com.thoughtworks.xstream</groupId>
-                                   <artifactId>xstream</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.aaf.authz</groupId>
-                       <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>2.1.0</version>
-               </dependency>
-               <dependency>
-                   <groupId>com.google.code.gson</groupId>
+<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.policy.engine</groupId>
+        <artifactId>PolicyEngineSuite</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>PolicyEngineUtils</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>integrity-monitor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>integrity-audit</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>ONAP-Logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.fge</groupId>
+            <artifactId>json-patch</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>3.5.3</version>
+        </dependency>
+        <!--
+            CLM security fix - force use of xstream
+            Remove this if a new version of drools-verifier is upgraded
+            that upgrades to xstream.
+        -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-verifier</artifactId>
+            <version>6.5.0.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.lowagie</groupId>
+                    <artifactId>itext</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-aaf</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.1</version>
         </dependency>
-               <dependency>
-                       <groupId>com.att.aft</groupId>
-                       <artifactId>dme2</artifactId>
-                       <version>3.1.200</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                       <artifactId>dmaapClient</artifactId>
-                       <version>${dmaap.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.slf4j</groupId>
-                                       <artifactId>slf4j-log4j12</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>com.att.aft</groupId>
+            <artifactId>dme2</artifactId>
+            <version>3.1.200</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+            <artifactId>dmaapClient</artifactId>
+            <version>${dmaap.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index b31f725..e8016a3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
   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.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
-               <relativePath/>
-       </parent>
-       <groupId>org.onap.policy.engine</groupId>
-       <artifactId>PolicyEngineSuite</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
-       <name>policy-engine</name>
-       <description>The ONAP Policy Engine main pom</description>
-       <properties>
-               <!-- Project common build settings -->
-               <project.source.version>1.8</project.source.version>
-               <project.target.version>1.8</project.target.version>
-               <project.encoding>UTF-8</project.encoding>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <!-- Project path properties -->
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-               <releases.path>content/repositories/releases/</releases.path>
-               <snapshots.path>content/repositories/snapshots/</snapshots.path>
-               <staging.path>content/repositories/staging/</staging.path>
+<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.policy.parent</groupId>
+        <artifactId>integration</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <groupId>org.onap.policy.engine</groupId>
+    <artifactId>PolicyEngineSuite</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>policy-engine</name>
+    <description>The ONAP Policy Engine main pom</description>
+    <properties>
+        <!-- Project common build settings -->
+        <project.source.version>1.8</project.source.version>
+        <project.target.version>1.8</project.target.version>
+        <project.encoding>UTF-8</project.encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Project path properties -->
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+        <releases.path>content/repositories/releases/</releases.path>
+        <snapshots.path>content/repositories/snapshots/</snapshots.path>
+        <staging.path>content/repositories/staging/</staging.path>
 
-               <!-- sonar/jacoco overrides -->
-               <!-- Overriding oparent default sonar/jacoco settings Combine all our reports 
-                       into one file shared across sub-modules -->
-               <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-               <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-               <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <!-- sonar/jacoco overrides -->
+        <!-- Overriding oparent default sonar/jacoco settings Combine all our reports 
+            into one file shared across sub-modules -->
+        <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+        <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
-               <!-- Shared between policy/* project repositories - same version -->
-               <h2.version>1.4.186</h2.version>
+        <!-- Shared between policy/* project repositories - same version -->
+        <h2.version>1.4.186</h2.version>
 
-               <!-- Shared between policy/* project repositories - different version -->
+        <!-- Shared between policy/* project repositories - different version -->
 
-               <!-- Project common dependency versions -->
-               <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
-               <dmaap.version>1.1.3</dmaap.version>
-               <httpclient.version>4.5.5</httpclient.version>
-               <jackson.version>2.9.4</jackson.version>
-               <commons.fileupload.version>1.3.3</commons.fileupload.version>
-       </properties>
-       <modules>
-               <module>PolicyEngineUtils</module>
-               <module>ONAP-XACML</module>
-               <module>ONAP-REST</module>
-               <module>PolicyEngineAPI</module>
-               <module>ONAP-PDP</module>
-               <module>ONAP-PDP-REST</module>
-               <module>ONAP-PAP-REST</module>
-               <module>LogParser</module>
-               <module>PolicyEngineClient</module>
-               <module>BRMSGateway</module>
-               <module>POLICY-SDK-APP</module>
-               <module>ONAP-SDK-APP</module>
-               <module>packages</module>
-       </modules>
-       <distributionManagement>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>ONAP Release Repository</name>
-                       <url>${nexusproxy}/${releases.path}</url>
-               </repository>
-               <snapshotRepository>
-                       <id>ecomp-snapshots</id>
-                       <name>ONAP Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshots.path}</url>
-               </snapshotRepository>
-               <site>
-                       <id>ecomp-site</id>
-                       <url>dav:${nexusproxy}${sitePath}</url>
-               </site>
-       </distributionManagement>
-       <reporting>
-         <plugins>
-           <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-javadoc-plugin</artifactId>
-             <version>2.10.4</version>
-             <configuration>
-               <failOnError>false</failOnError>
-               <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-               <docletArtifact>
-                 <groupId>org.umlgraph</groupId>
-                 <artifactId>umlgraph</artifactId>
-                 <version>5.6</version>
-               </docletArtifact>
-               <additionalparam>-views</additionalparam>
-               <useStandardDocletOptions>true</useStandardDocletOptions>
-             </configuration>
-           </plugin>
-         </plugins>
-       </reporting>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>com.h2database</groupId>
-                               <artifactId>h2</artifactId>
-                               <version>${h2.version}</version>
-                               <scope>test</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-               </dependency>
-               <dependency>
-                       <!-- org.w3c.dom dependencies -->
-                       <groupId>xml-apis</groupId>
-                       <artifactId>xml-apis</artifactId>
-                       <version>1.3.03</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-               <dependency>
-                   <groupId>com.fasterxml.jackson.core</groupId>
-                   <artifactId>jackson-databind</artifactId>
-                       <version>${jackson.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-mock</artifactId>
-                       <version>2.0.8</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.mockrunner</groupId>
-                       <artifactId>mockrunner</artifactId>
-                       <version>0.3.1</version>
-                       <scope>test</scope>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
-               <dependency>
-               <groupId>org.powermock</groupId>
-               <artifactId>powermock-api-mockito</artifactId>
-               <version>1.7.3</version>
-               <scope>test</scope>
-               </dependency>
-               <dependency>
+        <!-- Project common dependency versions -->
+        <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
+        <dmaap.version>1.1.3</dmaap.version>
+        <httpclient.version>4.5.5</httpclient.version>
+        <jackson.version>2.9.4</jackson.version>
+        <commons.fileupload.version>1.3.3</commons.fileupload.version>
+    </properties>
+    <modules>
+        <module>PolicyEngineUtils</module>
+        <module>ONAP-XACML</module>
+        <module>ONAP-REST</module>
+        <module>PolicyEngineAPI</module>
+        <module>ONAP-PDP</module>
+        <module>ONAP-PDP-REST</module>
+        <module>ONAP-PAP-REST</module>
+        <module>LogParser</module>
+        <module>PolicyEngineClient</module>
+        <module>BRMSGateway</module>
+        <module>POLICY-SDK-APP</module>
+        <module>ONAP-SDK-APP</module>
+        <module>packages</module>
+    </modules>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ONAP Release Repository</name>
+            <url>${nexusproxy}/${releases.path}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ONAP Snapshot Repository</name>
+            <url>${nexusproxy}/${snapshots.path}</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-site</id>
+            <url>dav:${nexusproxy}${sitePath}</url>
+        </site>
+    </distributionManagement>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${h2.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- org.w3c.dom dependencies -->
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.03</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mockrunner</groupId>
+            <artifactId>mockrunner</artifactId>
+            <version>0.3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.7.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
             <version>1.7.3</version>
             <scope>test</scope>
         </dependency>
-               <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
-               <dependency>
-                   <groupId>org.mockito</groupId>
-                   <artifactId>mockito-all</artifactId>
-                   <version>1.10.19</version>
-                   <scope>test</scope>
-               </dependency>
-               <dependency>
-                   <groupId>org.easymock</groupId>
-                   <artifactId>easymock</artifactId>
-                   <version>3.1</version>
-                   <scope>test</scope>
-               </dependency>   
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
-                                                       <append>true</append>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>post-unit-test</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>report</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip />
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-clean-plugin</artifactId>
-                               <version>2.4.1</version>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.0</version>
-                               <configuration>
-                                       <encoding>${project.encoding}</encoding>
-                                       <source>${project.source.version}</source>
-                                       <target>${project.target.version}</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <configuration>
-                                       <encoding>${project.encoding}</encoding>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.3</version>
-                               <configuration>
-                                       <failOnMissingWebXml>false</failOnMissingWebXml>
-                               </configuration>
-                       </plugin>
-                       <!-- The Jetty plugin allows us to easily test the development build by
-                               running jetty:run on the command line. -->
-                       <plugin>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-maven-plugin</artifactId>
-                               <version>${jetty.plugin.version}</version>
-                               <configuration>
-                                       <scanIntervalSeconds>2</scanIntervalSeconds>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>com.fortify.ps.maven.plugin</groupId>
-                               <artifactId>sca-maven-plugin</artifactId>
-                               <version>4.20</version>
-                       </plugin>
-                       <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-site-plugin</artifactId>
-                         <dependencies>
-                           <dependency>
-                             <groupId>org.apache.maven.wagon</groupId>
-                             <artifactId>wagon-webdav-jackrabbit</artifactId>
-                             <version>2.10</version>
-                           </dependency>
-                         </dependencies>
-                       </plugin>
-               </plugins>
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${sonar.jacoco.reportPath}</destFile>
+                            <append>true</append>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <nexusUrl>${nexusproxy}</nexusUrl>
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>
+                    <serverId>ecomp-staging</serverId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip />
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>${project.encoding}</encoding>
+                    <source>${project.source.version}</source>
+                    <target>${project.target.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>${project.encoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+            <!-- The Jetty plugin allows us to easily test the development build by
+                running jetty:run on the command line. -->
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.plugin.version}</version>
+                <configuration>
+                    <scanIntervalSeconds>2</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.fortify.ps.maven.plugin</groupId>
+                <artifactId>sca-maven-plugin</artifactId>
+                <version>4.20</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.wagon</groupId>
+                        <artifactId>wagon-webdav-jackrabbit</artifactId>
+                        <version>2.10</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
-                               <plugin>
-                                       <groupId>org.jacoco</groupId>
-                                       <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>${jacoco.version}</version>
-                                       <configuration>
-                                               <!-- Note: This exclusion list should match <sonar.exclusions> property 
-                                                       above -->
-                                               <excludes>
-                                                       <exclude>**/gen/**</exclude>
-                                                       <exclude>**/generated-sources/**</exclude>
-                                                       <exclude>**/yang-gen/**</exclude>
-                                                       <exclude>**/pax/**</exclude>
-                                               </excludes>
-                                       </configuration>
-                                       <executions>
-                                               <!-- Prepares the property pointing to the JaCoCo runtime agent which 
-                                                       is passed as VM argument when Maven the Surefire plugin is executed. -->
-                                               <execution>
-                                                       <id>pre-unit-test</id>
-                                                       <goals>
-                                                               <goal>prepare-agent</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <destFile>${sonar.jacoco.reportPath}</destFile>
-                                                       </configuration>
-                                               </execution>
-                                               <!-- Ensures that the code coverage report for unit tests is created 
-                                                       after unit tests have been run. -->
-                                               <execution>
-                                                       <id>post-unit-test</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>report</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <dataFile>${sonar.jacoco.reportPath}</dataFile>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${jacoco.version}</version>
+                    <configuration>
+                         <!-- Note: This exclusion list should match <sonar.exclusions> property 
+                             above -->
+                        <excludes>
+                            <exclude>**/gen/**</exclude>
+                            <exclude>**/generated-sources/**</exclude>
+                            <exclude>**/yang-gen/**</exclude>
+                            <exclude>**/pax/**</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <!-- Prepares the property pointing to the JaCoCo runtime agent which 
+                             is passed as VM argument when Maven the Surefire plugin is executed. -->
+                        <execution>
+                            <id>pre-unit-test</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${sonar.jacoco.reportPath}</destFile>
+                            </configuration>
+                        </execution>
+                        <!-- Ensures that the code coverage report for unit tests is created 
+                            after unit tests have been run. -->
+                        <execution>
+                            <id>post-unit-test</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
                     <artifactId>lifecycle-mapping</artifactId>
                 </plugin>
             </plugins>
         </pluginManagement>
-       </build>
+    </build>
 </project>