Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Miscellaneous cleanup #1383

Merged
merged 1 commit into from
Aug 7, 2022
Merged

Miscellaneous cleanup #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions pct.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

picking up jenkinsci/plugin-compat-tester#377 (not relevant here)

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
Expand Down