Merge branch '2.1.x'

# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-commons-dependencies/pom.xml # spring-cloud-commons/pom.xml # spring-cloud-context-integration-tests/pom.xml # spring-cloud-context/pom.xml # spring-cloud-loadbalancer/pom.xml # spring-cloud-starter/pom.xml # spring-cloud-test-support/pom.xml
2019-09-17 15:46:50 +02:00
parent afbe230b37 38db8440f1
commit bef0543c2a
1 changed files with 0 additions and 1 deletions
--- a/spring-cloud-starter/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter/src/main/resources/META-INF/spring.provides
@@ -1 +0,0 @@
-provides: spring-cloud-commons