Boris Johnson says it will hit 2.5% of GDP by 2030, after the defence secretary called for change.