From 3008e013e7a13746b1de57e2cc0242ad3385f82e Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 20 May 2024 15:07:03 +0100 Subject: [PATCH 1/2] Introduce EdDSA-api plugin --- bom-weekly/pom.xml | 5 +++++ sample-plugin/pom.xml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index afece1e5d..b9160ad63 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -247,6 +247,11 @@ echarts-api 5.5.0-1 + + io.jenkins.plugins + eddsa-api + 0.3.0-4.v84c6f0f4969e + io.jenkins.plugins file-parameters diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index da9d2db36..969505877 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -33,6 +33,10 @@ io.jenkins.plugins byte-buddy-api + + io.jenkins.plugins + eddsa-api + io.jenkins.plugins pipeline-graph-view From 72bada75804d903f077d3167b4d46e40b5fd0c2b Mon Sep 17 00:00:00 2001 From: James Nord Date: Wed, 22 May 2024 14:12:13 +0100 Subject: [PATCH 2/2] Do not set the JTH War file as mentioned in the upstream PR that attempted to do this unconditionally this is broken by design. the JTH and tests assume that the classpath is correctly setup however it is not, as demonstrated in the prior commit. According to Jenkins there is a plugin installed (trilead-api) because it is in the megawar, however its classess are not in the flat classpath used by JenkinsRule and thus breakage ensues. ref: https://github.com/jenkinsci/plugin-compat-tester/pull/470#issuecomment-1448789132 --- pct.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/pct.sh b/pct.sh index b76293a74..3729dfe02 100755 --- a/pct.sh +++ b/pct.sh @@ -28,7 +28,6 @@ exec java \ --working-dir "$(pwd)/target/pct-work" \ $PCT_D_ARGS \ ${PCT_OPTS-} \ - -Djth.jenkins-war.path="$(pwd)/target/megawar-$LINE.war" \ -Dsurefire.excludesFile="$(pwd)/excludes.txt" # produces: **/target/surefire-reports/TEST-*.xml