Skip to content

fixes for branching submodules #1

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

Closed
wants to merge 1 commit into from
Closed

fixes for branching submodules #1

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
8 changes: 6 additions & 2 deletions ...n-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

import java.io.File;
import java.util.List;
import org.apache.maven.shared.release.util.ReleaseUtil;

/**
* Branch the SCM repository.
Expand All @@ -64,12 +65,15 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
validateConfiguration( releaseDescriptor );

logInfo( relResult, "Branching release with the label " + releaseDescriptor.getScmReleaseLabel() + "..." );

ReleaseDescriptor basedirAlignedReleaseDescriptor =
ReleaseUtil.createBasedirAlignedReleaseDescriptor( releaseDescriptor, reactorProjects );

ScmRepository repository;
ScmProvider provider;
try
{
repository = scmRepositoryConfigurator.getConfiguredRepository( releaseDescriptor, releaseEnvironment.getSettings() );
repository = scmRepositoryConfigurator.getConfiguredRepository( basedirAlignedReleaseDescriptor.getScmSourceUrl(), releaseDescriptor, releaseEnvironment.getSettings() );

repository.getProviderRepository().setPushChanges( releaseDescriptor.isPushChanges() );

Expand All @@ -88,7 +92,7 @@ public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnviro
BranchScmResult result;
try
{
ScmFileSet fileSet = new ScmFileSet( new File( releaseDescriptor.getWorkingDirectory() ) );
ScmFileSet fileSet = new ScmFileSet( new File( basedirAlignedReleaseDescriptor.getWorkingDirectory() ) );
String branchName = releaseDescriptor.getScmReleaseLabel();

ScmBranchParameters scmBranchParameters = new ScmBranchParameters();
Expand Down
23 changes: 22 additions & 1 deletion maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,20 @@
*/

import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;

import org.apache.maven.project.MavenProject;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseUtils;

import org.codehaus.plexus.util.FileUtils;

/**
* Branch a project in SCM, using the same steps as the <tt>release:prepare</tt> goal, creating a branch instead of a tag.
* For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html">http://maven.apache.org/plugins/maven-release-plugin/examples/branch.html</a>.
Expand Down Expand Up @@ -231,7 +237,7 @@ public void execute()

try
{
releaseManager.branch( config, getReleaseEnvironment(), reactorProjects, dryRun );
releaseManager.branch( config, getReleaseEnvironment(), filterReactorProjects(reactorProjects), dryRun );
}
catch ( ReleaseExecutionException e )
{
Expand All @@ -242,4 +248,19 @@ public void execute()
throw new MojoFailureException( e.getMessage(), e );
}
}

public List filterReactorProjects(List reactorProjects) {
String currentDir = FileUtils.normalize( basedir.getAbsolutePath().replace( '\\', '/' ) );
List filteredList = new ArrayList();
for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject p = (MavenProject) i.next();
String dir = FileUtils.normalize( p.getBasedir().getAbsolutePath().replace( '\\', '/' ) );
if(dir.startsWith(currentDir))
{
filteredList.add(p);
}
}
return filteredList;
}
}