X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=fb588560d178c62ed5055a2fcb4f1744007ea218;hb=5458362a7dd96b54916ea3a9a7d0a63a0122e4c2;hp=370160ce012338891e02d58e88e56917157f646f;hpb=3234eb071e48263e4be760115f9aaf5ba2e49d33;p=policy%2Fengine.git

diff --git a/pom.xml b/pom.xml
index 370160ce0..fb588560d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,26 +2,28 @@
 	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>
@@ -31,75 +33,76 @@
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<common-modules.version>1.1.0-SNAPSHOT</common-modules.version>
-		<nexusproxy>https://nexus.openecomp.org</nexusproxy>
+		<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>
 	</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>
+			<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>
+
 	<dependencies>
 
 		<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 -->
@@ -134,61 +137,12 @@
 				<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>
 				<artifactId>maven-clean-plugin</artifactId>
 				<version>2.4.1</version>
 			</plugin>
-			<!-- license plugin Run mvn clean before running from the command line 
-				mvn license:update-file-header -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>1.9</version>
-				<configuration>
-					<extraExtensions>
-						<!-- Used to add or change the header style <fileTypeYouAreMapping> 
-							fileTypeMappedInto </fileTypeYouAreMapping> -->
-						<drl>java</drl>
-						<ccf>properties</ccf>
-
-						<!-- Because the typical sql comment type confuses the update algorithm -->
-						<sql>java</sql>
-					</extraExtensions>
-					<licenseName>apache_v2</licenseName>
-
-					<inceptionYear>2017</inceptionYear>
-					<organizationName>AT&amp;T Intellectual Property. All rights
-						reserved.</organizationName>
-
-					<!-- Once you have established the tags and delimiter, they cannot be 
-						changed -->
-					<processStartTag>============LICENSE_START=======================================================</processStartTag>
-					<processEndTag>============LICENSE_END=========================================================</processEndTag>
-					<sectionDelimiter>================================================================================</sectionDelimiter>
-					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-					<canUpdateCopyright>true</canUpdateCopyright>
-					<canUpdateDescription>true</canUpdateDescription>
-					<canUpdateLicense>true</canUpdateLicense>
-					<emptyLineAfterHeader>true</emptyLineAfterHeader>
-					<roots>
-						<!-- Default is src, target/generated-sources, target/processed-sources -->
-
-						<!-- Everything except the files in the excludes section -->
-						<root>/</root>
-					</roots>
-					<excludes>
-						<!-- Files which are to be excluded. The pom.xml is excluded because 
-							the start/end tags and the delimiters are in the body of the file. This confuses 
-							the algorithm. So, this file must be manually updated with a license header. -->
-						<exclude>pom.xml</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -215,7 +169,7 @@
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
-			<!-- The Jetty plugin allows us to easily test the development build by 
+			<!-- The Jetty plugin allows us to easily test the development build by
 				running jetty:run on the command line. -->
 
 			<plugin>
@@ -234,11 +188,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>
@@ -253,6 +207,46 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-site-plugin</artifactId>
+			  <version>3.6</version>
+			  <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.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-checkstyle-plugin</artifactId>
+                                        <versionRange>2.17,)</versionRange>
+                                        <goals>
+                                            <goal>check</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
 	</build>
 </project>