X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4a42e8be557bef020ed532b39b159f71117a869b;hb=HEAD;hp=5366244cb89626f32c2173984931dd729ab8cf8a;hpb=bedb48489ecbe5204169b5f566de53b27f340c1b;p=oparent.git

diff --git a/pom.xml b/pom.xml
index 5366244..4a42e8b 100644
--- 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.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <!-- oparent tools -->
@@ -32,13 +33,19 @@
     <module>dependencies-clm</module>
   </modules>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- 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.
+         <maven.compiler.source>1.8</maven.compiler.source>
+         <maven.compiler.target>1.8</maven.compiler.target>
+    -->
     <!--
         The following properties should be defined in your own ~/.m2/settings.xml based on your own build infastructure setup.
         See the settings.xml in this directory for default settings based on the Linux Foundation ONAP infrastructure.
@@ -66,6 +73,22 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.0</version>
+            <configuration>
+               <release>${maven.compiler.release}</release>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>versions-maven-plugin</artifactId>
+            <version>2.7</version>
+            <configuration>
+               <generateBackupPoms>false</generateBackupPoms>
+            </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -83,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>
@@ -128,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>
@@ -146,6 +209,5 @@
         <artifactId>maven-enforcer-plugin</artifactId>
       </plugin>
     </plugins>
-
   </build>
 </project>