Skip to content

JENKINS-24503: Support Multiple SCM Plugin (one Subversion SCM configuration only) #6

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

Open
baustufe0 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JENKINS-24503: Support Multiple SCM Plugin (one Subversion SCM configuration only) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68bb0f8
Added support for Multiple SCM plugin with the limitation of one
ps-mibu Aug 29, 2014
5527748
Fixed debug log stating identified Multiple SCM configuration.
ps-mibu Aug 29, 2014
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
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
<artifactId>subversion</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>multiple-scms</artifactId>
<version>0.3</version>

@oleg-nenashev oleg-nenashev Jul 7, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dependency should be optional

</dependency>
</dependencies>

<repositories>
Expand Down
30 changes: 27 additions & 3 deletions src/main/java/hudson/plugins/svn_tag/SvnTagPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@
import hudson.Launcher;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Hudson;
import hudson.model.BuildListener;
import hudson.model.Result;
import hudson.scm.SCM;
import hudson.scm.SubversionSCM;

import org.apache.commons.lang.StringUtils;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.jenkinsci.plugins.multiplescms.MultiSCM;
import org.tmatesoft.svn.core.*;
import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider;
Expand Down Expand Up @@ -74,12 +78,32 @@ public static boolean perform(AbstractBuild<?,?> abstractBuild,
abstractBuild.getProject().getRootProject();
AbstractBuild<?, ?> rootBuild = abstractBuild.getRootBuild();

if (!(rootProject.getScm() instanceof SubversionSCM)) {
logger.println(Messages.NotSubversion(rootProject.getScm().toString()));
SCM projectSCM = rootProject.getScm();

if (Hudson.getInstance().getPlugin("multiple-scms") != null) {
if (projectSCM instanceof MultiSCM) {
logger.println("Identified Multiple SCM configuration - locating SubversionSCM instance");
// fetch subversion SCM from MultiSCM list of SCMs
List<SCM> multiSCMList = MultiSCM.class.cast(projectSCM).getConfiguredSCMs();
for (SCM scm : multiSCMList) {
if (scm instanceof SubversionSCM) {
projectSCM = scm;
break;
}
}
if (!(projectSCM instanceof SubversionSCM)) {
logger.println("No SubversionSCM instance found in Multiple SCMs configuration!");
}
}
}

if (!(projectSCM instanceof SubversionSCM)) {
logger.println(Messages.NotSubversion(projectSCM.toString()));
return true;
}


SubversionSCM scm = SubversionSCM.class.cast(rootProject.getScm());
SubversionSCM scm = SubversionSCM.class.cast(projectSCM);
EnvVars envVars = rootBuild.getEnvironment(buildListener);

// Let SubversionSCM fill revision number.
Expand Down