Commit cf20ac78 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents 844aa181 811e8df9
......@@ -28,7 +28,7 @@
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.59</appengine-sdk.version>
<artemis.version>2.4.0</artemis.version>
<aspectj.version>1.8.12</aspectj.version>
<aspectj.version>1.8.13</aspectj.version>
<assertj.version>3.8.0</assertj.version>
<atomikos.version>4.0.4</atomikos.version>
<bitronix.version>2.1.4</bitronix.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