SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 1.0.x merge conflicts on poms

Browse Source
This commit is contained in:
Haytham Mohamed
2019-09-18 12:38:55 -05:00
parent df5297cecc
commit a290d772a1
13 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
View File

@@ -23,11 +23,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>greeting-service</artifactId>

4
spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
View File

@@ -23,11 +23,7 @@
<parent>
<artifactId>spring-cloud-kubernetes-examples</artifactId>
<groupId>org.springframework.cloud</groupId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<groupId>org.springframework.cloud</groupId>

4
spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
View File

@@ -5,11 +5,7 @@
<parent>
<artifactId>spring-cloud-kubernetes-examples</artifactId>
<groupId>org.springframework.cloud</groupId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<modelVersion>4.0.0</modelVersion>

4
spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
View File

@@ -6,11 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-examples</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>kubernetes-leader-election-example</artifactId>

4
spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
View File

@@ -22,11 +22,7 @@
<parent>
<artifactId>spring-cloud-kubernetes-examples</artifactId>
<groupId>org.springframework.cloud</groupId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<modelVersion>4.0.0</modelVersion>

4
spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
View File

@@ -22,11 +22,7 @@
<parent>
<artifactId>spring-cloud-kubernetes-examples</artifactId>
<groupId>org.springframework.cloud</groupId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<modelVersion>4.0.0</modelVersion>

4
spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>discovery-parent</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>discovery-client</artifactId>

4
spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>discovery-parent</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>discovery-service-a</artifactId>

4
spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>discovery-parent</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>discovery-service-b</artifactId>

4
spring-cloud-kubernetes-integration-tests/discovery/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>

4
spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>discovery-parent</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<artifactId>tests</artifactId>

4
spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>

4
spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
<<<<<<< HEAD
<version>1.1.0.BUILD-SNAPSHOT</version>
=======
<version>1.0.4.BUILD-SNAPSHOT</version>
>>>>>>> 1.0.x
</parent>
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>