Merge branch '1.5.x'

pull/9404/head
Andy Wilkinson 8 years ago
commit 4a6b34e725

@ -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>

Loading…
Cancel
Save