X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=9253a49d5f597368f638e89691818bf36f82c5c8;hb=f9023e161b8af6bddcdea5f52c2644608e7aa8c8;hp=7a98219810e8947db283b225bf5a1f919b72165e;hpb=c1ff011ce15e5f7427fa467800d36456bc538d62;p=aai%2Faai-common.git

diff --git a/pom.xml b/pom.xml
index 7a982198..9253a49d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,37 +1,106 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    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.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          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.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>2.1.0</version>
     </parent>
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.6.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
 
     <modules>
-        <module>aai-schema</module>
-        <module>aai-annotations</module>
-        <module>aai-core</module>
-        <module>aai-auth</module>
-	    <module>aai-utils</module>
-        <module>aai-client-loadbalancer</module>
-	<module>aai-schema-ingest</module>
+    	<module>aai-parent</module>
+		<module>aai-rest</module>
+		<module>aai-schema-ingest</module>
+		<module>aai-annotations</module>
+		<module>aai-core</module>
+		<module>aai-auth</module>
+		<module>aai-utils</module>
+		<module>aai-schema-abstraction</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <modules>
+                <module>aai-common-docker</module>
+            </modules>
+        </profile>
+    </profiles>
+
     <properties>
+        <aai.generate.schema>true</aai.generate.schema>
         <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
-	<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <onap.nexus.snapshot.path>/content/repositories/snapshots/</onap.nexus.snapshot.path>
+        <onap.nexus.snapshot.id>ecomp-snapshots</onap.nexus.snapshot.id>
+        <onap.nexus.release.path>/content/repositories/releases/</onap.nexus.release.path>
+        <onap.nexus.release.id>ecomp-releases</onap.nexus.release.id>
     </properties>
 
     <build>
         <pluginManagement>
             <plugins>
+                <!--
+                Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter
+                Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order
+                Use in combination to rewrite code and imports, then checkstyle
+
+                mvn formatter:format spotless:apply process-sources
+                -->
+                <plugin>
+                    <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>2.8.1</version>
+                    <configuration>
+                        <configFile>${project.parent.basedir}/onap-java-formatter.xml</configFile>
+                    </configuration>
+                    <!-- https://code.revelc.net/formatter-maven-plugin/
+                         use mvn formatter:format to rewrite source files
+                         use mvn formatter:validate to validate source files -->
+                </plugin>
+                <plugin>
+                    <groupId>com.diffplug.spotless</groupId>
+                    <artifactId>spotless-maven-plugin</artifactId>
+                    <version>1.18.0</version>
+                    <configuration>
+                        <java>
+                            <importOrder>
+                                <order>com,java,javax,org</order>
+                            </importOrder>
+                        </java>
+                    </configuration>
+                    <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven
+                         use mvn spotless:apply to rewrite source files
+                         use mvn spotless:check to validate source files -->
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -42,24 +111,36 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
                     <executions>
                         <execution>
-                            <id>default-deploy</id>
-                            <phase>none</phase>
+                            <id>attach-sources</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
                         </execution>
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.mycila</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <version>3.0</version>
                     <configuration>
-                        <nexusUrl>${onap.nexus.url}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
+                        <header>LICENSE.TXT</header>
+                        <includes>
+                            <include>src/main/java/**</include>
+                            <include>src/test/java/**</include>
+                            <include>pom.xml</include>
+                        </includes>
+                        <skipExistingHeaders>true</skipExistingHeaders>
+                        <skip>false</skip>
                     </configuration>
                 </plugin>
             </plugins>
@@ -69,30 +150,30 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.6</version>
-	        <configuration>
-	            <reportPlugins>
-	                <plugin>
-	            	<groupId>org.apache.maven.plugins</groupId>
-	            	<artifactId>maven-project-info-reports-plugin</artifactId>
-	            	<version>2.4</version>
-	            	<configuration>
-	            	    <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-	            	    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-	            	</configuration>
-	            	<reports>
-	            	    <report>dependencies</report>
-	            	</reports>
-	                </plugin>
-	                <plugin>
-	            	<groupId>org.apache.maven.plugins</groupId>
-	            	<artifactId>maven-javadoc-plugin</artifactId>
-	            	<version>2.8</version>
-	            	<configuration>
-	            	    <additionalparam>-Xdoclint:none</additionalparam>
-	            	</configuration>
-	                </plugin>
-	            </reportPlugins>
-	        </configuration>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.4</version>
+                            <configuration>
+                                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                            </configuration>
+                            <reports>
+                                <report>dependencies</report>
+                            </reports>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <version>2.8</version>
+                            <configuration>
+                                <additionalparam>-Xdoclint:none</additionalparam>
+                            </configuration>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.wagon</groupId>
@@ -101,14 +182,23 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
     <distributionManagement>
+        <repository>
+            <id>${onap.nexus.release.id}</id>
+            <name>ECOMP Release Repository</name>
+            <url>${onap.nexus.url}${onap.nexus.release.path}</url>
+        </repository>
         <snapshotRepository>
-            <id>ecomp-snapshots</id>
+            <id>${onap.nexus.snapshot.id}</id>
             <name>ECOMP Snapshot Repository</name>
-            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+            <url>${onap.nexus.url}${onap.nexus.snapshot.path}</url>
         </snapshotRepository>
         <site>
             <id>ecomp-site</id>
@@ -137,6 +227,7 @@
         </plugins>
     </reporting>
 
+    <!-- Start of ONAP Specific Repositories -->
     <repositories>
         <repository>
             <id>AJSC</id>
@@ -159,15 +250,11 @@
             <name>ECOMP Release Repository</name>
             <url>${onap.nexus.url}/content/repositories/releases/</url>
         </repository>
-        <repository>
-            <id>ecomp-staging</id>
-            <name>ECOMP Staging Repository</name>
-            <url>${onap.nexus.url}/content/repositories/staging/</url>
-        </repository>
         <repository>
             <id>ecomp-snapshots</id>
             <name>ECOMP Snapshot Repository</name>
             <url>${onap.nexus.url}/content/repositories/snapshots/</url>
         </repository>
     </repositories>
+    <!-- End of ONAP Specific Repositories -->
 </project>