This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch scm22 in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit fea8f31116bb34978cda00eb2e9dedb0de07395c Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Thu Dec 25 15:23:27 2025 +0100 Upgrade maven-scm to 2.2.1 --- pom.xml | 2 +- .../svn/svnexe/command/info/SvnInfoCommandExpanded.java | 4 ++-- .../apache/maven/plugins/changelog/stubs/ScmManagerStub.java | 12 ++++++++++++ .../maven/plugins/changelog/stubs/ScmProviderStub.java | 5 +++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0523caa..06350a2 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ under the License. <properties> <javaVersion>8</javaVersion> - <maven-scm.version>2.1.0</maven-scm.version> + <maven-scm.version>2.2.1</maven-scm.version> <doxiaVersion>1.11.1</doxiaVersion> <mavenVersion>3.9.11</mavenVersion> <!-- used in ITs --> diff --git a/src/main/java/org/apache/maven/plugins/changelog/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java b/src/main/java/org/apache/maven/plugins/changelog/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java index e6b527a..eb0110b 100644 --- a/src/main/java/org/apache/maven/plugins/changelog/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java +++ b/src/main/java/org/apache/maven/plugins/changelog/scm/provider/svn/svnexe/command/info/SvnInfoCommandExpanded.java @@ -107,7 +107,7 @@ public class SvnInfoCommandExpanded extends AbstractCommand implements SvnComman final ScmFileSet fileSet, final boolean recursive, final String revision) { - Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository); + Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository, false); cl.createArg().setValue("info"); @@ -139,7 +139,7 @@ public class SvnInfoCommandExpanded extends AbstractCommand implements SvnComman final String tag, final boolean recursive, final String revision) { - Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository); + Commandline cl = SvnCommandLineUtils.getBaseSvnCommandLine(fileSet.getBasedir(), repository, false); cl.createArg().setValue("info"); diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java index 24b37f1..df0c635 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmManagerStub.java @@ -21,7 +21,9 @@ package org.apache.maven.plugins.changelog.stubs; import java.io.File; import java.util.Date; import java.util.List; +import java.util.Optional; +import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; @@ -75,6 +77,11 @@ public class ScmManagerStub implements ScmManager { return null; } + @Override + public Optional<ScmRepository> makeProviderScmRepository(File file) { + return Optional.empty(); + } + /** * {@inheritDoc} */ @@ -196,6 +203,11 @@ public class ScmManagerStub implements ScmManager { return this.getProviderByRepository(repository).checkIn(repository, fileSet, message); } + @Override + public CheckInScmResult checkIn(ScmRepository repository, ScmFileSet fileSet, CommandParameters commandParameters) throws ScmException { + return this.getProviderByRepository(repository).checkIn(repository, fileSet, commandParameters); + } + /** * {@inheritDoc} */ diff --git a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java index 62aa7d6..5bf7832 100644 --- a/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java +++ b/src/test/java/org/apache/maven/plugins/changelog/stubs/ScmProviderStub.java @@ -214,6 +214,11 @@ public class ScmProviderStub implements ScmProvider { return null; } + @Override + public CheckInScmResult checkIn(ScmRepository scmRepository, ScmFileSet scmFileSet, CommandParameters parameters){ + return null; + } + /** * {@inheritDoc} */
