From 1b65ee61d759a00f38c975889d20c96b83a50075 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 25 Jan 2022 21:27:02 +0100 Subject: [PATCH] #544 improve validation of plugin parameters: - ensure either 'properties' or 'propertiesVersionFile' is provided - fix validation of superfluous newVersion parameter --- .../java/org/codehaus/mojo/versions/SetPropertyMojo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java b/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java index 49646141ef..4b6f813074 100644 --- a/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java @@ -101,12 +101,14 @@ protected void update( ModifiedPomXMLEventReader pom ) } propertiesConfig = reader.getPropertiesConfig(); properties = reader.getProperties(); - } else { + } else if (!StringUtils.isEmpty(property)) { getLog().debug( "Reading properties and versions to update from property and newVersion " ); Property propertyConfig = new Property(property); propertyConfig.setVersion(newVersion); propertiesConfig = new Property[] { propertyConfig }; properties = property; + } else { + throw new MojoExecutionException("Please provide either 'property' or 'propertiesVersionsFile' parameter."); } update(pom, propertiesConfig, properties); } @@ -134,7 +136,7 @@ private void logWrongConfigWarning() { if (!StringUtils.isEmpty(property)) { getLog().warn("-Dproperty provided but will be ignored as -DpropertiesVersionsFile is used"); } - if (!StringUtils.isEmpty(property)) { + if (!StringUtils.isEmpty(newVersion)) { getLog().warn("-DnewVersion provided but will be ignored as -DpropertiesVersionsFile is used"); } }