This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MCHANGELOG-138
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit 06c1756cdf0f956a99ac687a3cbd538ab5e1694f
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Mon Dec 23 23:51:00 2024 +0100
[MCHANGELOG-138] Bump Maven SCM from 1.13.0 to 2.1.0
---
pom.xml | 47 +---------------------
.../maven/plugins/changelog/ChangeLogReport.java | 2 -
.../command/info/SvnInfoCommandExpanded.java | 8 ++--
.../plugins/changelog/stubs/ScmProviderStub.java | 6 ---
4 files changed, 5 insertions(+), 58 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7937e7a..ea3c7bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <maven-scm.version>1.13.0</maven-scm.version>
+ <maven-scm.version>2.1.0</maven-scm.version>
<doxiaVersion>1.11.1</doxiaVersion>
<mavenVersion>3.9.9</mavenVersion>
<!-- used in ITs -->
@@ -261,16 +261,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-bazaar</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-clearcase</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
@@ -281,36 +271,11 @@ under the License.
<artifactId>maven-scm-provider-hg</artifactId>
<version>${maven-scm.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsjava</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-jazz</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-local</artifactId>
<version>${maven-scm.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-perforce</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-starteam</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
@@ -321,16 +286,6 @@ under the License.
<artifactId>maven-scm-provider-svn-commons</artifactId>
<version>${maven-scm.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-synergy</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-vss</artifactId>
- <version>${maven-scm.version}</version>
- </dependency>
<!-- Plexus -->
<dependency>
diff --git
a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java
b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java
index 648da4b..0696c92 100644
--- a/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java
+++ b/src/main/java/org/apache/maven/plugins/changelog/ChangeLogReport.java
@@ -69,7 +69,6 @@ import
org.apache.maven.scm.command.changelog.ChangeLogScmResult;
import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.command.info.InfoItem;
import org.apache.maven.scm.command.info.InfoScmResult;
-import org.apache.maven.scm.log.DefaultLog;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
@@ -679,7 +678,6 @@ public class ChangeLogReport extends AbstractMavenReport {
return "HEAD";
}
SvnInfoCommandExpanded infoCommand = new SvnInfoCommandExpanded();
- infoCommand.setLogger(new DefaultLog());
InfoScmResult infoScmResult = infoCommand.executeInfoTagCommand(
(SvnScmProviderRepository)
repository.getProviderRepository(),
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 5d12d3a..e6b527a 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
@@ -82,14 +82,14 @@ public class SvnInfoCommandExpanded extends AbstractCommand
implements SvnComman
SvnInfoConsumer consumer = new SvnInfoConsumer();
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- if (getLogger().isInfoEnabled()) {
- getLogger().info("Executing: " +
SvnCommandLineUtils.cryptPassword(cl));
- getLogger().info("Working directory: " +
cl.getWorkingDirectory().getAbsolutePath());
+ if (logger.isInfoEnabled()) {
+ logger.info("Executing: " + SvnCommandLineUtils.cryptPassword(cl));
+ logger.info("Working directory: " +
cl.getWorkingDirectory().getAbsolutePath());
}
int exitCode;
try {
- exitCode = SvnCommandLineUtils.execute(cl, consumer, stderr,
getLogger());
+ exitCode = SvnCommandLineUtils.execute(cl, consumer, stderr);
} catch (CommandLineException ex) {
throw new ScmException("Error while executing command.", ex);
}
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 0a594a5..62aa7d6 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
@@ -49,7 +49,6 @@ import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.unedit.UnEditScmResult;
import org.apache.maven.scm.command.untag.UntagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
@@ -65,11 +64,6 @@ public class ScmProviderStub implements ScmProvider {
return null;
}
- /**
- * {@inheritDoc}
- */
- public void addListener(ScmLogger scmLogger) {}
-
/**
* {@inheritDoc}
*/
