iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Loredana
2019-05-10 23:22:52 +03:00
parent ba8fce515b 01492d1674
commit 6f7ebf8574
1803 changed files with 33727 additions and 6129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
-1
View File
@@ -50,7 +50,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>1.2.2.RELEASE</spring-cloud.version>
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
</properties>
spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
-1
View File
@@ -64,7 +64,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Edgware.SR1</spring-cloud.version>
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
</properties>
spring-cloud/spring-cloud-functions/pom.xml
-1
View File
@@ -85,7 +85,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
spring-cloud/spring-cloud-kubernetes/client-service/pom.xml
-1
View File
@@ -88,7 +88,6 @@
</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>
spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
-1
View File
@@ -44,7 +44,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
</properties>
spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
-1
View File
@@ -44,7 +44,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
</properties>
spring-cloud/spring-cloud-kubernetes/travel-agency-service/pom.xml
-1
View File
@@ -68,7 +68,6 @@
</build>
<properties>
<java.version>1.8</java.version>
<spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
</properties>
spring-cloud/spring-cloud-vault/pom.xml
-1
View File
@@ -68,7 +68,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
</properties>
spring-cloud/spring-cloud-zuul/pom.xml
-1
View File
@@ -70,7 +70,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Finchley.SR1</spring-cloud.version>
<spring-boot.version>2.0.6.RELEASE</spring-boot.version>
</properties>