From 0b1d03f7479a98df851f176d1e75454c84da9544 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 6 Aug 2022 14:35:13 -0700
Subject: [PATCH] Miscellaneous cleanup

---
 pct.sh  | 16 +---------------
 prep.sh |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/pct.sh b/pct.sh
index 3cf1f57a4..f127b15af 100755
--- a/pct.sh
+++ b/pct.sh
@@ -40,7 +40,7 @@ MAVEN_PROPERTIES+=":jenkins.version=${JENKINS_VERSION}:overrideWar=$(pwd)/megawa
 # TODO When all plugins in the managed set are using a plugin parent POM with HPI Plugin 3.29 or
 # later (i.e., plugin parent POM 4.44 or later), this can be deleted.
 #
-MAVEN_PROPERTIES+=:hpi-plugin.version=3.31
+MAVEN_PROPERTIES+=:hpi-plugin.version=3.32
 
 #
 # Define the excludes for upper bounds checking. We define these excludes in a separate file and
@@ -66,20 +66,6 @@ else
 	echo upperBoundsExcludes=javax.servlet:servlet-api >maven.properties
 fi
 
-#
-# JSch uses an older plugin parent POM and therefore an older test harness that predates
-# compatibility with the removal of JNR in recent cores in jenkinsci/jenkins-test-harness#350. As a
-# temporary workaround, we override the test harness to a recent version. Note that we cannot use a
-# test harness newer than 1812.v6d4e97d91fd8, because later releases of the test harness require
-# changes to the plugin parent POM for JUnit 5 support.
-#
-# TODO When this plugin is using a plugin parent POM with test harness 1657.vf8a824e79147 or later
-# (i.e., plugin parent POM 4.32 or later), this can be deleted.
-#
-if [[ $PLUGINS =~ jsch ]]; then
-	MAVEN_PROPERTIES+=:jenkins-test-harness.version=1812.v6d4e97d91fd8
-fi
-
 #
 # Testing plugins against a version of Jenkins that requires Java 11 exposes
 # jenkinsci/plugin-pom#563. This was fixed in plugin parent POM 4.42, but many plugins under test
diff --git a/prep.sh b/prep.sh
index 1b781170b..05a5bcaae 100755
--- a/prep.sh
+++ b/prep.sh
@@ -41,7 +41,7 @@ for LINE in $LINEZ; do
 done
 
 # TODO find a way to encode this in some POM so that it can be managed by Dependabot
-version=1180.v0e40e65a81e1
+version=1183.v6cbe8f5778d5
 pct=$HOME/.m2/repository/org/jenkins-ci/tests/plugins-compat-tester-cli/${version}/plugins-compat-tester-cli-${version}.jar
 [ -f "${pct}" ] || $MVN dependency:get -Dartifact=org.jenkins-ci.tests:plugins-compat-tester-cli:${version}:jar -DremoteRepositories=https://repo.jenkins-ci.org/public/,https://repo.jenkins-ci.org/incrementals/ -Dtransitive=false
 cp "${pct}" target/pct.jar