Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2020-09-18 06:27:46 +10:00
parent e16653ae75 53f3bbd32d
commit 8a36c18c7c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-ant/pom.xml
View File

@ -49,14 +49,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>ant</groupId>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

1
jetty-jspc-maven-plugin/pom.xml
View File

@ -109,7 +109,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.8</version>
</dependency>
</dependencies>
<reporting>

11
pom.xml
View File

@ -39,6 +39,7 @@
<maven.resolver.version>1.3.1</maven.resolver.version>
<weld.version>3.1.3.Final</weld.version>
<jetty.perf-helper.version>1.0.5</jetty.perf-helper.version>
<ant.version>1.10.8</ant.version>
<unix.socket.tmp></unix.socket.tmp>
<!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
<jetty.testtracker.log>false</jetty.testtracker.log>
@ -1151,6 +1152,16 @@
<artifactId>grpc-core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${ant.version}</version>
</dependency>
</dependencies>
</dependencyManagement>