Test jenkinsci/jenkins#6802 with jenkinsci/jenkins-test-harness#453

basil · Jul 8, 2022 · d2b31b1 · d2b31b1
1 parent 81d3dc4
commit d2b31b1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,7 @@ stage('prep') {
         dir('target') {
             plugins = readFile('plugins.txt').split('\n')
             lines = readFile('lines.txt').split('\n')
-            lines = [lines[0], lines[-1]] // run PCT only on newest and oldest lines, to save resources
+            lines = [lines[0]] // run PCT only on newest and oldest lines, to save resources
             stash name: 'pct', includes: 'pct.jar'
             lines.each {stash name: "megawar-$it", includes: "megawar-${it}.war"}
         }

diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
@@ -614,7 +614,8 @@
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-scm-step</artifactId>
-                <version>400.v6b_89a_1317c9a_</version>
+                <!-- TODO https://github.com/jenkinsci/workflow-scm-step-plugin/pull/94 -->
+                <version>406.vb_b_3846d95168</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>

diff --git a/pct.sh b/pct.sh
@@ -12,11 +12,13 @@ else
 	PCT_S_ARG=
 fi
 
-MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.75C:surefire.excludesFile=$(pwd)/excludes.txt
+MAVEN_PROPERTIES=jth.jenkins-war.path=$(pwd)/megawar.war:forkCount=.75C:surefire.excludesFile=$(pwd)/excludes.txt:enforcer.skip=true:jenkins-test-harness.version=1799.v371410da_63fb_
 if [[ -n ${EXTRA_MAVEN_PROPERTIES-} ]]; then
 	MAVEN_PROPERTIES="${MAVEN_PROPERTIES}:${EXTRA_MAVEN_PROPERTIES}"
 fi
 
+echo 'maven.test.dependency.excludes=javax.servlet:javax.servlet-api' >"$(pwd)/maven.properties"
+
 #
 # Plugin Compatibility Tester (PCT) requires custom --add-opens directives when running on Java 17.
 # As a temporary workaround, we pass in these directives when invoking PCT. When
@@ -35,6 +37,7 @@ java \
 	-reportFile "$(pwd)/pct-report.xml" \
 	$PCT_S_ARG \
 	-mavenProperties "${MAVEN_PROPERTIES}" \
+	-mavenPropertiesFile "$(pwd)/maven.properties" \
 	-skipTestCache true
 
 if grep -q -F -e '<status>INTERNAL_ERROR</status>' pct-report.xml; then

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -14,7 +14,8 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <bom>weekly</bom>
-        <jenkins.version>2.358</jenkins.version>
+        <!-- TODO https://github.com/jenkinsci/jenkins/pull/6802 -->
+        <jenkins.version>2.359-rc32570.f88c3356731a_</jenkins.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -498,6 +499,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- TODO When JENKINS-68568 is closed, this can be deleted. -->
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>display-info</id>
+                        <configuration>
+                            <rules>
+                                <enforceBytecodeVersion>
+                                    <maxJdkVersion>11</maxJdkVersion>
+                                </enforceBytecodeVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>