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

basil · Jul 8, 2022 · d36ab56 · d36ab56
1 parent 66e01d7
commit d36ab56
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/pct.sh b/pct.sh
@@ -12,7 +12,7 @@ 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

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>