Merge branch 'master' into winstone-with-jetty-12

olamy · May 9, 2024 · 0e04675 · 0e04675
2 parents 455ba01 + 0a5aa0e
commit 0e04675
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 57 deletions.
diff --git a/test/pom.xml b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2193.v71b_f09ec6d46</version>
+      <version>2199.v5c2ef8ce998f</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/war/pom.xml b/war/pom.xml
@@ -136,62 +136,6 @@ THE SOFTWARE.
   <build>
     <finalName>jenkins</finalName>
     <plugins>
-      <!-- TODO When Java 8 usage declines to a terminal level, this can be deleted. -->
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>display-info</id>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>1.8</version>
-                </requireJavaVersion>
-                <enforceBytecodeVersion>
-                  <maxJdkVersion>1.8</maxJdkVersion>
-                  <excludes>
-                    <exclude>com.infradna.tool:bridge-method-annotation</exclude>
-                    <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
-                    <exclude>org.antlr:antlr4</exclude>
-                    <exclude>org.jenkins-ci:annotation-indexer</exclude>
-                    <exclude>org.jenkins-ci:commons-jelly</exclude>
-                    <exclude>org.jenkins-ci:crypto-util</exclude>
-                    <exclude>org.jenkins-ci.main:cli</exclude>
-                    <exclude>org.jenkins-ci.main:jenkins-core</exclude>
-                    <exclude>org.jenkins-ci.main:remoting</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-spi</exclude>
-                    <exclude>org.jenkins-ci:memory-monitor</exclude>
-                    <exclude>org.jenkins-ci:symbol-annotation</exclude>
-                    <exclude>org.jenkins-ci:task-reactor</exclude>
-                    <exclude>org.jenkins-ci:version-number</exclude>
-                    <exclude>org.jvnet.hudson:commons-jelly-tags-define</exclude>
-                    <exclude>org.jvnet.winp:winp</exclude>
-                    <exclude>org.kohsuke:access-modifier-annotation</exclude>
-                    <exclude>org.kohsuke.stapler:json-lib</exclude>
-                    <exclude>org.kohsuke.stapler:stapler</exclude>
-                    <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
-                    <exclude>org.kohsuke.stapler:stapler-jelly</exclude>
-                  </excludes>
-                </enforceBytecodeVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <release>8</release>
-          <testRelease>8</testRelease>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <release>8</release>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <!-- version specified in grandparent pom -->