Merge branch 'master' into BAEL-2460

# Conflicts: # spring-cloud/spring-cloud-kubernetes-2/pom.xml
2019-04-09 20:43:32 +02:00
parent 1750079cfc 713972cdf0
commit a93088bca6
1514 changed files with 89557 additions and 5710 deletions
@@ -12,12 +12,6 @@
        <version>1.0-SNAPSHOT</version>
    </parent>

-    <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
-        <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
-    </properties>
-
    <dependencyManagement>
        <dependencies>
            <dependency>
@@ -93,4 +87,10 @@
        </plugins>
    </build>

+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
+    </properties>
+
 </project>