Commit 4a6b34e7 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents 09a8b3c0 d5184724
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<jersey.version>2.11</jersey.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
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