From ddcfa10a011869ded851d91a0507dff52f1e9dec Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 4 Jun 2023 15:46:28 -0600 Subject: [PATCH 1/3] Use parent pom 4.66 https://github.com/jenkinsci/plugin-pom/releases/tag/plugin-4.66 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1677eb1f86..d5ce7474ab 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.65 + 4.66 From 5b6eb6096a6cc733afa3c124093b6618d006d4f9 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 4 Jun 2023 17:47:22 -0600 Subject: [PATCH 2/3] Use HTMLUnit 3 --- .../jenkinsci/plugins/gitclient/GitClientSampleRepoRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientSampleRepoRule.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientSampleRepoRule.java index c034596e13..a90d2de565 100644 --- a/src/test/java/org/jenkinsci/plugins/gitclient/GitClientSampleRepoRule.java +++ b/src/test/java/org/jenkinsci/plugins/gitclient/GitClientSampleRepoRule.java @@ -23,8 +23,6 @@ */ package org.jenkinsci.plugins.gitclient; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.gargoylesoftware.htmlunit.util.NameValuePair; import hudson.Launcher; import hudson.model.TaskListener; import hudson.util.StreamTaskListener; @@ -36,6 +34,8 @@ import jenkins.scm.impl.mock.AbstractSampleDVCSRepoRule; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.RepositoryBuilder; +import org.htmlunit.WebResponse; +import org.htmlunit.util.NameValuePair; import org.jvnet.hudson.test.JenkinsRule; /** From 33fbde4b91d7d6e078512af195c80395f3c0d80d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 4 Jun 2023 19:01:57 -0600 Subject: [PATCH 3/3] Test with configuration-as-code 1647.ve39ca_b_829b_42 Includes HTMLUnit 3 --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index d5ce7474ab..019ca7e401 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,8 @@ 4.3.1 -SNAPSHOT + + 1647.ve39ca_b_829b_42 jenkinsci/${project.artifactId}-plugin 2.387.3 @@ -84,6 +86,7 @@ io.jenkins configuration-as-code + ${configuration-as-code-plugin.version} true @@ -202,6 +205,7 @@ io.jenkins.configuration-as-code test-harness + ${configuration-as-code-plugin.version} test