Skip to content

S
spring-boot
Commit 2eb3da5b authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x'

parents 5351ceb6 c73fde31
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
spring-boot-dependencies/pom.xml
View file @ 2eb3da5b
......@@ -1582,6 +1582,11 @@
<artifactId>javax.servlet.jsp</artifactId>
<version>${jetty-jsp.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-client-impl</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
......@@ -1597,6 +1602,11 @@
<artifactId>websocket-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment