Skip to content

Commit

Permalink
Merge branch 'master' into fix-cert-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
jimklimov authored Jan 25, 2023
2 parents 3eaa1ce + 8fe735f commit c3d5be2
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
8 changes: 2 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
buildPlugin(useContainerAgent: true, configurations: [
// Test the long-term support end of the compatibility spectrum (i.e., the minimum required
// Jenkins version).
[ platform: 'linux', jdk: '8' ],

// Test the common case (i.e., a recent LTS release) on both Linux and Windows.
[ platform: 'linux', jdk: '11', jenkins: '2.332.1' ],
[ platform: 'windows', jdk: '11', jenkins: '2.332.1' ],
[ platform: 'linux', jdk: '11' ],

// Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime).
[ platform: 'linux', jdk: '17', jenkins: '2.342' ],
[ platform: 'windows', jdk: '17', jenkins: '2.375.1' ],
])
13 changes: 7 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ toc::[]

[abstract]
.Overview
This plugin sends a HTTP/HTTPS request to a user specified URL. The request is made as a job
execution in Jenkins and depending of the HTTP response the job could be marked as failed
(configurable). For example, responses such as 404 and 500 could make the job fail. When a
job fails it will log the response to help identify the problem. The request may be as an HTTP GET
or POST mode, by choosing the HTTP mode. If it was not informed, it will use the default from global
settings whose default is POST.
This plugin sends a HTTP/HTTPS request to a user specified URL. The request is made via job
execution in Jenkins and depending on the HTTP response the job can be marked as failed
(configurable). For example, responses such as 404 and 500 can make the job fail. When a
job fails it will log the response to help identify the problem.

According to the setting of HTTP mode the request will be performed either using HTTP GET or POST.
If there is no such setting then it will use the default from global settings. Default there is POST.

== Features

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.51</version>
<version>4.53</version>
<relativePath />
</parent>

Expand All @@ -51,7 +51,7 @@ THE SOFTWARE.
<revision>1.17</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/http-request-plugin</gitHubRepo>
<jenkins.version>2.303.1</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<spotbugs.failOnError>true</spotbugs.failOnError>
<spotbugs.threshold>Low</spotbugs.threshold>
<hpi.compatibleSinceVersion>1.16</hpi.compatibleSinceVersion>
Expand All @@ -75,8 +75,8 @@ THE SOFTWARE.
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.249.x</artifactId>
<version>984.vb5eaac999a7e</version>
<artifactId>bom-2.361.x</artifactId>
<version>1763.v092b_8980a_f5e</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/jenkins/plugins/http_request/Registers.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpHeaders;
import org.apache.http.entity.ContentType;
import org.eclipse.jetty.http.MultiPartFormInputStream;
import org.eclipse.jetty.server.MultiPartFormInputStream;
import org.eclipse.jetty.server.Request;

import jenkins.plugins.http_request.HttpRequestTestBase.SimpleHandler;
Expand Down Expand Up @@ -279,7 +279,7 @@ static void registerFileUpload(final File testFolder, final File uploadFile, fin
private static final String MULTIPART_FORMDATA_TYPE = "multipart/form-data";

private void enableMultipartSupport(HttpServletRequest request, MultipartConfigElement multipartConfig) {
request.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multipartConfig);
request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multipartConfig);
}

private boolean isMultipartRequest(ServletRequest request) {
Expand Down Expand Up @@ -321,7 +321,7 @@ static void registerFormData(final File testFolder, String content, final File f

private void enableMultipartSupport(HttpServletRequest request,
MultipartConfigElement multipartConfig) {
request.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multipartConfig);
request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multipartConfig);
}

private boolean isMultipartRequest(ServletRequest request) {
Expand Down

0 comments on commit c3d5be2

Please sign in to comment.