[INTEGRATION] Update committers list

[oparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c85ecaa..d18d7d2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
 <!--
    Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
    Modifications copyright (C) 2017-2019 AT&T Intellectual Property
+   Modifications Copyright (C) 2020 Bell Canada.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
   <name>oparent</name>
   <groupId>org.onap.oparent</groupId>
   <artifactId>version</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <!-- oparent tools -->
@@ -37,6 +38,8 @@
     <!-- sitePath may be overridden in the inheriting POM if desired -->
     <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
     <maven.compiler.release>11</maven.compiler.release>
+    <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
     <!-- 
        In the java 8 version of oparent there were two variables defined for 1.8 source and target. These are no longer
        applicable in Java 11 but you may be referencing them in your child poms so review and update as appropriate.
@@ -103,7 +106,7 @@
             <dependency>
               <groupId>org.apache.maven.wagon</groupId>
               <artifactId>wagon-webdav-jackrabbit</artifactId>
-              <version>2.10</version>
+              <version>3.4.3</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -148,7 +151,47 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.2</version>
+          <version>${sonar.scanner.version}</version>
+        </plugin>
+        <!--
+        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
+
+        1st - your project should be inheriting from this oparent java dependency
+        2nd - go into your project's source directory
+        3rd - type in the following and make sure you set the path to where you have oparent cloned and its
+              onap-java-formatter.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>