Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2 #143

Merged
merged 1 commit into from
Jul 30, 2022
Merged

[MRELEASE-1100] Upgrade Maven SCM to 2.0.0-M2 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...n-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* under the License.
*/

import javax.inject.Named;
import javax.inject.Singleton;

import java.util.HashMap;
Expand All @@ -34,7 +33,6 @@
* 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
Expand Down
6 changes: 3 additions & 3 deletions ...cm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckInCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/**
* A dummy check-in command.
*
*
* @author Benjamin Bentmann
*/
class StubCheckInCommand
Expand All @@ -58,7 +58,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
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 );

Expand All @@ -68,7 +68,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
File srcFile = new File( workingCopyRoot, path );
File dstFile = new File( repoRoot, path );

getLogger().info( " " + path );
logger.info( " " + path );

if ( dstFile.isDirectory() )
{
Expand Down
6 changes: 3 additions & 3 deletions ...m-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubCheckOutCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

/**
* A dummy check-out command.
*
*
* @author Benjamin Bentmann
*/
class StubCheckOutCommand
Expand Down Expand Up @@ -75,7 +75,7 @@ else if ( version instanceof ScmBranch )
revRoot = stubRepo.getRoot();
}

getLogger().info( "Checking out: " + revRoot + " > " + workingCopyRoot );
logger.info( "Checking out: " + revRoot + " > " + workingCopyRoot );

if ( workingCopyRoot.isFile() )
{
Expand All @@ -100,7 +100,7 @@ else if ( version instanceof ScmBranch )
File srcFile = new File( revRoot, path );
File dstFile = new File( workingCopyRoot, path );

getLogger().info( " " + path );
logger.info( " " + path );

if ( srcFile.isDirectory() )
{
Expand Down
4 changes: 1 addition & 3 deletions ...n-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/**
* A stub SCM provider used for the Maven Release Plugin when doing integration testing.
*
*
* @author Benjamin Bentmann
*/
@Singleton
Expand All @@ -62,8 +62,6 @@ protected ScmResult executeCommand( Command command, ScmProviderRepository repos
CommandParameters parameters )
throws ScmException
{
command.setLogger( getLogger() );

return command.execute( repository, fileSet, parameters );
}

Expand Down
6 changes: 3 additions & 3 deletions ...en-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubTagCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

/**
* A dummy tag command.
*
*
* @author Benjamin Bentmann
*/
class StubTagCommand
Expand All @@ -61,7 +61,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
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() )
{
Expand All @@ -80,7 +80,7 @@ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet
File srcFile = new File( repoRoot, path );
File dstFile = new File( tagRoot, path );

getLogger().info( " " + path );
logger.info( " " + path );

if ( srcFile.isDirectory() )
{
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down