Updated to 1.0-SNAPSHOT of JSR-354