You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2025/12/25 18:09:18 UTC
(maven-changelog-plugin) branch master updated (eee1fd4 -> 27ecd74)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
from eee1fd4 feat: enable prevent branch protection rules (#199)
new afa298c Bump m-invoker-p to 3.9.1 for Java 25
new 27ecd74 Upgrade maven-scm to 2.2.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 +++-
src/it/with-svnjava-maven-3/invoker.properties | 18 ------------------
src/it/with-svnjava-maven-3/pom.xml | 9 ++++-----
.../svnexe/command/info/SvnInfoCommandExpanded.java | 4 ++--
.../maven/plugins/changelog/stubs/ScmManagerStub.java | 13 +++++++++++++
.../maven/plugins/changelog/stubs/ScmProviderStub.java | 5 +++++
6 files changed, 27 insertions(+), 26 deletions(-)
delete mode 100644 src/it/with-svnjava-maven-3/invoker.properties
(maven-changelog-plugin) 02/02: Upgrade maven-scm to 2.2.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit 27ecd74b560ed19ecf697fdb2bf9de5d43560c0f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Dec 25 15:23:27 2025 +0100
Upgrade maven-scm to 2.2.1
---
pom.xml | 2 +-
src/it/with-svnjava-maven-3/invoker.properties | 18 ------------------
src/it/with-svnjava-maven-3/pom.xml | 9 ++++-----
.../svnexe/command/info/SvnInfoCommandExpanded.java | 4 ++--
.../maven/plugins/changelog/stubs/ScmManagerStub.java | 13 +++++++++++++
.../maven/plugins/changelog/stubs/ScmProviderStub.java | 5 +++++
6 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 77bc619..d56b5f1 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/it/with-svnjava-maven-3/invoker.properties b/src/it/with-svnjava-maven-3/invoker.properties
deleted file mode 100644
index cb63fdc..0000000
--- a/src/it/with-svnjava-maven-3/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.maven.version = 3.0+
diff --git a/src/it/with-svnjava-maven-3/pom.xml b/src/it/with-svnjava-maven-3/pom.xml
index e5cc1d4..724aa85 100644
--- a/src/it/with-svnjava-maven-3/pom.xml
+++ b/src/it/with-svnjava-maven-3/pom.xml
@@ -31,15 +31,14 @@
<url>http://maven.apache.org/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
+ <url>https://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scmSvnJavaVersion>2.0.3</scmSvnJavaVersion>
</properties>
<build>
@@ -53,7 +52,7 @@
<dependency>
<groupId>com.google.code.maven-scm-provider-svnjava</groupId>
<artifactId>maven-scm-provider-svnjava</artifactId>
- <version>${scmSvnJavaVersion}</version>
+ <version>@maven-scm.version@</version>
</dependency>
</dependencies>
</plugin>
@@ -71,7 +70,7 @@
<version>@pom.version@</version>
<configuration>
<issueIDRegexPattern>[A-Z]{2,}-\d+</issueIDRegexPattern>
- <issueLinkUrl>http://jira.example.co.uk</issueLinkUrl>
+ <issueLinkUrl>https://issues.apache.org/jira/browse/</issueLinkUrl>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
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..a7276e5 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,12 @@ 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..a353c89 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}
*/
(maven-changelog-plugin) 01/02: Bump m-invoker-p to 3.9.1 for Java 25
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit afa298c7a8c12d08dec1b487f02de4cce5242651
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Nov 15 23:17:45 2025 +0100
Bump m-invoker-p to 3.9.1 for Java 25
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 0523caa..77bc619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,8 @@ under the License.
<!-- used in ITs -->
<sitePluginVersion>${version.maven-site-plugin}</sitePluginVersion>
<project.build.outputTimestamp>2024-12-30T15:52:19Z</project.build.outputTimestamp>
+
+ <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
</properties>
<dependencies>