Merge pull request #217 from MicroFocus/octane-dev-latest

Octane fixes 5.6.5
jenkinsci · Jan 20, 2019 · 48213c7 · 48213c7
2 parents 19eace4 + 9017883
commit 48213c7
Show file tree

Hide file tree

Showing 21 changed files with 473 additions and 341 deletions.
diff --git a/pom.xml b/pom.xml
@@ -347,11 +347,6 @@
 	</pluginRepositories>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.2</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
@@ -393,12 +388,46 @@
 					<artifactId>*</artifactId>
 					<groupId>com.fasterxml.jackson.datatype</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.jenkins-ci.plugins.workflow</groupId>
+					<artifactId>workflow-multibranch</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.jenkins-ci.plugins.workflow</groupId>
+					<artifactId>workflow-job</artifactId>
+				</exclusion>
+
+
 			</exclusions>
 		</dependency>
 		<dependency>
 			<artifactId>workflow-cps</artifactId>
 			<groupId>org.jenkins-ci.plugins.workflow</groupId>
-			<version>2.42</version>
+			<version>2.53</version>
+			<exclusions>
+				<exclusion>
+					<!--  workflow-support 2.18 requires 2.2.6, while org.jenkins-ci.plugins.workflow 2.50 requires 2.0.8-->
+					<groupId>org.jenkins-ci.plugins</groupId>
+					<artifactId>scm-api</artifactId>
+				</exclusion>
+
+			</exclusions>
+		</dependency>
+		<!-- sonar 2.7.1 requires 2.18 required, while org.jenkins-ci.plugins.workflow 2.50 requires 2.17-->
+		<dependency>
+			<groupId>org.jenkins-ci.plugins.workflow</groupId>
+			<artifactId>workflow-support</artifactId>
+			<version>2.18</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jenkins-ci.plugins.workflow</groupId>
+			<artifactId>workflow-multibranch</artifactId>
+			<version>2.20</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jenkins-ci.plugins.workflow</groupId>
+			<artifactId>workflow-job</artifactId>
+			<version>2.21</version>
 		</dependency>
 
 		<dependency>
@@ -414,7 +443,7 @@
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>credentials</artifactId>
-			<version>2.1.8</version>
+			<version>2.1.11</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microfocus.sv</groupId>
@@ -443,7 +472,7 @@
 		<dependency>
 			<artifactId>integrations-sdk</artifactId>
 			<groupId>com.hpe.adm.octane.ciplugins</groupId>
-			<version>2.0.26</version>
+			<version>2.0.27</version>
 		</dependency>
 
 		<!--BUILDER providers integration-->
@@ -456,7 +485,7 @@
 		<dependency>
 			<artifactId>maven-plugin</artifactId>
 			<groupId>org.jenkins-ci.main</groupId>
-			<version>2.15.1</version>
+			<version>2.17</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>mailer</artifactId>
@@ -536,7 +565,7 @@
 		<dependency>
 			<artifactId>sonar</artifactId>
 			<groupId>org.jenkins-ci.plugins</groupId>
-			<version>2.6.1</version>
+			<version>2.8.1</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -578,13 +607,6 @@
 		</dependency>
 
 		<!--Test-->
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>9.4.5.v20170502</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>

diff --git a/...ane/actions/WebhookExpectationAction.java → ...n/tools/octane/actions/WebhookAction.java b/...ane/actions/WebhookExpectationAction.java → ...n/tools/octane/actions/WebhookAction.java
@@ -1,5 +1,6 @@
 package com.microfocus.application.automation.tools.octane.actions;
 
+import com.microfocus.application.automation.tools.octane.model.SonarHelper;
 import hudson.model.Action;
 
 /*
@@ -25,43 +26,53 @@
  */
 
 import javax.annotation.CheckForNull;
+import java.util.List;
 
 /*
     Class for handling webhook exception
  */
 
-public class WebhookExpectationAction implements Action {
-	private Boolean isExpectingToGetWebhookCall;
-	private String serverUrl;
+public class WebhookAction implements Action {
+    private Boolean isExpectingToGetWebhookCall;
+    private String serverUrl;
+    private List<SonarHelper.DataType> dataTypeList;
 
-	public String getServerUrl() {
-		return serverUrl;
-	}
 
-	public Boolean getExpectingToGetWebhookCall() {
-		return isExpectingToGetWebhookCall;
-	}
+    public WebhookAction(Boolean isExpectingToGetWebhookCall, String serverUrl, List<SonarHelper.DataType> dataTypeList) {
+        this.isExpectingToGetWebhookCall = isExpectingToGetWebhookCall;
+        this.serverUrl = serverUrl;
+        this.dataTypeList = dataTypeList;
+    }
 
-	public WebhookExpectationAction(Boolean isExpectingToGetWebhookCall, String serverUrl) {
-		this.isExpectingToGetWebhookCall = isExpectingToGetWebhookCall;
-		this.serverUrl = serverUrl;
-	}
 
-	@CheckForNull
-	@Override
-	public String getIconFileName() {
-		return null;
-	}
+    public String getServerUrl() {
 
-	@CheckForNull
-	@Override
-	public String getDisplayName() {
-		return null;
-	}
+        return serverUrl;
+    }
 
-	@CheckForNull
-	@Override
-	public String getUrlName() {
-		return null;
-	}
+    public Boolean getExpectingToGetWebhookCall() {
+        return isExpectingToGetWebhookCall;
+    }
+
+    public List<SonarHelper.DataType> getDataTypeList() {
+        return dataTypeList;
+    }
+
+    @CheckForNull
+    @Override
+    public String getIconFileName() {
+        return null;
+    }
+
+    @CheckForNull
+    @Override
+    public String getDisplayName() {
+        return null;
+    }
+
+    @CheckForNull
+    @Override
+    public String getUrlName() {
+        return null;
+    }
 }