Fix issues with JDK7
Modify pom.xml to Sonatype recommendations

Change-Id: Ie35b6b82ec7f78cb7fa74294951d597b29166e45
Snapshot

Change-Id: I4fd448d7acb58165aad43bb247cc23803a5ca8ed
1.0.4

Change-Id: Ic18dca58ee386aec1c58bc31ba8f928d66dd434c