Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-10-12 08:43:16 -05:00
commit dcf4a835d7
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 3 additions and 2 deletions

View File

@ -38,6 +38,7 @@
<maven.version>3.6.3</maven.version> <maven.version>3.6.3</maven.version>
<maven.resolver.version>1.3.1</maven.resolver.version> <maven.resolver.version>1.3.1</maven.resolver.version>
<weld.version>3.1.3.Final</weld.version> <weld.version>3.1.3.Final</weld.version>
<jboss.logging.version>3.4.1.Final</jboss.logging.version>
<jetty.perf-helper.version>1.0.6</jetty.perf-helper.version> <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>
<ant.version>1.10.9</ant.version> <ant.version>1.10.9</ant.version>
<unix.socket.tmp></unix.socket.tmp> <unix.socket.tmp></unix.socket.tmp>
@ -737,7 +738,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -1137,7 +1138,7 @@
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
<version>3.3.2.Final</version> <version>${jboss.logging.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jnr</groupId> <groupId>com.github.jnr</groupId>