Updated springboot and springcloud version (#5)

Updated deprecated versions for springboot, and springcloud, and fixed naming conventions of discoveryservice. Fixed the docker-compose files, as well as the application.yml to build the right things.

Author: jacobkissel

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'
 }
@@ -30,7 +30,7 @@ version = '0.0.1'
 sourceCompatibility = 1.8
 
 ext {
-springCloudVersion = 'Edgware.SR2'
+springCloudVersion = 'Edgware.SR3'
 }
 
 repositories {
@@ -50,13 +50,13 @@ dependencies {
 compile("org.axonframework:axon-amqp:${axonVersion}")
 compile("org.axonframework:axon-test:${axonVersion}")
 
-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-netflix-eureka-client')
 testCompile('au.com.dius:pact-jvm-provider-junit_2.11:3.5.13')
 testCompile('org.springframework.boot:spring-boot-starter-test')
 testCompile('org.codehaus.groovy:groovy-all:2.4.6')

docker-compose-dev.yml

@@ -15,7 +15,7 @@ services:
  - "5672:5672"
  - "15672:15672"
  driver-cmd:
- image: ../driver-cmd/
+ build: ../driver-cmd/
  container_name: 'driver-cmd'
  environment:
  - RABBIT_HOST=rabbitmq
@@ -25,6 +25,25 @@ services:
  depends_on:
  - rabbitmq
  - mongo
+ - discoveryservice
+
+ driver-query:
+ build: ./
+ container_name: 'driver-query'
+ environment:
+ - RABBIT_HOST=rabbitmq
+ - MONGO_HOST=mongo
+ ports:
+ - '8080'
+ depends_on:
+ - rabbitmq
+ - mongo
+ - discoveryservice
+
+ discoveryservice:
+ image: aista/eureka
+ ports:
+ - "8761:8761"
 
 volumes:
  mongo:

docker-compose.yml

@@ -13,7 +13,7 @@ services:
  - "5672:5672"
  - "15672:15672"
  driver-cmd:
- build: aista/driver-cmd/
+ image: aista/driver-cmd/
  container_name: 'driver-cmd'
  environment:
  - RABBIT_HOST=rabbitmq
@@ -23,6 +23,8 @@ services:
  depends_on:
  - rabbitmq
  - mongo
+ - discoveryservice
+
  driver-query:
  build: ./
  container_name: 'driver-query'
@@ -34,7 +36,12 @@ services:
  depends_on:
  - rabbitmq
  - mongo
- - driver-cmd
+ - discoveryservice
+
+ discoveryservice:
+ image: aista/eureka
+ ports:
+ - "8761:8761"
 
 volumes:
  mongo:

src/main/java/org/aitesting/microservices/driver/query/DriverQueryApplication.java

@@ -2,10 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.retry.annotation.Retryable;
 
 @EnableRetry
+@EnableDiscoveryClient
 @SpringBootApplication
 public class DriverQueryApplication {
 @Retryable(value = IllegalArgumentException.class, maxAttempts = 5)

src/main/resources/application.yml

@@ -37,6 +37,11 @@ logging:
  commons:
  dbcp2: DEBUG
 
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://discoveryservice:8761/eureka
+
 ---
 spring:
  profiles: test