From 4ff4cad534789b0f97dbf2c5a8bf6fec160592f7 Mon Sep 17 00:00:00 2001
From: Tony Morrison <tony.morrison@connexta.com>
Date: Wed, 1 Apr 2020 10:51:36 -0700
Subject: [PATCH] BR42 Upgrade maven version and associated plugins

---
 Jenkinsfile | 4 ++--
 pom.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 018ea6c..1c87b5c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
                     checkout scm
                 }
                 timeout(time: 20, unit: 'MINUTES') {
-                    withMaven(maven: 'M35', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${MVN_OPTS} ${LINUX_MVN_RANDOM}') {
+                    withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${MVN_OPTS} ${LINUX_MVN_RANDOM}') {
                         sh 'mvn clean install'
                     }
                 }
@@ -36,7 +36,7 @@ pipeline {
                 }
             }
             steps{
-                withMaven(maven: 'M3', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
+                withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: 'default-global-settings', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
                     sh 'mvn deploy -DretryFailedDeploymentCount=10'
                 }
             }
diff --git a/pom.xml b/pom.xml
index 61134a9..90496e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,12 +46,12 @@
         <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
         <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
-        <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
+        <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
         <maven.install.plugin.version>2.5.2</maven.install.plugin.version>
         <maven-jacoco-plugin.version>0.8.2</maven-jacoco-plugin.version>
         <maven.javadoc.plugin.version>2.7</maven.javadoc.plugin.version>
         <maven-jaxb2-plugin.version>0.8.2</maven-jaxb2-plugin.version>
-        <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
+        <maven.release.plugin.version>3.0.0-M1</maven.release.plugin.version>
         <maven.site.plugin.version>3.8.2</maven.site.plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-war-plugin.version>2.2</maven-war-plugin.version>