diff --git a/Jenkinsfile b/Jenkinsfile index 5b6d26713..fcaa8cc25 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,6 +56,7 @@ stage('prep') { ]) { sh ''' mvn -v + export LINEZ=weekly bash prep.sh ''' } diff --git a/pct.sh b/pct.sh index b76293a74..c16f55b42 100755 --- a/pct.sh +++ b/pct.sh @@ -20,6 +20,7 @@ if ! [[ $PLUGINS =~ blueocean || $PLUGINS =~ lockable-resources || $PLUGINS =~ p PCT_D_ARGS+='-DforkCount=.75C ' fi +# TODO https://github.com/jenkinsci/jenkins-test-harness/pull/631 exec java \ -jar target/pct.jar \ test-plugins \ @@ -29,6 +30,8 @@ exec java \ $PCT_D_ARGS \ ${PCT_OPTS-} \ -Djth.jenkins-war.path="$(pwd)/target/megawar-$LINE.war" \ + -Djenkins-test-harness.version=2206.v4e81b_d3b_51eb_ \ + -DoverrideVersions=jakarta.servlet:jakarta.servlet-api:5.0.0 \ -Dsurefire.excludesFile="$(pwd)/excludes.txt" # produces: **/target/surefire-reports/TEST-*.xml diff --git a/pom.xml b/pom.xml index f6147fb19..a6d9bfce5 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,8 @@ 999999-SNAPSHOT jenkinsci/bom false + + 17 diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index da9d2db36..061bbc0e1 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -14,8 +14,13 @@ 999999-SNAPSHOT weekly - 2.459 + + 2.460-rc34964.b_a_1221d5e9b_4 false + + 2206.v4e81b_d3b_51eb_ + + jakarta.servlet:jakarta.servlet-api:5.0.0 @@ -394,6 +399,13 @@ io.jenkins.plugins.mina-sshd-api mina-sshd-api-sftp test + + + + org.apache.sshd + sshd-sftp + + org.6wind.jenkins