From 380d9b01314001d04f44934078f8cd13a3d3320e Mon Sep 17 00:00:00 2001 From: tzachs Date: Thu, 23 Jul 2020 21:12:00 +0300 Subject: [PATCH 1/3] Added support for repos that end with .git --- .../com/cloudbees/jenkins/plugins/BitbucketJobProbe.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java b/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java index 67295a11..e82a46b7 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java @@ -98,10 +98,15 @@ private boolean match(SCM scm, URIish url) { if (StringUtils.isEmpty(url.getHost())) { urIish = urIish.setHost(url.getHost()); } - + LOGGER.log(Level.FINE, "Trying to match {0} ", urIish.toString() + "<-->" + url.toString()); if (GitStatus.looselyMatches(urIish, url)) { return true; + } else if ( urIish.getPath().endsWith(".git.git")){ + LOGGER.log(Level.FINE, "Repo ends with .git.git, removing last .git"); + urIish = urIish.setPath(urIish.getPath().substring(0,urIish.getPath().length()-4)); + LOGGER.log(Level.FINE, "Trying to match {0} ", urIish.toString() + "<-->" + url.toString()); + return GitStatus.looselyMatches(urIish, url); } } } From 80c8c7c3373665b3e523d7f466f559305c848570 Mon Sep 17 00:00:00 2001 From: tzachs Date: Thu, 23 Jul 2020 21:50:20 +0300 Subject: [PATCH 2/3] [maven-release-plugin] prepare release bitbucket-1.1.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index be31d850..b0d2da76 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ bitbucket - 1.1.12-SNAPSHOT + 1.1.12 hpi Jenkins Bitbucket Plugin integrate Jenkins with BitBucket. @@ -18,7 +18,7 @@ scm:git:git://github.com/jenkinsci/bitbucket-plugin.git scm:git:git@github.com:jenkinsci/bitbucket-plugin.git https://github.com/jenkinsci/bitbucket-plugin - HEAD + bitbucket-1.1.12 From 377b41f4e0454297b5fe2e0fe78e97b348f89225 Mon Sep 17 00:00:00 2001 From: tzachs Date: Thu, 23 Jul 2020 21:51:16 +0300 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b0d2da76..a223e1ae 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ bitbucket - 1.1.12 + 1.1.13-SNAPSHOT hpi Jenkins Bitbucket Plugin integrate Jenkins with BitBucket. @@ -18,7 +18,7 @@ scm:git:git://github.com/jenkinsci/bitbucket-plugin.git scm:git:git@github.com:jenkinsci/bitbucket-plugin.git https://github.com/jenkinsci/bitbucket-plugin - bitbucket-1.1.12 + HEAD