#188 Upgraded to Spring 2.17.4 and used @autoConfiguration

eventuate-tram-spring-commands-common/src/main/java/io/eventuate/tram/spring/commands/common/TramCommandsCommonAutoConfiguration.java

@@ -4,9 +4,9 @@
 import io.eventuate.tram.commands.common.DefaultCommandNameMapping;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnMissingBean(CommandNameMapping.class)
 public class TramCommandsCommonAutoConfiguration {
 

eventuate-tram-spring-commands-starter/src/main/java/io/eventuate/tram/spring/commands/autoconfigure/EventuateTramCommandsAutoConfigure.java

@@ -3,10 +3,10 @@
 import io.eventuate.tram.spring.commands.consumer.TramCommandConsumerConfiguration;
 import io.eventuate.tram.spring.commands.producer.TramCommandProducerConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(TramCommandConsumerConfiguration.class)
 @Import({TramCommandConsumerConfiguration.class, TramCommandProducerConfiguration.class})
 public class EventuateTramCommandsAutoConfigure {

eventuate-tram-spring-consumer-jdbc/build.gradle

@@ -1,5 +1,7 @@
 
 dependencies {
+    compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
+
     compile project(":eventuate-tram-consumer-jdbc")
 
     compile "io.eventuate.common:eventuate-common-spring-jdbc:$eventuateCommonVersion"

eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java

@@ -10,10 +10,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import(EventuateCommonJdbcOperationsConfiguration.class)
 @ConditionalOnMissingBean(DuplicateMessageDetector.class)
 public class TramConsumerJdbcAutoConfiguration {

eventuate-tram-spring-events-common/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java

@@ -4,9 +4,9 @@
 import io.eventuate.tram.events.common.DomainEventNameMapping;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnMissingBean(DomainEventNameMapping.class)
 public class TramEventsCommonAutoConfiguration {
 

eventuate-tram-spring-events-publisher-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsPublisherAutoConfiguration.java

@@ -2,10 +2,10 @@
 
 import io.eventuate.tram.spring.events.publisher.TramEventsPublisherConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(TramEventsPublisherConfiguration.class)
 @Import(TramEventsPublisherConfiguration.class)
 public class TramEventsPublisherAutoConfiguration {

eventuate-tram-spring-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsSubscriberAutoConfiguration.java

@@ -2,10 +2,10 @@
 
 import io.eventuate.tram.spring.events.subscriber.TramEventSubscriberConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(TramEventSubscriberConfiguration.class)
 @Import(TramEventSubscriberConfiguration.class)
 public class TramEventsSubscriberAutoConfiguration {

eventuate-tram-spring-logging/src/main/java/io/eventuate/tram/spring/logging/LoggingMessageInterceptorAutoConfiguration.java

@@ -2,9 +2,9 @@
 
 import io.eventuate.tram.messaging.common.MessageInterceptor;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 
-@Configuration
+@AutoConfiguration
 public class LoggingMessageInterceptorAutoConfiguration {
     @Bean
     public MessageInterceptor messageLoggingInterceptor() {

eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramActiveMQMessageConsumerAutoConfiguration.java

@@ -4,10 +4,10 @@
 import io.eventuate.tram.consumer.common.MessageConsumerImplementation;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(EventuateTramActiveMQMessageConsumerConfiguration.class)
 @ConditionalOnMissingBean(MessageConsumerImplementation.class)
 @Import(EventuateTramActiveMQMessageConsumerConfiguration.class)

eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramKafkaMessageConsumerAutoConfiguration.java

@@ -4,10 +4,10 @@
 import io.eventuate.tram.spring.consumer.kafka.EventuateTramKafkaMessageConsumerConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(EventuateTramKafkaMessageConsumerConfiguration.class)
 @ConditionalOnMissingBean(MessageConsumerImplementation.class)
 @Import(EventuateTramKafkaMessageConsumerConfiguration.class)

eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRabbitMQMessageConsumerAutoConfiguration.java

@@ -4,10 +4,10 @@
 import io.eventuate.tram.consumer.rabbitmq.EventuateTramRabbitMQMessageConsumerConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(EventuateTramRabbitMQMessageConsumerConfiguration.class)
 @ConditionalOnMissingBean(MessageConsumerImplementation.class)
 @Import(EventuateTramRabbitMQMessageConsumerConfiguration.class)

eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRedisMessageConsumerAutoConfiguration.java

@@ -4,10 +4,10 @@
 import io.eventuate.tram.consumer.redis.EventuateTramRedisMessageConsumerConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(EventuateTramRedisMessageConsumerConfiguration.class)
 @ConditionalOnMissingBean(MessageConsumerImplementation.class)
 @Import(EventuateTramRedisMessageConsumerConfiguration.class)

eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/TramMessageProducerJdbcAutoConfiguration.java

@@ -2,10 +2,10 @@
 
 import io.eventuate.tram.spring.messaging.producer.jdbc.TramMessageProducerJdbcConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnClass(TramMessageProducerJdbcConfiguration.class)
 @Import(TramMessageProducerJdbcConfiguration.class)
 public class TramMessageProducerJdbcAutoConfiguration {

eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java

@@ -4,9 +4,9 @@
 import io.eventuate.tram.messaging.common.DefaultChannelMapping;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 
-@Configuration
+@AutoConfiguration
 public class TramMessagingCommonAutoConfiguration {
 
   @ConditionalOnMissingBean(ChannelMapping.class)

eventuate-tram-spring-reactive-commands-starter/src/main/java/io/eventuate/tram/spring/reactive/commands/autoconfigure/EventuateReactiveTramCommandsAutoConfigure.java

@@ -2,10 +2,10 @@
 
 import io.eventuate.tram.spring.reactive.commands.consumer.ReactiveTramCommandConsumerConfiguration;
 import io.eventuate.tram.spring.reactive.commands.producer.ReactiveTramCommandProducerConfiguration;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import({ReactiveTramCommandConsumerConfiguration.class, ReactiveTramCommandProducerConfiguration.class})
 public class EventuateReactiveTramCommandsAutoConfigure {
 }

eventuate-tram-spring-reactive-consumer-jdbc/build.gradle

@@ -1,6 +1,7 @@
 
 dependencies {
     compile "io.eventuate.common:eventuate-common-spring-reactive-jdbc:$eventuateCommonVersion"
+    compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
     compile project(":eventuate-tram-reactive-consumer-jdbc")
     compile project(":eventuate-tram-reactive-consumer-common")
 

eventuate-tram-spring-reactive-consumer-jdbc/src/main/java/io/eventuate/tram/spring/reactive/consumer/jdbc/ReactiveTramConsumerJdbcAutoConfiguration.java

@@ -10,13 +10,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 import org.springframework.transaction.reactive.TransactionalOperator;
 
 import java.util.Optional;
 
-@Configuration
+@AutoConfiguration
 @Import({SqlDialectConfiguration.class,
     EventuateSchemaConfiguration.class})
 @ConditionalOnMissingBean(ReactiveDuplicateMessageDetector.class)

eventuate-tram-spring-reactive-events-publisher-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsPublisherAutoConfiguration.java

@@ -1,10 +1,10 @@
 package io.eventuate.tram.spring.reactive.events.autoconfigure;
 
 import io.eventuate.tram.spring.events.publisher.ReactiveTramEventsPublisherConfiguration;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import(ReactiveTramEventsPublisherConfiguration.class)
 public class ReactiveTramEventsPublisherAutoConfiguration {
 }

eventuate-tram-spring-reactive-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsSubscriberAutoConfiguration.java

@@ -1,10 +1,10 @@
 package io.eventuate.tram.spring.reactive.events.autoconfigure;
 
 import io.eventuate.tram.spring.reactive.events.subscriber.ReactiveTramEventSubscriberConfiguration;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import(ReactiveTramEventSubscriberConfiguration.class)
 public class ReactiveTramEventsSubscriberAutoConfiguration {
 }

eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/EventuateTramReactiveKafkaMessageConsumerAutoConfiguration.java

@@ -3,10 +3,10 @@
 import io.eventuate.tram.consumer.common.MessageConsumerImplementation;
 import io.eventuate.tram.spring.reactive.consumer.kafka.EventuateTramReactiveKafkaMessageConsumerConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @ConditionalOnMissingBean(MessageConsumerImplementation.class)
 @Import(EventuateTramReactiveKafkaMessageConsumerConfiguration.class)
 public class EventuateTramReactiveKafkaMessageConsumerAutoConfiguration {

eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/ReactiveTramMessageProducerJdbcAutoConfiguration.java

@@ -1,10 +1,10 @@
 package io.eventuate.tram.spring.reactive.messaging.autoconfigure;
 
 import io.eventuate.tram.spring.messaging.producer.jdbc.reactive.ReactiveTramMessageProducerJdbcConfiguration;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import(ReactiveTramMessageProducerJdbcConfiguration.class)
 public class ReactiveTramMessageProducerJdbcAutoConfiguration {
 }

eventuate-tram-spring-reactive-optimistic-locking/src/main/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfiguration.java

@@ -1,9 +1,9 @@
 package io.eventuate.tram.spring.reactive.optimisticlocking;
 
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@Configuration
+@AutoConfiguration
 @Import(OptimisticLockingDecoratorConfiguration.class)
 public class OptimisticLockingDecoratorAutoConfiguration {
 }

eventuate-tram-spring-reactive-optimistic-locking/src/test/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfigurationTest.java

@@ -7,14 +7,14 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = OptimisticLockingDecoratorAutoConfigurationTest.Config.class)
 public class OptimisticLockingDecoratorAutoConfigurationTest extends TestCase {
 
-    @Configuration
+    @AutoConfiguration
     @EnableAutoConfiguration(exclude= DataSourceAutoConfiguration.class)
     public static class Config {
     }

gradle.properties

@@ -5,8 +5,8 @@ eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://snapshots.reposit
 
 eventuatePluginsGradleVersion=0.13.0.BUILD-SNAPSHOT
 
-springBootVersion=2.6.11
-springBootCdcVersion=2.6.11
+springBootVersion=2.7.14
+springBootCdcVersion=2.7.14
 micronautVersion=2.4.1
 micronautDataVersion=2.3.1
 eventuateUtilVersion=0.17.0.BUILD-SNAPSHOT