From 4bc4467e0f50ae1133eea77ceb315f22f8fb0e9b Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 18 Jul 2024 16:06:50 +0100 Subject: [PATCH] Fix expression system out --- .../codehaus/mojo/versions/api/PomHelper.java | 25 +++++++++++-------- .../change/AbstractVersionChanger.java | 2 +- .../change/DependencyVersionChanger.java | 3 ++- ...AbstractVersionsDependencyUpdaterMojo.java | 3 ++- .../versions/DisplayExtensionUpdatesMojo.java | 7 +++--- .../mojo/versions/LockSnapshotsMojo.java | 3 ++- .../mojo/versions/ResolveRangesMojo.java | 3 ++- .../mojo/versions/UnlockSnapshotsMojo.java | 3 ++- .../mojo/versions/UseReactorMojo.java | 3 ++- .../mojo/versions/ForceReleasesMojoTest.java | 8 +++--- .../mojo/versions/LockSnapshotsMojoTest.java | 4 +-- .../versions/UseLatestReleasesMojoTest.java | 6 ++--- .../versions/UseLatestVersionsMojoTest.java | 18 ++++++------- .../versions/UseNextReleasesMojoTest.java | 8 +++--- .../versions/UseNextVersionsMojoTest.java | 8 +++--- .../mojo/versions/UseReleasesMojoTest.java | 4 +-- 16 files changed, 59 insertions(+), 49 deletions(-) diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java index b3e19123bb..3f0f8c0f34 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java @@ -471,6 +471,7 @@ public static boolean setProjectParentVersion(final ModifiedPomXMLEventReader po * @param oldVersion The old version of the dependency. * @param newVersion The new version of the dependency. * @param model The model to getModel the project properties from. + * @param logger The logger to use. * @return true if a replacement was made. * @throws XMLStreamException if something went wrong. */ @@ -481,7 +482,8 @@ public static boolean setDependencyVersion( final String artifactId, final String oldVersion, final String newVersion, - final Model model) + final Model model, + final Log logger) throws XMLStreamException { Stack stack = new Stack<>(); String path = ""; @@ -564,11 +566,11 @@ public static boolean setDependencyVersion( && PATTERN_PROJECT_DEPENDENCY_VERSION.matcher(path).matches()) { if ("groupId".equals(elementName)) { haveGroupId = - groupId.equals(evaluate(pom.getElementText().trim(), implicitProperties)); + groupId.equals(evaluate(pom.getElementText().trim(), implicitProperties, logger)); path = stack.pop(); } else if ("artifactId".equals(elementName)) { haveArtifactId = - artifactId.equals(evaluate(pom.getElementText().trim(), implicitProperties)); + artifactId.equals(evaluate(pom.getElementText().trim(), implicitProperties, logger)); path = stack.pop(); } else if ("version".equals(elementName)) { pom.mark(0); @@ -617,9 +619,10 @@ public static boolean setDependencyVersion( * * @param expr The expression to evaluate. * @param properties The properties to substitute. + * @param logger The logger to use. * @return The evaluated expression. */ - public static String evaluate(String expr, Map properties) { + public static String evaluate(String expr, Map properties, Log logger) { if (expr == null) { return null; } @@ -634,15 +637,15 @@ public static String evaluate(String expr, Map properties) { if (exprStartDelimiter >= 0) { if (exprStartDelimiter > 0) { value = value.substring(0, exprStartDelimiter) - + evaluate(value.substring(exprStartDelimiter), properties); + + evaluate(value.substring(exprStartDelimiter), properties, logger); } else { - value = evaluate(value.substring(exprStartDelimiter), properties); + value = evaluate(value.substring(exprStartDelimiter), properties, logger); } } } else { - // TODO find a way to log that and not use this System.out!! - // this class could be a component with logger injected !! - System.out.println("expression: " + expression + " no value "); + // Because we work with the raw model, without interpolation, unevaluatable expressions are not + // unexpected + logger.debug("expression: " + expression + " no value "); } return value == null ? expr : value; }) @@ -656,10 +659,10 @@ public static String evaluate(String expr, Map properties) { if (index > 0 && expr.charAt(index - 1) == '$') { retVal += expr.substring(index + 1, lastIndex + 1); } else { - retVal += evaluate(expr.substring(index, lastIndex + 1), properties); + retVal += evaluate(expr.substring(index, lastIndex + 1), properties, logger); } - retVal += evaluate(expr.substring(lastIndex + 1), properties); + retVal += evaluate(expr.substring(lastIndex + 1), properties, logger); return retVal; } } diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java b/versions-common/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java index c1a46f1694..1a357e39d8 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java @@ -34,7 +34,7 @@ public abstract class AbstractVersionChanger implements VersionChanger { private final ModifiedPomXMLEventReader pom; - private final Log log; + protected final Log log; public AbstractVersionChanger(Model model, ModifiedPomXMLEventReader pom, Log log) { this.model = model; diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java b/versions-common/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java index 5375de50b1..03fd65810d 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java @@ -42,7 +42,8 @@ public void apply(DependencyVersionChange versionChange) throws XMLStreamExcepti versionChange.getArtifactId(), versionChange.getOldVersion(), versionChange.getNewVersion(), - getModel())) { + getModel(), + log)) { info(" Updating dependency " + versionChange.getGroupId() + ":" + versionChange.getArtifactId()); info(" from version " + versionChange.getOldVersion() + " to " + versionChange.getNewVersion()); } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java index 26b3ed9ff0..0994cd94b8 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java @@ -561,7 +561,8 @@ && getProject().getParent() != null dep.getArtifactId(), dep.getVersion(), newVersion, - getProject().getModel())) { + getProject().getModel(), + getLog())) { if (getLog().isInfoEnabled()) { getLog().info("Updated " + toString(dep) + " to version " + newVersion); } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojo.java index 663cbc05f9..370076b3f0 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayExtensionUpdatesMojo.java @@ -233,9 +233,10 @@ public void execute() throws MojoExecutionException, MojoFailureException { .orElse(Collections.emptyList()) .stream() .map(e -> ExtensionBuilder.newBuilder() - .withGroupId(PomHelper.evaluate(e.getGroupId(), properties)) - .withArtifactId(PomHelper.evaluate(e.getArtifactId(), properties)) - .withVersion(PomHelper.evaluate(e.getVersion(), properties)) + .withGroupId(PomHelper.evaluate(e.getGroupId(), properties, getLog())) + .withArtifactId( + PomHelper.evaluate(e.getArtifactId(), properties, getLog())) + .withVersion(PomHelper.evaluate(e.getVersion(), properties, getLog())) .build())); } } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java index d00151b8ce..1351b110d0 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java @@ -134,7 +134,8 @@ protected void lockSnapshots(ModifiedPomXMLEventReader pom, Collection artifact.getArtifactId(), dep.getVersion(), artifactVersion, - getProject().getModel())) { + getProject().getModel(), + getLog())) { getLog().debug("Version set to " + artifactVersion + " for dependency: " + artifact); } else { getLog().debug("Could not find the version tag for dependency " + artifact + " in project " diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java index 1839a52fd2..979cff0703 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java @@ -129,7 +129,8 @@ private void unlockSnapshots( dep.getArtifactId(), dep.getVersion(), unlockedVersion, - getProject().getModel())) { + getProject().getModel(), + getLog())) { getChangeRecorder() .recordChange(DefaultDependencyChangeRecord.builder() diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java index 8594c2ac37..0808ce0898 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java @@ -110,7 +110,8 @@ private void useReactor(ModifiedPomXMLEventReader pom, Collection de dep.getArtifactId(), dep.getVersion(), project.getVersion(), - getProject().getModel())) { + getProject().getModel(), + getLog())) { getLog().info("Updated " + toString(dep) + " to version " + project.getVersion()); } break; diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java index 6e610b33bd..72944e7d14 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java @@ -118,7 +118,7 @@ public void testReplaceSnapshotWithRelease() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -145,7 +145,7 @@ public void testUpgrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -172,7 +172,7 @@ public void testDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -201,7 +201,7 @@ public void testFailIfNotReplaced() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/LockSnapshotsMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/LockSnapshotsMojoTest.java index 1f7f8fdd86..e4b78d2ffa 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/LockSnapshotsMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/LockSnapshotsMojoTest.java @@ -89,7 +89,7 @@ public void testNoTimestampedDependencyFoundNull() LockSnapshotsMojo mojo = createMojo(repositorySystem); try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenThrow(new RuntimeException("Not supposed to modify the dependency")); mojo.lockSnapshots(null, mojo.project.getDependencies()); } @@ -103,7 +103,7 @@ public void testNoTimestampedDependencyFoundSameVersion() LockSnapshotsMojo mojo = createMojo(repositorySystem); try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenThrow(new RuntimeException("Not supposed to modify the dependency")); mojo.lockSnapshots(null, mojo.project.getDependencies()); } diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java index d04ca85e58..2c2301eb6e 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java @@ -106,7 +106,7 @@ public void testDontUpgradeToBeta() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -135,7 +135,7 @@ public void testAllowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -167,7 +167,7 @@ public void testDisallowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java index 6c11c1481a..89f1b2ab9f 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java @@ -129,7 +129,7 @@ public void testDependenciesDowngradeIncremental() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -157,7 +157,7 @@ public void testDependenciesDowngradeMinor() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -181,7 +181,7 @@ public void testDependenciesDowngradeMajor() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -208,7 +208,7 @@ public void testDependencyManagementDowngrade() .when(() -> PomHelper.getRawModel(any(MavenProject.class))) .thenReturn(mojo.getProject().getModel()); pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -242,7 +242,7 @@ public void testParentDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -283,7 +283,7 @@ public void testPoisonDependencyVersion() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -304,7 +304,7 @@ public void testIgnoredVersions() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -327,7 +327,7 @@ public void testIncludeFilter() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } @@ -353,7 +353,7 @@ public void testExcludeFilter() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); mojo.update(null); } diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextReleasesMojoTest.java index 75d170c26e..2849c4bc21 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextReleasesMojoTest.java @@ -93,7 +93,7 @@ public void setUp() throws Exception { public void testNoNewerReleases() { try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -114,7 +114,7 @@ public void testFindANewerRelease() throws IllegalAccessException { })); try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -147,7 +147,7 @@ public void testAllowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -179,7 +179,7 @@ public void testDisallowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextVersionsMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextVersionsMojoTest.java index 533e2cdb55..9de1c0c240 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextVersionsMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseNextVersionsMojoTest.java @@ -99,7 +99,7 @@ public void testNoNewerVersions() { try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -120,7 +120,7 @@ public void testFindANewerVersion() throws IllegalAccessException { })); try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper - .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any())) + .when(() -> PomHelper.setDependencyVersion(any(), any(), any(), any(), any(), any(), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -154,7 +154,7 @@ public void testAllowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -186,7 +186,7 @@ public void testDisallowDowngrade() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java index 0748a87b9a..fed4f72454 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java @@ -161,7 +161,7 @@ public void testReplaceSnapshotWithRelease() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class))) @@ -190,7 +190,7 @@ public void testFailIfNotReplaced() try (MockedStatic pomHelper = mockStatic(PomHelper.class)) { pomHelper .when(() -> PomHelper.setDependencyVersion( - any(), anyString(), anyString(), anyString(), anyString(), any(Model.class))) + any(), anyString(), anyString(), anyString(), anyString(), any(Model.class), any())) .thenReturn(true); pomHelper .when(() -> PomHelper.getRawModel(any(MavenProject.class)))