Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-47295] Update to parent pom 2.36
  • Loading branch information
stephenc committed Oct 6, 2017
1 parent 6aeab63 commit cae2b60
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.27</version>
<version>2.36</version>
<relativePath />
</parent>

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/jenkins/scm/api/SCMName.java
Expand Up @@ -54,6 +54,7 @@ private SCMName() {
* For example {@code SCMName.fromUrl("https://github.example.com", "github.")} should return {@code "example"}.
*
* @param url the URL.
* @param ignoredPrefixes the prefixes that should be ignored.
* @return the display name or {@code null}
*/
@CheckForNull
Expand All @@ -71,6 +72,7 @@ public static String fromUrl(@NonNull String url, @CheckForNull String... ignore
* {@code "example"}.
*
* @param url the URL.
* @param ignoredPrefixes the prefixes that should be ignored.
* @return the display name or {@code null}
*/
@CheckForNull
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/jenkins/scm/impl/mock/MockSCM.java
Expand Up @@ -58,7 +58,7 @@
import jenkins.scm.api.SCMRevision;
import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.StringUtils;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
Expand Down
Expand Up @@ -37,7 +37,7 @@
import jenkins.scm.api.trait.SCMSourceTrait;
import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
import org.codehaus.plexus.util.StringUtils;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;

Expand Down

0 comments on commit cae2b60

Please sign in to comment.