I went for the simple approach of changing the signature of ConstraintViolationBuilder.addNode(String) to

<T extends NodeBuilderDefinedContext & NodeBuilderCustomizableContext> T addNode(String name);

This change is believed to be binary backward compatible

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira