X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=7156326462f5b4def143a3a3306da6cc48d11d3e;hb=d4684e2ffd115a5646f5238d0a693b156c90a975;hp=fd85b3d3d07e5d8d457cdc638f6a95a7620ed78d;hpb=d3e39036e883385f1308d378ebe5e1179bfbc932;p=policy%2Fparent.git

diff --git a/pom.xml b/pom.xml
index fd85b3d3..71563264 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,21 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.0</version>
-        <relativePath /> 
+        <!-- When changing, also change the oparent.version property -->
+        <version>3.3.2</version>
+        <relativePath />
     </parent>
     <groupId>org.onap.policy.parent</groupId>
     <artifactId>policy-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <oparent.version>2.1.0</oparent.version>
+        <oparent.version>3.3.2</oparent.version>
     </properties>
 
     <modules>
+        <module>resources</module>
         <module>integration</module>
     </modules>
 
@@ -46,12 +50,14 @@
                 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
+                Be sure to override ${project.parent.basedir} in order to find the XML file
+
+                mvn formatter:format spotless:apply process-sources -Dproject.parent.basedir=<basedir>
                 -->
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.8.1</version>
+                    <version>2.11.0</version>
                     <configuration>
                         <configFile>${project.parent.basedir}/onap-java-formatter.xml</configFile>
                     </configuration>
@@ -62,7 +68,7 @@
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>1.18.0</version>
+                    <version>1.26.1</version>
                     <configuration>
                         <java>
                             <importOrder>