XX-11146: Upgrade to Jaba 7

-modify spec