Skip to content

Commit

Permalink
Merge pull request #23 from TonyMorrison/master
Browse files Browse the repository at this point in the history
BR42 Upgrade maven version and associated plugins
  • Loading branch information
shaundmorris authored Apr 1, 2020
2 parents 45b33c0 + 4ff4cad commit 46ecbfe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand All @@ -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'
}
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 46ecbfe

Please sign in to comment.