diff --git a/eventuate-tram-spring-commands-common/src/main/java/io/eventuate/tram/spring/commands/common/TramCommandsCommonAutoConfiguration.java b/eventuate-tram-spring-commands-common/src/main/java/io/eventuate/tram/spring/commands/common/TramCommandsCommonAutoConfiguration.java index 17162b09..f22e2738 100644 --- a/eventuate-tram-spring-commands-common/src/main/java/io/eventuate/tram/spring/commands/common/TramCommandsCommonAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-commands-starter/src/main/java/io/eventuate/tram/spring/commands/autoconfigure/EventuateTramCommandsAutoConfigure.java b/eventuate-tram-spring-commands-starter/src/main/java/io/eventuate/tram/spring/commands/autoconfigure/EventuateTramCommandsAutoConfigure.java index f9da7111..886619e9 100644 --- a/eventuate-tram-spring-commands-starter/src/main/java/io/eventuate/tram/spring/commands/autoconfigure/EventuateTramCommandsAutoConfigure.java +++ b/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 { diff --git a/eventuate-tram-spring-consumer-jdbc/build.gradle b/eventuate-tram-spring-consumer-jdbc/build.gradle index 9bfec5e0..8e671095 100644 --- a/eventuate-tram-spring-consumer-jdbc/build.gradle +++ b/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" diff --git a/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java b/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java index 126f4fa0..38ae4ada 100644 --- a/eventuate-tram-spring-consumer-jdbc/src/main/java/io/eventuate/tram/spring/consumer/jdbc/TramConsumerJdbcAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-events-common/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java b/eventuate-tram-spring-events-common/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java index f87d1de1..15278bf6 100644 --- a/eventuate-tram-spring-events-common/src/main/java/io/eventuate/tram/spring/events/common/TramEventsCommonAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-events-publisher-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsPublisherAutoConfiguration.java b/eventuate-tram-spring-events-publisher-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsPublisherAutoConfiguration.java index 2c24f08a..c29c645a 100644 --- a/eventuate-tram-spring-events-publisher-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsPublisherAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsSubscriberAutoConfiguration.java b/eventuate-tram-spring-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsSubscriberAutoConfiguration.java index eff3924b..d2bfcabd 100644 --- a/eventuate-tram-spring-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/events/autoconfigure/TramEventsSubscriberAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-logging/src/main/java/io/eventuate/tram/spring/logging/LoggingMessageInterceptorAutoConfiguration.java b/eventuate-tram-spring-logging/src/main/java/io/eventuate/tram/spring/logging/LoggingMessageInterceptorAutoConfiguration.java index 8e33907a..ee8734b4 100644 --- a/eventuate-tram-spring-logging/src/main/java/io/eventuate/tram/spring/logging/LoggingMessageInterceptorAutoConfiguration.java +++ b/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() { diff --git a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramActiveMQMessageConsumerAutoConfiguration.java b/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramActiveMQMessageConsumerAutoConfiguration.java index 963e9a80..01a3229d 100644 --- a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramActiveMQMessageConsumerAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramKafkaMessageConsumerAutoConfiguration.java b/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramKafkaMessageConsumerAutoConfiguration.java index c625c036..3478aa35 100644 --- a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramKafkaMessageConsumerAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRabbitMQMessageConsumerAutoConfiguration.java b/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRabbitMQMessageConsumerAutoConfiguration.java index c286d174..f0e20354 100644 --- a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRabbitMQMessageConsumerAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRedisMessageConsumerAutoConfiguration.java b/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRedisMessageConsumerAutoConfiguration.java index 630e67b8..5c3cddc5 100644 --- a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/EventuateTramRedisMessageConsumerAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/TramMessageProducerJdbcAutoConfiguration.java b/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/TramMessageProducerJdbcAutoConfiguration.java index 4acc0d7a..d423468b 100644 --- a/eventuate-tram-spring-messaging-starter/src/main/java/io/eventuate/tram/spring/messaging/autoconfigure/TramMessageProducerJdbcAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java b/eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java index 12d224b3..ee911c4a 100644 --- a/eventuate-tram-spring-messaging/src/main/java/io/eventuate/tram/spring/messaging/common/TramMessagingCommonAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-reactive-commands-starter/src/main/java/io/eventuate/tram/spring/reactive/commands/autoconfigure/EventuateReactiveTramCommandsAutoConfigure.java b/eventuate-tram-spring-reactive-commands-starter/src/main/java/io/eventuate/tram/spring/reactive/commands/autoconfigure/EventuateReactiveTramCommandsAutoConfigure.java index fb7f00b6..419d3109 100644 --- a/eventuate-tram-spring-reactive-commands-starter/src/main/java/io/eventuate/tram/spring/reactive/commands/autoconfigure/EventuateReactiveTramCommandsAutoConfigure.java +++ b/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 { } diff --git a/eventuate-tram-spring-reactive-consumer-jdbc/build.gradle b/eventuate-tram-spring-reactive-consumer-jdbc/build.gradle index f88a0bdd..e945d76c 100644 --- a/eventuate-tram-spring-reactive-consumer-jdbc/build.gradle +++ b/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") diff --git a/eventuate-tram-spring-reactive-consumer-jdbc/src/main/java/io/eventuate/tram/spring/reactive/consumer/jdbc/ReactiveTramConsumerJdbcAutoConfiguration.java b/eventuate-tram-spring-reactive-consumer-jdbc/src/main/java/io/eventuate/tram/spring/reactive/consumer/jdbc/ReactiveTramConsumerJdbcAutoConfiguration.java index 8b5469e2..89a6e6a3 100644 --- a/eventuate-tram-spring-reactive-consumer-jdbc/src/main/java/io/eventuate/tram/spring/reactive/consumer/jdbc/ReactiveTramConsumerJdbcAutoConfiguration.java +++ b/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) diff --git a/eventuate-tram-spring-reactive-events-publisher-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsPublisherAutoConfiguration.java b/eventuate-tram-spring-reactive-events-publisher-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsPublisherAutoConfiguration.java index e3923dc2..125c6d35 100644 --- a/eventuate-tram-spring-reactive-events-publisher-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsPublisherAutoConfiguration.java +++ b/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 { } diff --git a/eventuate-tram-spring-reactive-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsSubscriberAutoConfiguration.java b/eventuate-tram-spring-reactive-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsSubscriberAutoConfiguration.java index 58237693..c62f8ea1 100644 --- a/eventuate-tram-spring-reactive-events-subscriber-starter/src/main/java/io/eventuate/tram/spring/reactive/events/autoconfigure/ReactiveTramEventsSubscriberAutoConfiguration.java +++ b/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 { } diff --git a/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/EventuateTramReactiveKafkaMessageConsumerAutoConfiguration.java b/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/EventuateTramReactiveKafkaMessageConsumerAutoConfiguration.java index fb78af65..aa42b34a 100644 --- a/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/EventuateTramReactiveKafkaMessageConsumerAutoConfiguration.java +++ b/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 { diff --git a/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/ReactiveTramMessageProducerJdbcAutoConfiguration.java b/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/ReactiveTramMessageProducerJdbcAutoConfiguration.java index b399dec5..a245767d 100644 --- a/eventuate-tram-spring-reactive-messaging-starter/src/main/java/io/eventuate/tram/spring/reactive/messaging/autoconfigure/ReactiveTramMessageProducerJdbcAutoConfiguration.java +++ b/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 { } diff --git a/eventuate-tram-spring-reactive-optimistic-locking/src/main/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfiguration.java b/eventuate-tram-spring-reactive-optimistic-locking/src/main/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfiguration.java index 36158189..5a314397 100644 --- a/eventuate-tram-spring-reactive-optimistic-locking/src/main/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfiguration.java +++ b/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 { } diff --git a/eventuate-tram-spring-reactive-optimistic-locking/src/test/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfigurationTest.java b/eventuate-tram-spring-reactive-optimistic-locking/src/test/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfigurationTest.java index 9c167472..a26b4e2b 100644 --- a/eventuate-tram-spring-reactive-optimistic-locking/src/test/java/io/eventuate/tram/spring/reactive/optimisticlocking/OptimisticLockingDecoratorAutoConfigurationTest.java +++ b/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 { } diff --git a/gradle.properties b/gradle.properties index cacdfb70..b7a5e4fa 100644 --- a/gradle.properties +++ b/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