Replaced deprecated maven expressions