X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4aafc10a272b57ef81c0c6c5c87de799d18015ff;hb=d35b39e1f028c3b7a6ec523fc5a92bc19213937e;hp=8f3e4f0d133d5284765d06ba4239ce9c16c313d6;hpb=4b48d375fcd4bef746a402b6d907b39de117c626;p=policy%2Fparent.git

diff --git a/pom.xml b/pom.xml
index 8f3e4f0d..4aafc10a 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,22 +24,36 @@
     <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.3</version>
+        <relativePath />
     </parent>
     <groupId>org.onap.policy.parent</groupId>
     <artifactId>policy-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <oparent.version>2.1.0</oparent.version>
+        <oparent.version>3.3.3</oparent.version>
     </properties>
 
     <modules>
+        <module>resources</module>
         <module>integration</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.oparent</groupId>
+                <artifactId>dependencies</artifactId>
+                <version>${oparent.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -48,12 +64,12 @@
 
                 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
+                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>
@@ -64,7 +80,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>