JENKINS-42303 - Updated httpclient. HTTPCLIENT-1726

jenkinsci · Mar 18, 2017 · 3ea28a4 · 3ea28a4
1 parent 7cc0fdf
commit 3ea28a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -92,7 +92,7 @@ THE SOFTWARE.
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.1</version>
+			<version>4.5.3</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/jenkins/plugins/http_request/MimeType.java b/src/main/java/jenkins/plugins/http_request/MimeType.java
@@ -1,14 +1,15 @@
 package jenkins.plugins.http_request;
 
-import hudson.util.ListBoxModel;
 import org.apache.http.entity.ContentType;
 
+import hudson.util.ListBoxModel;
+
 /**
  * @author James Chapman
  */
 public enum MimeType {
 
-    NOT_SET(ContentType.create("")),
+    NOT_SET(null),
     TEXT_HTML(ContentType.TEXT_HTML),
     TEXT_PLAIN(ContentType.TEXT_PLAIN),
     APPLICATION_FORM(ContentType.APPLICATION_FORM_URLENCODED),

diff --git a/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java b/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java
@@ -92,7 +92,7 @@ void okText(HttpServletResponse response, String body) throws IOException {
 		}
 
 		void body(HttpServletResponse response, int status, ContentType contentType, String body) throws IOException {
-			response.setContentType(contentType.toString());
+			response.setContentType(contentType != null ? contentType.toString() : "");
 			response.setStatus(status);
 			response.getWriter().append(body);
 		}