From d522d2f814a5c63180519d4f1f0699f504702dac Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Tue, 15 Sep 2015 11:49:09 -0400
Subject: [PATCH 1/3] [JBIDE-20682] Fix webhook url secret case-sensitivity

(cherry picked from commit 411668022c0de303bad3cfa943af8340beb22087)
---
 .../internal/restclient/model/build/WebhookTrigger.java     | 4 ++--
 .../internal/restclient/model/build/WebhookTriggerTest.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/openshift/internal/restclient/model/build/WebhookTrigger.java b/src/main/java/com/openshift/internal/restclient/model/build/WebhookTrigger.java
index 64caa89a..b7457157 100644
--- a/src/main/java/com/openshift/internal/restclient/model/build/WebhookTrigger.java
+++ b/src/main/java/com/openshift/internal/restclient/model/build/WebhookTrigger.java
@@ -45,8 +45,8 @@ public String getWebhookURL() {
 		return String.format("%s/webhooks/%s/%s",
 					baseURL,
 					secret,
-					type.toString()
-				).toLowerCase();
+					type.toLowerCase()
+				);
 	}
 
 	@Override
diff --git a/src/test/java/com/openshift/internal/restclient/model/build/WebhookTriggerTest.java b/src/test/java/com/openshift/internal/restclient/model/build/WebhookTriggerTest.java
index bd5b0aef..d2f201c6 100644
--- a/src/test/java/com/openshift/internal/restclient/model/build/WebhookTriggerTest.java
+++ b/src/test/java/com/openshift/internal/restclient/model/build/WebhookTriggerTest.java
@@ -29,13 +29,13 @@ public void setup(){
 	}
 	@Test
 	public void testGetWebhookUrlWhenResourceHasBaseURL() {
-		trigger = new WebhookTrigger(BuildTriggerType.GENERIC, "secret101","https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/foo");
-		assertEquals("https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/foo/webhooks/secret101/generic", trigger.getWebhookURL());
+		trigger = new WebhookTrigger(BuildTriggerType.GENERIC, "seCRet101","https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/foo");
+		assertEquals("https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/foo/webhooks/seCRet101/generic", trigger.getWebhookURL());
 	}
 	
 	@Test
 	public void testGetWebhookUrlWhenResourceDoesNotHaveBaseURL(){
-		trigger = new WebhookTrigger(BuildTriggerType.GENERIC, "secret101"," ");
+		trigger = new WebhookTrigger(BuildTriggerType.GENERIC, "seCRet101"," ");
 		assertEquals("",trigger.getWebhookURL());
 	}
 }

From 0c3c45b597c17263334b6b0a81cd870b4bc3c1ea Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Thu, 17 Sep 2015 13:08:18 -0400
Subject: [PATCH 2/3] bump to 3.0.1.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9479da29..8665740e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<!-- Artifact Information -->
 	<groupId>com.openshift</groupId>
 	<artifactId>openshift-restclient-java</artifactId>
-	<version>3.0.0.Final</version>
+	<version>3.0.1.Final</version>
 	<packaging>jar</packaging>
 	<name>OpenShift Java REST Client</name>
 	<url>http://openshift.redhat.com</url>

From c7c05545aac59ee9be18a82c664327b69b6fb121 Mon Sep 17 00:00:00 2001
From: Jeff Cantrill <jcantril@redhat.com>
Date: Thu, 17 Sep 2015 13:09:58 -0400
Subject: [PATCH 3/3] bump to 3.0.2-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8665740e..026546b8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<!-- Artifact Information -->
 	<groupId>com.openshift</groupId>
 	<artifactId>openshift-restclient-java</artifactId>
-	<version>3.0.1.Final</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>OpenShift Java REST Client</name>
 	<url>http://openshift.redhat.com</url>