[POLICY-149]policy-common integration with oparent

Change-Id: I63ae06a4ed4d9f327a75da021d710da6616465c8
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/README.md b/README.md
index 75d4b4e..a3e8420 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
-This source repository contains ONAP common code, which is shared by 'policy-drools-pdp' and 'policy-engine'. The settings file only needs to support the standard Maven repositories (e.g. central = http://repo1.maven.org/maven2/), and any proxy settings needed in your environment.
-
-To build it using Maven 3, run: mvn clean install
+This source repository contains ONAP common code, which is shared by
+'policy-drools-pdp' and 'policy-engine'. To build it:
+1. using Maven 3
+2. git clone http://gerrit.onap.org/r/oparent and copy
+oparent/settings.xml to ~/.m2
+3. mvn clean install

diff --git a/pom.xml b/pom.xml
index 0bda7f1..c9810fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,13 @@
        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.0.0-SNAPSHOT</version>
+               <relativePath/>
+       </parent>
+
        <groupId>org.onap.policy.common</groupId>
        <artifactId>common-modules</artifactId>
        <version>1.1.0-SNAPSHOT</version>
@@ -50,35 +57,7 @@
                <module>site-manager</module>
        </modules>
 
-       <repositories>
-               <repository>
-                       <id>ecomp-snapshots</id>
-                       <name>ONAP Snapshots Repository</name>
-                       <url>${nexusproxy}/${snapshots.path}</url>
-               </repository>
-               <repository>
-                       <id>ecomp-releases</id>
-                       <name>ONAP Release Repository</name>
-                       <url>${nexusproxy}/${releases.path}</url>
-               </repository>
-               <repository>
-                       <id>ecomp-staging</id>
-                       <name>ONAP Staging Repository</name>
-                       <url>${nexusproxy}/${staging.path}</url>
-               </repository>
-       </repositories>
-       
        <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>
@@ -106,49 +85,6 @@
                                        <skip />
                                </configuration>
                        </plugin>
-                       <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-site-plugin</artifactId>