EE 8 to EE 9

jenkinsci · May 21, 2024 · 980f526 · 980f526
1 parent 5baf972
commit 980f526
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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
@@ -35,6 +35,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/bom</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
+    <!-- TODO JENKINS-73121 until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
   <repositories>
     <repository>

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -14,8 +14,13 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <bom>weekly</bom>
-    <jenkins.version>2.459</jenkins.version>
+    <!-- TODO https://ci.jenkins.io/job/Core/job/jenkins/job/jakarta/ -->
+    <jenkins.version>2.460-rc34964.b_a_1221d5e9b_4</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
+    <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/631 -->
+    <jenkins-test-harness.version>2206.v4e81b_d3b_51eb_</jenkins-test-harness.version>
+    <!-- TODO until in HPI plugin -->
+    <overrideVersions>jakarta.servlet:jakarta.servlet-api:5.0.0</overrideVersions>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -394,6 +399,13 @@
       <groupId>io.jenkins.plugins.mina-sshd-api</groupId>
       <artifactId>mina-sshd-api-sftp</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <!-- TODO needs triage -->
+        <exclusion>
+          <groupId>org.apache.sshd</groupId>
+          <artifactId>sshd-sftp</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.6wind.jenkins</groupId>