Updated libs

edjdc · Dec 17, 2019 · a9eed36 · a9eed36
1 parent 37853c7
commit a9eed36
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 19 deletions.
diff --git a/ftgo-delivery-service/build.gradle b/ftgo-delivery-service/build.gradle
@@ -16,15 +16,19 @@ dependencies {
     compile project(":ftgo-common-jpa")
     compile project(":common-swagger")
 
-    compile "io.eventuate.tram.core:eventuate-tram-events:$eventuateTramVersion"
+    compile "io.eventuate.tram.core:eventuate-tram-events-spring:$eventuateTramVersion"
     compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
-    compile "io.eventuate.tram.core:eventuate-tram-jdbc-kafka:$eventuateTramVersion"
+    compile "io.eventuate.tram.core:eventuate-tram-jdbc-kafka-spring:$eventuateTramVersion"
 
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
     compile "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
 
+    compile('org.apache.kafka:kafka-clients:2.3.0') {
+        force = true
+    }
+
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
-    testCompile "io.eventuate.tram.core:eventuate-tram-in-memory:$eventuateTramVersion"
+    testCompile "io.eventuate.tram.core:eventuate-tram-in-memory-spring:$eventuateTramVersion"
     testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
 
     componentTestCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"

diff --git a/.../java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceInProcessComponentTest.java b/.../java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceInProcessComponentTest.java
@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.deliveryservice;
 
 import io.eventuate.tram.events.publisher.DomainEventPublisher;
-import io.eventuate.tram.events.publisher.TramEventsPublisherConfiguration;
-import io.eventuate.tram.inmemory.TramInMemoryConfiguration;
+import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration;
+import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryRepository;
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
 import net.chrisrichardson.ftgo.deliveryservice.domain.RestaurantRepository;

diff --git a/...va/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceOutOfProcessComponentTest.java b/...va/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceOutOfProcessComponentTest.java
@@ -1,7 +1,7 @@
 package net.chrisrichardson.ftgo.deliveryservice;
 
 import io.eventuate.tram.events.publisher.DomainEventPublisher;
-import io.eventuate.tram.events.publisher.TramEventsPublisherConfiguration;
+import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration;
 import io.eventuate.tram.jdbckafka.TramJdbcKafkaConfiguration;
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
 import net.chrisrichardson.ftgo.orderservice.api.OrderServiceChannels;

diff --git a/...integration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/CourierJpaTest.java b/...integration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/CourierJpaTest.java
@@ -1,11 +1,13 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
+import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -22,6 +24,7 @@ public class CourierJpaTest {
   @Configuration
   @EnableJpaRepositories
   @EnableAutoConfiguration
+  @Import(EventuateCommonJdbcOperationsConfiguration.class)
   public static class Config {
   }
 

diff --git a/...ntegration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/DeliveryJpaTest.java b/...ntegration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/DeliveryJpaTest.java
@@ -1,11 +1,13 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
+import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -18,6 +20,7 @@ public class DeliveryJpaTest {
   @Configuration
   @EnableJpaRepositories
   @EnableAutoConfiguration
+  @Import(EventuateCommonJdbcOperationsConfiguration.class)
   public static class Config {
   }
 

diff --git a/...egration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/RestaurantJpaTest.java b/...egration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/RestaurantJpaTest.java
@@ -1,11 +1,13 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
+import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -19,6 +21,7 @@ public class RestaurantJpaTest {
   @Configuration
   @EnableJpaRepositories
   @EnableAutoConfiguration
+  @Import(EventuateCommonJdbcOperationsConfiguration.class)
   public static class Config {
   }
 

diff --git a/...chrisrichardson/ftgo/deliveryservice/messaging/DeliveryServiceMessagingConfiguration.java b/...chrisrichardson/ftgo/deliveryservice/messaging/DeliveryServiceMessagingConfiguration.java
@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.deliveryservice.messaging;
 
+import io.eventuate.tram.events.spring.subscriber.TramEventSubscriberConfiguration;
 import io.eventuate.tram.events.subscriber.DomainEventDispatcher;
 import io.eventuate.tram.events.subscriber.DomainEventDispatcherFactory;
-import io.eventuate.tram.events.subscriber.TramEventSubscriberConfiguration;
 import net.chrisrichardson.ftgo.common.CommonConfiguration;
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryService;
 import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceDomainConfiguration;

diff --git a/...t/java/net/chrisrichardson/ftgo/kitchenservice/contract/DeliveryserviceMessagingBase.java b/...t/java/net/chrisrichardson/ftgo/kitchenservice/contract/DeliveryserviceMessagingBase.java
@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.kitchenservice.contract;
 
 import io.eventuate.tram.events.publisher.DomainEventPublisher;
-import io.eventuate.tram.events.publisher.TramEventsPublisherConfiguration;
-import io.eventuate.tram.inmemory.TramInMemoryConfiguration;
+import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration;
+import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
 import io.eventuate.tram.springcloudcontractsupport.EventuateContractVerifierConfiguration;
 import net.chrisrichardson.ftgo.common.CommonJsonMapperInitializer;
 import net.chrisrichardson.ftgo.kitchenservice.api.TicketDetails;

diff --git a/ftgo-order-service/build.gradle b/ftgo-order-service/build.gradle
@@ -67,7 +67,7 @@ dockerCompose {
 }
 
 integrationTest.dependsOn(integrationTestsComposeUp)
-
+componentTestsComposeUp.dependsOn(integrationTestsComposeUp)
 componentTest.dependsOn(componentTestsComposeUp)
 
 

diff --git a/...est/java/net/chrisrichardson/ftgo/orderservice/contract/DeliveryserviceMessagingBase.java b/...est/java/net/chrisrichardson/ftgo/orderservice/contract/DeliveryserviceMessagingBase.java
@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.orderservice.contract;
 
 import io.eventuate.tram.events.publisher.DomainEventPublisher;
-import io.eventuate.tram.events.publisher.TramEventsPublisherConfiguration;
-import io.eventuate.tram.inmemory.TramInMemoryConfiguration;
+import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration;
+import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
 import io.eventuate.tram.springcloudcontractsupport.EventuateContractVerifierConfiguration;
 import net.chrisrichardson.ftgo.common.CommonJsonMapperInitializer;
 import net.chrisrichardson.ftgo.orderservice.OrderDetailsMother;

diff --git a/...ion-test/java/net/chrisrichardson/ftgo/orderservice/domain/OrderJpaTestConfiguration.java b/...ion-test/java/net/chrisrichardson/ftgo/orderservice/domain/OrderJpaTestConfiguration.java
@@ -1,11 +1,14 @@
 package net.chrisrichardson.ftgo.orderservice.domain;
 
+import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @Configuration
 @EnableJpaRepositories
 @EnableAutoConfiguration
+@Import(EventuateCommonJdbcOperationsConfiguration.class)
 public class OrderJpaTestConfiguration {
 }
diff --git a/...ava/net/chrisrichardson/ftgo/restaurantservice/contract/DeliveryserviceMessagingBase.java b/...ava/net/chrisrichardson/ftgo/restaurantservice/contract/DeliveryserviceMessagingBase.java
@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.restaurantservice.contract;
 
 import io.eventuate.tram.events.publisher.DomainEventPublisher;
-import io.eventuate.tram.events.publisher.TramEventsPublisherConfiguration;
-import io.eventuate.tram.inmemory.TramInMemoryConfiguration;
+import io.eventuate.tram.events.spring.publisher.TramEventsPublisherConfiguration;
+import io.eventuate.tram.inmemory.spring.TramInMemoryConfiguration;
 import io.eventuate.tram.springcloudcontractsupport.EventuateContractVerifierConfiguration;
 import net.chrisrichardson.ftgo.common.Address;
 import net.chrisrichardson.ftgo.restaurantservice.domain.Restaurant;

diff --git a/gradle.properties b/gradle.properties
@@ -13,14 +13,14 @@ springDependencyManagementPluginVersion=1.0.3.RELEASE
 
 #         springBootVersion = '1.5.6.RELEASE'
 
-eventuateClientVersion=0.22.0.MICRONAUT.M1
+eventuateClientVersion=0.22.0-SNAPSHOT
 eventuateLocalVersion=0.31.0-SNAPSHOT
 
-eventuateTramVersion=0.23.0.MICRONAUT.M4
-eventuateTramSagasVersion=0.11.0-SNAPSHOT
+eventuateTramVersion=0.22.0-SNAPSHOT
+eventuateTramSagasVersion=0.12.0-SNAPSHOT
 eventuateUtilVersion=0.3.0.RELEASE
-eventuateCommonVersion=0.8.0.MICRONAUT.M2
-eventuateMessagingKafkaVersion=0.3.0.MICRONAUT.M3
+eventuateCommonVersion=0.8.3-SNAPSHOT
+eventuateMessagingKafkaVersion=0.5.0-SNAPSHOT
 
 #dockerComposePluginVersion=0.4.5
 dockerComposePluginVersion=0.6.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ dockerCompose { @@
     }
     integrationTest.dependsOn(integrationTestsComposeUp)
+    componentTestsComposeUp.dependsOn(integrationTestsComposeUp)
     componentTest.dependsOn(componentTestsComposeUp)
@@ Expand Down @@