Merge branch 'wip-spring-boot-2' into wip-observability

Author: cer

.gitignore

@@ -8,3 +8,7 @@ out
 target
 .serverless
 *.pid
+.classpath
+.project
+.settings
+bin

README.adoc

@@ -2,12 +2,14 @@
 
 This is the example code for my book https://www.manning.com/books/microservice-patterns[Microservice patterns].
 
+image::http://microservices.io/i/Microservices-Patterns-Cover.png[width=50%]
+
 == Please note
 
 * The code is still work in progress
 * It primarily illustrates the technical aspects of the microservice architecture and so the business logic is minimal
 * The documentation is sparse/non-existent and you will need to look in the book
-* The application consists of many services and so requires a lot of memory. It runs well, for example, on a 16MB Macbook pro.
+* The application consists of many services and so requires a lot of memory. It runs well, for example, on a 16GB Macbook pro.
 * The application's services and the infrastructure services, such as MySQL and Apache Kafka, are deployed using Docker containers using either Docker Compose or Kubernetes.
 
 == Got questions

build-contracts.sh

@@ -1,15 +1,16 @@
 #! /bin/bash -e
 
-CONTRACT_DIRS="common-contracts ftgo-order-service-contracts ftgo-restaurant-order-service-contracts"
+CONTRACT_DIRS="ftgo-accounting-service-contracts ftgo-consumer-service-contracts ftgo-order-service-contracts ftgo-restaurant-order-service-contracts"
 
 COMMAND=$*
 
 if [[ -z "$COMMAND" ]] ; then
-   COMMAND=install
+   COMMAND=publish
 fi
 
 echo Using $COMMAND
 
 for dir in $CONTRACT_DIRS ; do
- (cd $dir ; ./mvnw $COMMAND)
+ (cd $dir ; ../gradlew $COMMAND)
+# (cd $dir ; rm -fr {out,build} ; ./mvnw $COMMAND)
  done

build.gradle

@@ -15,16 +15,22 @@ subprojects {
     sourceCompatibility = '1.8'
     targetCompatibility = '1.8'
 
+    group = "net.chrisrichardson.ftgo"
+
     repositories {
         mavenCentral()
         jcenter()
+
+        eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }
+
         maven {
-            url "https://dl.bintray.com/eventuateio-oss/eventuate-maven-release"
+            url 'https://repo.spring.io/libs-milestone'
+        }
+
+        maven {
+            url "${project.rootDir}/build/repo"
         }
-        eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }
 
-        // For the contracts
-        mavenLocal()
     }
 
 }

buildSrc/src/main/groovy/ComponentTestsPlugin.groovy

@@ -6,6 +6,9 @@ class ComponentTestsPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
+    
+    	project.apply(plugin: 'eclipse')
+    	
         project.sourceSets {
             componentTest {
                 java {
@@ -22,6 +25,8 @@ class ComponentTestsPlugin implements Plugin<Project> {
             componentTestRuntime.extendsFrom testRuntime
         }
 
+		project.eclipse.classpath.plusConfigurations << project.configurations.componentTestCompile
+
         project.task("componentTest", type: Test) {
             testClassesDir = project.sourceSets.componentTest.output.classesDir
             classpath = project.sourceSets.componentTest.runtimeClasspath