X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0c4eb5f5d0572b13b93e3f27217049377b2e9aac;hb=b01261be40a29ac86378e1e5dd5d298760fb75a0;hp=13d2c80e2c59ca37c20a575b713fae8b471ff80e;hpb=a1fba584a25c63e296c71c94cda99f32b8f0605d;p=policy%2Fparent.git

diff --git a/pom.xml b/pom.xml
index 13d2c80e..0c4eb5f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,8 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
+   Modifications Copyright (C) 2020-2021 AT&T. All rights reserved.
+   Modifications Copyright (C) 2021 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,19 +24,64 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath /> 
+        <!-- When changing, also change the oparent.version property -->
+        <version>3.3.2-SNAPSHOT</version>
+        <relativePath />
     </parent>
     <groupId>org.onap.policy.parent</groupId>
     <artifactId>policy-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <oparent.version>2.1.0-SNAPSHOT</oparent.version>
+        <oparent.version>3.3.2-SNAPSHOT</oparent.version>
     </properties>
 
     <modules>
+        <module>resources</module>
         <module>integration</module>
     </modules>
+
+    <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
+
+                Be sure to override ${project.parent.basedir} in order to find the XML file
+
+                mvn formatter:format spotless:apply process-sources -Dproject.parent.basedir=TODO
+                -->
+                <plugin>
+                    <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>2.11.0</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.26.1</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>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>