This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch maven-antrun-plugin-3 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7565c18c258455f9df745e248a02f2c3939599e1 Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Sun Apr 12 21:17:20 2020 +0200 Run tests with maven-antrun-plugin 3.0.0 --- Jenkinsfile | 2 +- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 313fbb8..9fc1649 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,7 +66,7 @@ node(jenkinsEnv.nodeSelection(osNode)) { } } - tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] + tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'maven-antrun-plugin-3'] } } diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index b19a7d7..db652bf 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -74,7 +74,7 @@ under the License. <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> + <version>3.0.0</version> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId>