Merge pull request #12061 from jetty/merge/jetty-12.0.x/update-from-11

Merge Jetty 11 into Jetty 12.0
This commit is contained in:
Joakim Erdfelt 2024-07-18 14:18:19 -05:00 committed by GitHub
commit 91a9d0ac43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version> <maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version> <maven.remote-resources.plugin.version>3.2.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version> <maven.surefire.plugin.version>3.3.1</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>
@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>com.diffplug.spotless</groupId> <groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId> <artifactId>spotless-maven-plugin</artifactId>
<version>2.41.1</version> <version>2.43.0</version>
<configuration> <configuration>
<pom> <pom>
<includes> <includes>

View File

@ -8,7 +8,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Jetty :: Project</name> <name>Jetty :: Project</name>
<description>The Eclipse Jetty Project</description> <description>The Eclipse Jetty Project</description>
<url>https://eclipse.dev/jetty</url> <url>https://jetty.org</url>
<inceptionYear>1995</inceptionYear> <inceptionYear>1995</inceptionYear>
<organization> <organization>