Conflicts:
	bin/spring-all-petstore.sh
	modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java