Bugfix - Limit 'mvn deploy' to work with only install/deploy phases (#…

…630)
jfrog · Mar 16, 2022 · 9a56972 · 9a56972
1 parent e885e9c
commit 9a56972
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...nfo-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java b/...nfo-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java
@@ -52,6 +52,8 @@
 import static org.jfrog.build.extractor.BuildInfoExtractorUtils.getModuleIdString;
 import static org.jfrog.build.extractor.BuildInfoExtractorUtils.getTypeString;
 import static org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration.addDefaultPublisherAttributes;
+import static org.jfrog.build.extractor.clientConfiguration.ClientConfigurationFields.PUBLISH_ARTIFACTS;
+import static org.jfrog.build.extractor.clientConfiguration.ClientConfigurationFields.PUBLISH_BUILD_INFO;
 
 /**
  * Will be called for every project/module in the Maven project.
@@ -739,10 +741,13 @@ private void setDeploymentPolicy(ExecutionEvent event) {
             event.getSession().getUserProperties().put("maven.deploy.skip", Boolean.TRUE.toString());
             return;
         }
-        // Skip the artifact deployment behavior if the goals do not contain install phases.
+        // Skip the artifact deployment behavior if the goals do not contain install or deploy phases.
         if (!goals.contains("install")) {
             conf.publisher.setPublishArtifacts(false);
             conf.publisher.setPublishBuildInfo(false);
+
+            conf.publisher.setLegacyBooleanValue(PUBLISH_ARTIFACTS, false);
+            conf.publisher.setLegacyBooleanValue(PUBLISH_BUILD_INFO, false);
         }
     }
 }
diff --git a/...or/src/main/java/org/jfrog/build/extractor/clientConfiguration/PrefixPropertyHandler.java b/...or/src/main/java/org/jfrog/build/extractor/clientConfiguration/PrefixPropertyHandler.java
@@ -79,6 +79,14 @@ public void setBooleanValue(String key, Boolean value) {
         }
     }
 
+    public void setLegacyBooleanValue(String key, Boolean value) {
+        if (value == null) {
+            props.remove(getDeprecatedPrefix() + key);
+        } else {
+            props.put(getDeprecatedPrefix() + key, value.toString());
+        }
+    }
+
     public Integer getIntegerValue(String key) {
         return getIntegerValue(key, null);
     }