Add instructions for AAF role for sparky

[aai/aai-common.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 2e15647..3bd33bc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,16 +30,16 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.4-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-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>
     </modules>
@@ -48,11 +48,48 @@
         <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.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>
@@ -111,15 +148,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>
@@ -168,10 +196,15 @@
     </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>