feature/updatingImageandVersions (#18)

Updated deprecated versions for springboot, and springcloud, and fixed naming conventions of discoveryservice.

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.10.RELEASE'
+		springBootVersion = '1.5.14.RELEASE'
 		verifierVersion = '1.2.3.RELEASE'
 		axonVersion = '3.1.2'
 		springfoxVersion = '2.7.0'
@@ -32,7 +32,7 @@ version = '0.0.1'
 sourceCompatibility = 1.8
 
 ext {
-	springCloudVersion = 'Edgware.SR2'
+	springCloudVersion = 'Edgware.SR3'
 }
 
 repositories {
@@ -54,13 +54,13 @@ dependencies {
 	compile("io.springfox:springfox-swagger2:${springfoxVersion}")
 	compile("io.springfox:springfox-swagger-ui:${springfoxVersion}")
 
-	compile('org.springframework.retry:spring-retry:1.1.2.RELEASE')
+	compile('org.springframework.retry:spring-retry:1.2.2.RELEASE')
 
 	compile('org.springframework.boot:spring-boot-starter-amqp')
 	compile('org.springframework.boot:spring-boot-starter-data-mongodb')
 	compile('org.springframework.boot:spring-boot-starter-web')
 	compile('org.springframework.boot:spring-boot-starter-aop')
-	compile('org.springframework.cloud:spring-cloud-starter-eureka')
+	compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
 
 	testCompile('au.com.dius:pact-jvm-provider-junit_2.11:3.5.13')
 	testCompile('org.springframework.boot:spring-boot-starter-test')

docker-compose-dev.yml

@@ -24,9 +24,9 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service
-  discovery-service:
-    image: springcloud/eureka
+      - discoveryservice
+  discoveryservice:
+    image: aista/eureka
     ports:
       - "8761:8761"
 

docker-compose.yml

@@ -35,9 +35,9 @@ services:
       - rabbitmq
       - mongo
       - tripmanagementcmd
-      - discovery-service
-  discovery-service:
-    image: springcloud/eureka
+      - discoveryservice
+  discoveryservice:
+    image: aista/eureka
     ports:
       - "8761:8761"
 

src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://discovery-service:8761/eureka/
+      defaultZone: http://discoveryservice:8761/eureka/
 
 server:
   port: ${APP_PORT:8080}