Merge "Policy 1707 commit to LF"

diff --combined pom.xml
index 8e60d84,ec4d917..9addbf6
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
        <artifactId>PolicyEngineSuite</artifactId>
        <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 -      <name>ECOMP Policy Engine</name>
 +      <name>Policy Engine - Policy Engine Suite</name>
  
        <description>The ECOMP Policy Engine main pom</description>
  
@@@ -16,12 -16,10 +16,10 @@@
  
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  
-               <!-- from vaadin-test -->
                <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
                <project.source.version>1.8</project.source.version>
                <project.target.version>1.8</project.target.version>
                <project.encoding>UTF-8</project.encoding>
-               <!-- end -->
  
                <sonar.language>java</sonar.language>
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@@ -40,32 -38,26 +38,26 @@@
  
  
        <modules>
+               <module>PolicyEngineUtils</module>
                <module>ECOMP-XACML</module>
                <module>ECOMP-REST</module>
+               <module>PolicyEngineAPI</module>
                <module>ECOMP-PDP</module>
                <module>ECOMP-PDP-REST</module>
                <module>ECOMP-PAP-REST</module>
-               <module>ECOMP-TEST</module>
                <module>LogParser</module>
                <module>PolicyEngineClient</module>
-               <module>PolicyEngineUtils</module>
-               <module>PolicyEngineAPI</module>
-               <module>PyPDPServer</module>
                <module>BRMSGateway</module>
-               <module>ecomp-sdk-app</module>
+               <module>POLICY-SDK-APP</module>
+               <module>ECOMP-SDK-APP</module>
                <module>packages</module>
        </modules>
  
        <repositories>
                <repository>
-                       <id>central</id>
-                       <name>Maven 2 repository</name>
-                       <url>http://repo2.maven.org/maven2/</url>
-               </repository>
-               <repository>
-                       <id>soapUI</id>
-                       <url>http://www.soapui.org/repository/maven2/</url>
-                       <name>SoapUI plugin</name>
+                       <id>ecomp-snapshots</id>
+                       <name>OpenECOMP Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshots.path}</url>
                </repository>
                <repository>
                        <id>ecomp-releases</id>
@@@ -77,11 -69,6 +69,6 @@@
                        <name>OpenECOMP Staging Repository</name>
                        <url>${nexusproxy}/${staging.path}</url>
                </repository>
-               <repository>
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP Snapshot Repository</name>
-                       <url>${nexusproxy}/${snapshots.path}</url>
-               </repository>
        </repositories>
  
        <distributionManagement>
@@@ -127,8 -114,7 +114,7 @@@
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>javax.servlet-api</artifactId>
-                       <version>3.0.1</version>
-                       <!-- <scope>provided</scope> -->
+                       <version>3.1.0</version>
                </dependency>
                <dependency>
                        <!-- org.w3c.dom dependencies -->