From f2c966863ef9f1181fe598982d2a4960e929fda1 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 14 Oct 2024 17:55:12 -0700 Subject: [PATCH] Move test runtime mojo execution to the appropriate phase(s) --- .../hpi/extensions/HpiLifecycleMappingProvider.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java index 1d88bf172b..99a78f12b6 100644 --- a/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java +++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/extensions/HpiLifecycleMappingProvider.java @@ -38,9 +38,11 @@ static Map getBindings() { bindings.put( "test-compile", new LifecyclePhase( - "org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile,org.jenkins-ci.tools:maven-hpi-plugin:test-hpl,org.jenkins-ci.tools:maven-hpi-plugin:resolve-test-dependencies")); - bindings.put("process-test-classes", new LifecyclePhase("org.jenkins-ci.tools:maven-hpi-plugin:test-runtime")); - bindings.put("test", new LifecyclePhase("org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test")); + "org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile,org.jenkins-ci.tools:maven-hpi-plugin:test-hpl")); + bindings.put( + "test", + new LifecyclePhase( + "org.jenkins-ci.tools:maven-hpi-plugin:resolve-test-dependencies,org.jenkins-ci.tools:maven-hpi-plugin:test-runtime,org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test")); bindings.put("package", new LifecyclePhase("org.jenkins-ci.tools:maven-hpi-plugin:hpi")); bindings.put("install", new LifecyclePhase("org.apache.maven.plugins:maven-install-plugin:2.4:install")); bindings.put("deploy", new LifecyclePhase("org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy"));