Merge branch 'jetty-9.4.x' into jetty-10.0.x
This commit is contained in:
commit
30513f9afc
|
@ -35,7 +35,6 @@
|
|||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-core</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
6
pom.xml
6
pom.xml
|
@ -1060,6 +1060,12 @@
|
|||
<artifactId>jnr-unixsocket</artifactId>
|
||||
<version>0.22</version>
|
||||
</dependency>
|
||||
<!-- avoid depending on a range dependency from a transitive dependency -->
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-core</artifactId>
|
||||
<version>1.0.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
|
|
@ -57,6 +57,12 @@
|
|||
<artifactId>jetty-gcloud-session-manager</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- avoid depending on a range dependency from a transitive dependency -->
|
||||
<dependency>
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-core</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
||||
<artifactId>jetty-test-helper</artifactId>
|
||||
|
|
Loading…
Reference in New Issue