Change target jvm from 1.5 to 1.6 in build.
Added ContainingConstraint and use that instead of Containing for contain matcher syntax.