X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=8f2ef42c66f8a2375e83718929c368ee33d8ac50;hb=e0ad4f2890f9f933199bc6f1b3f0e988da471aa9;hp=4e528ddf4e26621ef9e787c049eb9676291367fe;hpb=d64d789ad789e950c3b5e5443fb418a722b917c4;p=aai%2Fschema-service.git

diff --git a/pom.xml b/pom.xml
index 4e528dd..8f2ef42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,16 +24,20 @@
          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>
+        <groupId>org.onap.aai.aai-common</groupId>
+        <artifactId>aai-parent</artifactId>
+        <version>1.9.2</version>
     </parent>
     <groupId>org.onap.aai.schema-service</groupId>
     <artifactId>schema-service</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.9.7-SNAPSHOT</version>
     <name>aai-schema-service</name>
     <packaging>pom</packaging>
     <modules>
+        <module>aai-annotations</module>
+        <module>aai-schema-gen</module>
+        <module>aai-schema</module>
+        <module>aai-queries</module>
         <module>aai-schema-service</module>
     </modules>
     <properties>
@@ -41,6 +45,7 @@
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
+        <aai.common.version>1.9.3</aai.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <site.path>/content/sites/site/org/onap/aai/resources/${project.artifactId}/${project.version}</site.path>
         <release.path>/content/repositories/releases/</release.path>
@@ -48,36 +53,46 @@
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
         <checkstyle.skip>false</checkstyle.skip>
-        <license.goal.type>check</license.goal.type>
     </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>org.codehaus.mojo</groupId>
-                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.3</version>
+                  <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-deploy-plugin</artifactId>
-                    <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>${nexusproxy}</nexusUrl>
-                        <stagingProfileId>176c31dfe190a</stagingProfileId>
-                        <serverId>ecomp-staging</serverId>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
@@ -90,19 +105,24 @@
                             <include>src/test/java/**</include>
                             <include>pom.xml</include>
                         </includes>
-                        <skipExistingHeaders>false</skipExistingHeaders>
+                        <skipExistingHeaders>true</skipExistingHeaders>
                         <skip>false</skip>
                         <validHeaders>
                             <header>LICENSE_ALT1.txt</header>
                         </validHeaders>
                     </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
                     <executions>
                         <execution>
+                            <id>attach-sources</id>
+                            <phase>verify</phase>
                             <goals>
-                                <!-- Set goal to "format" to auto update license headers -->
-                                <goal>${license.goal.type}</goal>
+                                <goal>jar-no-fork</goal>
                             </goals>
-                            <phase>process-sources</phase>
                         </execution>
                     </executions>
                 </plugin>