Skip to content

S
spring-boot
Commit 974c4bfd authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Polish

parent cedcf157
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
spring-boot-project/spring-boot-dependencies/pom.xml
View file @ 974c4bfd
......@@ -102,15 +102,9 @@
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.1</jedis.version>
<<<<<<< HEAD
<jersey.version>2.27</jersey.version>
<jest.version>6.3.1</jest.version>
<jetty.version>9.4.12.v20180830</jetty.version>
=======
<jersey.version>2.26</jersey.version>
<jest.version>5.3.4</jest.version>
<jetty.version>9.4.14.v20181114</jetty.version>
>>>>>>> 2.0.x
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.5.35.1</jetty-el.version>
<jetty-reactive-httpclient.version>1.0.2</jetty-reactive-httpclient.version>
......
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