X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=e897df03ae78e5d2b54605adb9a033317b91ffd2;hb=9ac5dcb7e5d5800f9b40f1c3288020061278e2d7;hp=68148a630790feb44ba380ca70ecce497beef31e;hpb=5a4ff0ea07e8f5b5dde84c9ef171f188dd8a134c;p=aai%2Faai-common.git

diff --git a/pom.xml b/pom.xml
index 68148a63..e897df03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,27 +25,41 @@
     <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.4.1-SNAPSHOT</version>
+    <version>1.9.1</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-rest</module>
-        <module>aai-schema-ingest</module>
-        <module>aai-annotations</module>
-        <module>aai-core</module>
-        <module>aai-schema</module>
-        <module>aai-auth</module>
-        <module>aai-utils</module>
+    	<module>aai-parent</module>
+		<module>aai-rest</module>
+		<module>aai-schema-ingest</module>
+		<module>aai-annotations</module>
+        <module>aai-aaf-auth</module>
+		<module>aai-core</module>
+		<module>aai-auth</module>
+        <module>aai-els-onap-logging</module>
+        <module>aai-failover</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.common.version>${project.version}</aai.common.version>
         <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>
@@ -58,6 +72,39 @@
     <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>
@@ -84,23 +131,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
-                    <executions>
-                        <execution>
-                            <id>default-deploy</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <nexusUrl>${onap.nexus.url}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
@@ -116,15 +146,6 @@
                         <skipExistingHeaders>true</skipExistingHeaders>
                         <skip>false</skip>
                     </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <!-- Set goal to "format" to auto update license headers -->
-                                <goal>check</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                        </execution>
-                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -222,22 +243,11 @@
             <name>maven reslet</name>
             <url>https://maven.restlet.com/</url>
         </repository>
-
-        <repository>
-            <id>central</id>
-            <name>Maven 2 repository 2</name>
-            <url>http://repo2.maven.org/maven2/</url>
-        </repository>
         <repository>
             <id>ecomp-releases</id>
             <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>
@@ -246,3 +256,4 @@
     </repositories>
     <!-- End of ONAP Specific Repositories -->
 </project>
+<!-- noop for release -->