[POLICY-152] engine integration with oparent

[policy/engine.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 63f5cc4..17faafc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,27 +2,29 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
 
-       <groupId>org.openecomp.policy.engine</groupId>
+       <parent>
+               <groupId>org.onap.oparent</groupId>
+               <artifactId>oparent</artifactId>
+               <version>1.0.0-SNAPSHOT</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.policy.engine</groupId>
        <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>
+       <description>The ONAP Policy Engine main pom</description>
 
        <properties>
-               <maven.compiler.source>1.8</maven.compiler.source>
-               <maven.compiler.target>1.8</maven.compiler.target>
-
                <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>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -32,65 +34,41 @@
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <common-modules.version>1.1.0-SNAPSHOT</common-modules.version>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <sitePath>/content/sites/site/org/onap/policy/${project.version}</sitePath>
+               <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>
        </properties>
 
 
        <modules>
-               <module>ECOMP-XACML</module>
-               <module>ECOMP-REST</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>ONAP-XACML</module>
+               <module>ONAP-REST</module>
+               <module>ONAP-ASDC</module>
+               <module>ONAP-ControlloopPolicy</module>
                <module>PolicyEngineAPI</module>
-               <module>PyPDPServer</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>ecomp-sdk-app</module>
+               <module>POLICY-SDK-APP</module>
+               <module>ONAP-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>
-               </repository>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>OpenECOMP Release Repository</name>
-                       <url>${nexusproxy}/content/repositories/releases/</url>
-               </repository>
-               <repository>
-                       <id>ecomp-staging</id>
-                       <name>OpenECOMP Staging Repository</name>
-                       <url>${nexusproxy}/content/repositories/staging/</url>
-               </repository>
-               <repository>
-                       <id>ecomp-snapshots</id>
-                       <name>OpenECOMP Snapshot Repository</name>
-                       <url>${nexusproxy}/content/repositories/snapshots/</url>
-               </repository>
-       </repositories>
-
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
-                       <name>OpenECOMP Release Repository</name>
-                       <url>${nexusproxy}/content/repositories/releases/</url>
+                       <name>ONAP Release Repository</name>
+                       <url>${nexusproxy}/${releases.path}</url>
                </repository>
                <snapshotRepository>
                        <id>ecomp-snapshots</id>
-                       <name>OpenECOMP Snapshot Repository</name>
-                       <url>${nexusproxy}/content/repositories/snapshots/</url>
+                       <name>ONAP Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshots.path}</url>
                </snapshotRepository>
                <site>
                        <id>ecomp-site</id>
@@ -124,8 +102,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 -->
@@ -160,9 +137,6 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
                                <version>2.19.1</version>
-                               <configuration>
-                                       <skipTests>true</skipTests>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -260,11 +234,11 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.5.201505241946</version>
+                               <version>0.7.6.201602180812</version>
                                <configuration>
                                        <dumpOnExit>true</dumpOnExit>
                                        <includes>
-                                               <include>org.openecomp.*</include>
+                                               <include>org.onap.*</include>
                                        </includes>
                                </configuration>
                                <executions>