Merge "changing dockerfile plugin and springboot versions"