Skip to content

Commit c21acdc

Browse files
authored
fix: remove default value for deprecated property (#21789)
Having the default value leads to a wrong warning message "Both 'frontendOutputDirectory' and 'webpackOutputDirectory' are set"
1 parent 6bacb66 commit c21acdc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ public abstract class FlowModeAbstractMojo extends AbstractMojo
221221
*
222222
* @deprecated Use {@link #frontendOutputDirectory} instead.
223223
*/
224-
@Parameter(defaultValue = "${project.build.outputDirectory}/"
225-
+ VAADIN_WEBAPP_RESOURCES)
226224
@Deprecated
227225
private File webpackOutputDirectory;
228226

@@ -642,6 +640,8 @@ public File frontendOutputDirectory() {
642640
logWarn("'webpackOutputDirectory' property is deprecated and will be removed in future releases. Please use 'frontendOutputDirectory' instead.");
643641
frontendOutputDirectory = webpackOutputDirectory;
644642
webpackOutputDirectory = null;
643+
} else if (webpackOutputDirectory.equals(frontendOutputDirectory)) {
644+
webpackOutputDirectory = null;
645645
} else {
646646
logWarn("Both 'frontendOutputDirectory' and 'webpackOutputDirectory' are set. "
647647
+ "'webpackOutputDirectory' property will be removed in future releases and will be ignored. "

0 commit comments

Comments
 (0)