You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/28 20:40:07 UTC
[maven-release] branch maven-scm-2.0.0 updated (7152ed12 -> a197ada6)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-scm-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-release.git
discard 7152ed12 [MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2
new a197ada6 [MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7152ed12)
\
N -- N -- N refs/heads/maven-scm-2.0.0 (a197ada6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-release] 01/01: [MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-scm-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit a197ada6eb54ba89037a04c9d24ee1faab82aa80
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jul 20 20:23:12 2022 +0200
[MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2
This closes #143
---
.../java/org/apache/maven/shared/release/stubs/ScmManagerStub.java | 2 --
.../java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java | 6 +++---
.../org/apache/maven/scm/provider/stub/StubCheckOutCommand.java | 6 +++---
.../java/org/apache/maven/scm/provider/stub/StubScmProvider.java | 4 +---
.../java/org/apache/maven/scm/provider/stub/StubTagCommand.java | 6 +++---
pom.xml | 2 +-
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
index e7a82530..99d6b389 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
@@ -19,7 +19,6 @@ package org.apache.maven.shared.release.stubs;
* under the License.
*/
-import javax.inject.Named;
import javax.inject.Singleton;
import java.util.HashMap;
@@ -34,7 +33,6 @@ import org.eclipse.sisu.Priority;
* Override the makeRepository methods to honour the URL passed in.
*/
@Singleton
-@Named( "default" )
@Priority( 100 )
public class ScmManagerStub
extends org.apache.maven.scm.manager.ScmManagerStub
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java
index 22c6d8af..25e1abcc 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java
@@ -38,7 +38,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* A dummy check-in command.
- *
+ *
* @author Benjamin Bentmann
*/
class StubCheckInCommand
@@ -58,7 +58,7 @@ class StubCheckInCommand
File workingCopyRoot = stubRepo.getWorkingCopyRoot( fileSet );
File repoRoot = stubRepo.getRoot();
- getLogger().info( "Committing: " + workingCopyRoot + " > " + repoRoot );
+ logger.info( "Committing: " + workingCopyRoot + " > " + repoRoot );
List paths = stubRepo.getPaths( workingCopyRoot, fileSet );
@@ -68,7 +68,7 @@ class StubCheckInCommand
File srcFile = new File( workingCopyRoot, path );
File dstFile = new File( repoRoot, path );
- getLogger().info( " " + path );
+ logger.info( " " + path );
if ( dstFile.isDirectory() )
{
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java
index 9296f4f4..4b86c1ac 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java
@@ -42,7 +42,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* A dummy check-out command.
- *
+ *
* @author Benjamin Bentmann
*/
class StubCheckOutCommand
@@ -75,7 +75,7 @@ class StubCheckOutCommand
revRoot = stubRepo.getRoot();
}
- getLogger().info( "Checking out: " + revRoot + " > " + workingCopyRoot );
+ logger.info( "Checking out: " + revRoot + " > " + workingCopyRoot );
if ( workingCopyRoot.isFile() )
{
@@ -100,7 +100,7 @@ class StubCheckOutCommand
File srcFile = new File( revRoot, path );
File dstFile = new File( workingCopyRoot, path );
- getLogger().info( " " + path );
+ logger.info( " " + path );
if ( srcFile.isDirectory() )
{
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
index 19ff57c4..890cb369 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
@@ -38,7 +38,7 @@ import org.apache.maven.scm.repository.ScmRepositoryException;
/**
* A stub SCM provider used for the Maven Release Plugin when doing integration testing.
- *
+ *
* @author Benjamin Bentmann
*/
@Singleton
@@ -62,8 +62,6 @@ public class StubScmProvider
CommandParameters parameters )
throws ScmException
{
- command.setLogger( getLogger() );
-
return command.execute( repository, fileSet, parameters );
}
diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java
index 537e026a..d53958dd 100644
--- a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java
+++ b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java
@@ -39,7 +39,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* A dummy tag command.
- *
+ *
* @author Benjamin Bentmann
*/
class StubTagCommand
@@ -61,7 +61,7 @@ class StubTagCommand
String tagName = parameters.getString( CommandParameter.TAG_NAME );
File tagRoot = new File( stubRepo.getTagBase(), tagName );
- getLogger().info( "Tagging: " + repoRoot + " > " + tagRoot );
+ logger.info( "Tagging: " + repoRoot + " > " + tagRoot );
if ( tagRoot.exists() )
{
@@ -80,7 +80,7 @@ class StubTagCommand
File srcFile = new File( repoRoot, path );
File dstFile = new File( tagRoot, path );
- getLogger().info( " " + path );
+ logger.info( " " + path );
if ( srcFile.isDirectory() )
{
diff --git a/pom.xml b/pom.xml
index d416745e..536335d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
</contributors>
<properties>
- <scmVersion>1.13.0</scmVersion>
+ <scmVersion>2.0.0-M2</scmVersion>
<javaVersion>8</javaVersion>
<mavenVersion>3.2.5</mavenVersion>
<resolverVersion>1.0.0.v20140518</resolverVersion>