From 10a153bef0b231ed8b0042bc452b1dea3bf4d309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:01:41 +0000 Subject: [PATCH 01/10] Bump plugin from 4.51 to 4.53 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.51 to 4.53. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.51...plugin-4.53) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c377446..d6c318b3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jenkins-ci.plugins plugin - 4.51 + 4.53 From dc97e05fe2aad16745bc1ddecbb1ea477b727a8b Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 12 Dec 2022 14:53:10 +0100 Subject: [PATCH 02/10] chore(dependencies) Require 2.361.4 as minimum Jenkins version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d6c318b3..b6a46f49 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ THE SOFTWARE. 1.17 -SNAPSHOT jenkinsci/http-request-plugin - 2.303.1 + 2.361.4 true Low 1.16 @@ -75,8 +75,8 @@ THE SOFTWARE. io.jenkins.tools.bom - bom-2.249.x - 984.vb5eaac999a7e + bom-2.361.x + 1742.vb_70478c1b_25f import pom From cb35a48fe979844c5b2b4bc7c1a609dad9205349 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 12 Dec 2022 14:54:33 +0100 Subject: [PATCH 03/10] chore(dependencies) Only builds with JDK11 and JDK17 --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8487bb01..0746c6f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,12 +5,12 @@ 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' ], + [ platform: 'linux', jdk: '11' ], // 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', jenkins: '2.361.4' ], + [ platform: 'windows', jdk: '11', jenkins: '2.361.4' ], // Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime). - [ platform: 'linux', jdk: '17', jenkins: '2.342' ], + [ platform: 'linux', jdk: '17', jenkins: '2.380' ], ]) From 20124b225471fe23fabd82b1e7fa5449d8702129 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 12 Dec 2022 15:10:05 +0100 Subject: [PATCH 04/10] Update Jenkinsfile Co-authored-by: Mark Waite --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0746c6f7..a6f1aa4d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,8 +8,7 @@ buildPlugin(useContainerAgent: true, configurations: [ [ platform: 'linux', jdk: '11' ], // Test the common case (i.e., a recent LTS release) on both Linux and Windows. - [ platform: 'linux', jdk: '11', jenkins: '2.361.4' ], - [ platform: 'windows', jdk: '11', jenkins: '2.361.4' ], + [ platform: 'windows', jdk: '11' ], // Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime). [ platform: 'linux', jdk: '17', jenkins: '2.380' ], From 2a69aef8a855f633ec180cdbf6508bab3ea67117 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 12 Dec 2022 15:10:13 +0100 Subject: [PATCH 05/10] Update Jenkinsfile Co-authored-by: Mark Waite --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6f1aa4d..ff62fa88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,5 +11,5 @@ buildPlugin(useContainerAgent: true, configurations: [ [ platform: 'windows', jdk: '11' ], // Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime). - [ platform: 'linux', jdk: '17', jenkins: '2.380' ], + [ platform: 'linux', jdk: '17', jenkins: '2.381' ], ]) From 253d4fc3eb20e63c2cf496a825d29b82f3faf93a Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 2 Jan 2023 10:55:55 -0700 Subject: [PATCH 06/10] Reduce CI costs by testing Linux Java 11 and Windows Java 17 --- Jenkinsfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff62fa88..c639066a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,9 +7,6 @@ buildPlugin(useContainerAgent: true, configurations: [ // Jenkins version). [ platform: 'linux', jdk: '11' ], - // Test the common case (i.e., a recent LTS release) on both Linux and Windows. - [ platform: 'windows', jdk: '11' ], - // Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime). - [ platform: 'linux', jdk: '17', jenkins: '2.381' ], + [ platform: 'windows', jdk: '17', jenkins: '2.375.1' ], ]) From e7918ceaf7ae5aeb566a49d97136bbabc4c72b0e Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 2 Jan 2023 11:00:41 -0700 Subject: [PATCH 07/10] Adapt to Jetty 10 API changes from Jetty 9 --- src/test/java/jenkins/plugins/http_request/Registers.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/jenkins/plugins/http_request/Registers.java b/src/test/java/jenkins/plugins/http_request/Registers.java index 5fe54ed1..7103f433 100644 --- a/src/test/java/jenkins/plugins/http_request/Registers.java +++ b/src/test/java/jenkins/plugins/http_request/Registers.java @@ -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; @@ -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) { @@ -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) { From de3d1029a6b49635087cd5478edc9c996d45373c Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 2 Jan 2023 11:04:14 -0700 Subject: [PATCH 08/10] Use latest bom 1763.v092b_8980a_f5e Get all the latest dependencies, including git plugin 5.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6a46f49..72c4e93e 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ THE SOFTWARE. io.jenkins.tools.bom bom-2.361.x - 1742.vb_70478c1b_25f + 1763.v092b_8980a_f5e import pom From 1103423906d4b94889dae24be65cc7076efb209f Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 2 Jan 2023 16:35:15 -0700 Subject: [PATCH 09/10] Check dependencies monthly Match the plugin archetype, monthly is often enough --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fdc58d1e..9f19d660 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,8 +5,8 @@ updates: - package-ecosystem: "maven" directory: "/" schedule: - interval: "weekly" + interval: "monthly" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" + interval: "monthly" From 8fe735f8a25e08a86c45aedd903480ec286f7e11 Mon Sep 17 00:00:00 2001 From: Alexander Stohr Date: Mon, 23 Jan 2023 04:06:44 +0100 Subject: [PATCH 10/10] rewording of abstract section (#130) also fixes/eliminates "an HTTP". --- README.adoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.adoc b/README.adoc index ee398cfd..9af2eba0 100644 --- a/README.adoc +++ b/README.adoc @@ -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