Updated the version for springBoot, springCloud, and discoveryService (#13)

Updated deprecated versions for springboot, and springcloud, and fixed naming conventions of discoveryservice. Made userservice use the right repo (authentication-service) due to a rename.

Author: jacobkissel

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '1.5.9.RELEASE'
+        springBootVersion = '1.5.14.RELEASE'
     }
     repositories {
         mavenCentral()
@@ -38,21 +38,21 @@ configurations {
 }
 
 ext {
-    springCloudVersion = 'Edgware.SR1'
+    springCloudVersion = 'Edgware.SR3'
 }
 
 dependencies {
     compile('org.springframework.security:spring-security-test')
-    compile('org.springframework.cloud:spring-cloud-starter-eureka')
-    compile('org.springframework.cloud:spring-cloud-starter-hystrix')
+    compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-client')
+    compile('org.springframework.cloud:spring-cloud-starter-netflix-hystrix')
     compile('org.springframework.cloud:spring-cloud-starter-oauth2')
-    compile('org.springframework.cloud:spring-cloud-starter-zuul')
+    compile('org.springframework.cloud:spring-cloud-starter-netflix-zuul')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-actuator')
     compile('org.springframework.boot:spring-boot-starter-security')
     compile('org.springframework.data:spring-data-rest-hal-browser')
     providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
-    testCompile ('org.springframework.cloud:spring-cloud-starter-eureka-server')
+    testCompile ('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server')
     testCompile('com.jayway.restassured:rest-assured:2.5.0')
     testCompile ('com.jayway.restassured:spring-mock-mvc:2.5.0')
     testCompile ('org.springframework.cloud:spring-cloud-starter-contract-stub-runner')

docker-compose-local.yml

@@ -5,12 +5,12 @@ services:
   edgeservice:
     build: ./
     ports:
-      - "80:8080"
+      - "8080:8080"
     depends_on:
-      - discovery-service
+      - discoveryservice
 
-  discovery-service:
-    image: springcloud/eureka
+  discoveryservice:
+    image: aista/eureka
     ports:
       - "8761:8761"
 
@@ -45,9 +45,9 @@ services:
       MYSQL_DATABASE: 'user_service'
 
   userservice:
-    image: aista/user-service
+    build: ../authentication-service/
     depends_on:
-      - discovery-service
+      - discoveryservice
       - mysqlserver
     ports:
       - '8091:8091'
@@ -68,19 +68,19 @@ services:
       - "15672:15672"
 
   tripmanagementcmd:
-    image: aista/trip-management-cmd:local
+    build: ../trip-management-cmd/
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
       - rabbitmq
       - mongo
 
   tripmanagementquery:
-    image: aista/trip-management-query:local
+    build: ../trip-management-query/
     environment:
       - RABBIT_HOST=rabbitmq
       - MONGO_HOST=mongo
@@ -89,25 +89,25 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service
+      - discoveryservice
 
   gmapsadapter:
-    image: aista/gmaps-adapter:local
+    build: ../gmaps-adapter/
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
   calculationservice:
-    image: aista/calculation-service:local
+    build: ../calculation-service/
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
 volumes:
   mongo:

docker-compose.yml

@@ -5,12 +5,12 @@ services:
   edgeservice:
     build: ./
     ports:
-      - "80:8080"
+      - "8080:8080"
     depends_on:
-      - discovery-service
+      - discoveryservice
 
-  discovery-service:
-    image: springcloud/eureka
+  discoveryservice:
+    image: aista/eureka
     ports:
       - "8761:8761"
 
@@ -47,7 +47,7 @@ services:
   userservice:
     image: aista/user-service
     depends_on:
-      - discovery-service
+      - discoveryservice
       - mysqlserver
     ports:
       - '8080'
@@ -75,7 +75,7 @@ services:
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
       - rabbitmq
       - mongo
 
@@ -89,25 +89,25 @@ services:
     depends_on:
       - rabbitmq
       - mongo
-      - discovery-service
+      - discoveryservice
 
   gmapsadapter:
     image: aista/gmaps-adapter
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
   calculationservice:
     image: aista/calculation-service
     environment:
-      - EUREKA_SERVER=discovery-service
+      - EUREKA_SERVER=discoveryservice
     ports:
       - '8080'
     depends_on:
-      - discovery-service
+      - discoveryservice
 
 volumes:
   mongo:

src/main/resources/application.yml

@@ -31,7 +31,7 @@ eureka:
     registerWithEureka: true
     fetchRegistry: true
     serviceUrl:
-      defaultZone: http://discovery-service:8761/eureka/
+      defaultZone: http://discoveryservice:8761/eureka/
 management:
   security:
     enabled: false
@@ -66,7 +66,7 @@ eureka:
     registerWithEureka: true
     fetchRegistry: true
     serviceUrl:
-      defaultZone: http://discovery-service:8761/eureka/
+      defaultZone: http://discoveryservice:8761/eureka/
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 ribbon:
   ConnectTimeout: 3000