@@ -260,6 +260,10 @@ configure(javaProjects) { subproject ->
260
260
}
261
261
}
262
262
263
+ if (! (subproject. name ! in [' spring-integration-test-support' , ' spring-integration-core' ])) {
264
+ api project(' :spring-integration-core' )
265
+ }
266
+
263
267
// JSR-305 only used for non-required meta-annotations
264
268
compileOnly " com.google.code.findbugs:annotations:$findbugsVersion "
265
269
testImplementation " com.google.code.findbugs:annotations:$findbugsVersion "
@@ -472,17 +476,10 @@ project('spring-integration-test-support') {
472
476
project(' spring-integration-amqp' ) {
473
477
description = ' Spring Integration AMQP Support'
474
478
dependencies {
475
- api project(' :spring-integration-core' )
476
- api(' org.springframework.amqp:spring-rabbit' ) {
477
- exclude group : ' org.springframework'
478
- }
479
- optionalApi(' org.springframework.amqp:spring-rabbit-stream' ) {
480
- exclude group : ' org.springframework'
481
- }
479
+ api ' org.springframework.amqp:spring-rabbit'
480
+ optionalApi ' org.springframework.amqp:spring-rabbit-stream'
482
481
483
- testImplementation(' org.springframework.amqp:spring-rabbit-junit' ) {
484
- exclude group : ' org.springframework'
485
- }
482
+ testImplementation ' org.springframework.amqp:spring-rabbit-junit'
486
483
testImplementation project(' :spring-integration-stream' )
487
484
testImplementation ' org.springframework:spring-web'
488
485
testImplementation ' org.testcontainers:rabbitmq'
@@ -494,7 +491,6 @@ project('spring-integration-camel') {
494
491
description = ' Spring Integration support for Apache Camel'
495
492
496
493
dependencies {
497
- api project(' :spring-integration-core' )
498
494
api ' org.apache.camel:camel-core-model'
499
495
500
496
testImplementation ' org.apache.camel:camel-test-junit5'
@@ -508,12 +504,10 @@ project('spring-integration-cassandra') {
508
504
description = ' Spring Integration Support for Apache Cassandra'
509
505
510
506
dependencies {
511
- api project(' :spring-integration-core' )
512
507
api ' org.springframework.data:spring-data-cassandra'
513
508
514
- testImplementation(' org.testcontainers:cassandra' ) {
515
- exclude group : ' com.datastax.cassandra'
516
- }
509
+ testImplementation ' org.testcontainers:cassandra'
510
+ testRuntimeOnly " commons-io:commons-io:$commonsIoVersion "
517
511
}
518
512
}
519
513
@@ -585,7 +579,6 @@ project('spring-integration-core') {
585
579
project(' spring-integration-debezium' ) {
586
580
description = ' Spring Integration Debezium Support'
587
581
dependencies {
588
- api project(' :spring-integration-core' )
589
582
api(" io.debezium:debezium-embedded:$debeziumVersion " ) {
590
583
exclude group : ' org.glassfish.jersey.containers' , module : ' jersey-container-servlet'
591
584
exclude group : ' org.glassfish.jersey.inject' , module : ' jersey-hk2'
@@ -601,23 +594,18 @@ project('spring-integration-debezium') {
601
594
602
595
project(' spring-integration-event' ) {
603
596
description = ' Spring Integration ApplicationEvent Support'
604
- dependencies {
605
- api project(' :spring-integration-core' )
606
- }
607
597
}
608
598
609
599
project(' spring-integration-feed' ) {
610
600
description = ' Spring Integration RSS Feed Support'
611
601
dependencies {
612
- api project(' :spring-integration-core' )
613
602
api " com.rometools:rome:$romeToolsVersion "
614
603
}
615
604
}
616
605
617
606
project(' spring-integration-file' ) {
618
607
description = ' Spring Integration File Support'
619
608
dependencies {
620
- api project(' :spring-integration-core' )
621
609
api " commons-io:commons-io:$commonsIoVersion "
622
610
623
611
testImplementation project(' :spring-integration-redis' )
@@ -645,7 +633,6 @@ project('spring-integration-ftp') {
645
633
project(' spring-integration-graphql' ) {
646
634
description = ' Spring Integration GraphQL Support'
647
635
dependencies {
648
- api project(' :spring-integration-core' )
649
636
api " org.springframework.graphql:spring-graphql:$springGraphqlVersion "
650
637
651
638
testImplementation ' org.springframework:spring-web'
@@ -676,7 +663,6 @@ project('spring-integration-groovy') {
676
663
project(' spring-integration-hazelcast' ) {
677
664
description = ' Spring Integration Hazelcast Support'
678
665
dependencies {
679
- api project(' :spring-integration-core' )
680
666
api " com.hazelcast:hazelcast:$hazelcastVersion "
681
667
682
668
testImplementation project(' :spring-integration-jmx' )
@@ -696,7 +682,6 @@ project('spring-integration-hazelcast') {
696
682
project(' spring-integration-http' ) {
697
683
description = ' Spring Integration HTTP Support'
698
684
dependencies {
699
- api project(' :spring-integration-core' )
700
685
api ' org.springframework:spring-webmvc'
701
686
providedImplementation " jakarta.servlet:jakarta.servlet-api:$servletApiVersion "
702
687
optionalApi " com.rometools:rome:$romeToolsVersion "
@@ -715,7 +700,6 @@ project('spring-integration-http') {
715
700
project(' spring-integration-ip' ) {
716
701
description = ' Spring Integration IP Support'
717
702
dependencies {
718
- api project(' :spring-integration-core' )
719
703
testImplementation project(' :spring-integration-stream' )
720
704
testImplementation project(' :spring-integration-event' )
721
705
@@ -732,7 +716,6 @@ project('spring-integration-ip') {
732
716
project(' spring-integration-jdbc' ) {
733
717
description = ' Spring Integration JDBC Support'
734
718
dependencies {
735
- api project(' :spring-integration-core' )
736
719
api ' org.springframework:spring-jdbc'
737
720
optionalApi " org.postgresql:postgresql:$postgresVersion "
738
721
@@ -758,7 +741,6 @@ project('spring-integration-jdbc') {
758
741
project(' spring-integration-jms' ) {
759
742
description = ' Spring Integration JMS Support'
760
743
dependencies {
761
- api project(' :spring-integration-core' )
762
744
api ' org.springframework:spring-jms'
763
745
providedImplementation " jakarta.jms:jakarta.jms-api:$jmsApiVersion "
764
746
@@ -775,22 +757,17 @@ project('spring-integration-jms') {
775
757
project(' spring-integration-jmx' ) {
776
758
description = ' Spring Integration JMX Support'
777
759
dependencies {
778
- api project(' :spring-integration-core' )
779
-
780
760
testImplementation " org.aspectj:aspectjweaver:$aspectjVersion "
781
761
}
782
762
}
783
763
784
764
project(' spring-integration-jpa' ) {
785
765
description = ' Spring Integration JPA Support'
786
766
dependencies {
787
- api project(' :spring-integration-core' )
788
767
api ' org.springframework:spring-orm'
789
768
optionalApi " jakarta.persistence:jakarta.persistence-api:$jpaApiVersion "
790
769
791
- testImplementation(' org.springframework.data:spring-data-jpa' ) {
792
- exclude group : ' org.springframework'
793
- }
770
+ testImplementation ' org.springframework.data:spring-data-jpa'
794
771
testImplementation " com.h2database:h2:$h2Version "
795
772
testImplementation " org.hibernate.orm:hibernate-core:$hibernateVersion "
796
773
}
@@ -799,10 +776,7 @@ project('spring-integration-jpa') {
799
776
project(' spring-integration-kafka' ) {
800
777
description = ' Spring Integration for Apache Kafka'
801
778
dependencies {
802
- api project(' :spring-integration-core' )
803
- api(' org.springframework.kafka:spring-kafka' ) {
804
- exclude group : ' org.springframework'
805
- }
779
+ api ' org.springframework.kafka:spring-kafka'
806
780
807
781
testImplementation ' org.springframework.kafka:spring-kafka-test'
808
782
testImplementation ' com.fasterxml.jackson.core:jackson-databind'
@@ -812,7 +786,6 @@ project('spring-integration-kafka') {
812
786
project(' spring-integration-mail' ) {
813
787
description = ' Spring Integration Mail Support'
814
788
dependencies {
815
- api project(' :spring-integration-core' )
816
789
api ' org.springframework:spring-context-support'
817
790
818
791
providedImplementation " org.eclipse.angus:jakarta.mail:$mailVersion "
@@ -826,10 +799,8 @@ project('spring-integration-mail') {
826
799
project(' spring-integration-mongodb' ) {
827
800
description = ' Spring Integration MongoDB Support'
828
801
dependencies {
829
- api project(' :spring-integration-core' )
830
- api(' org.springframework.data:spring-data-mongodb' ) {
831
- exclude group : ' org.springframework'
832
- }
802
+ api ' org.springframework.data:spring-data-mongodb'
803
+
833
804
optionalApi " org.mongodb:mongodb-driver-sync:$mongoDriverVersion "
834
805
optionalApi " org.mongodb:mongodb-driver-reactivestreams:$mongoDriverVersion "
835
806
@@ -840,10 +811,7 @@ project('spring-integration-mongodb') {
840
811
project(' spring-integration-r2dbc' ) {
841
812
description = ' Spring Integration R2DBC Support'
842
813
dependencies {
843
- api project(' :spring-integration-core' )
844
- api(' org.springframework.data:spring-data-r2dbc' ) {
845
- exclude group : ' org.springframework'
846
- }
814
+ api ' org.springframework.data:spring-data-r2dbc'
847
815
api ' org.springframework:spring-r2dbc'
848
816
849
817
testImplementation " io.r2dbc:r2dbc-h2:$r2dbch2Version "
@@ -853,8 +821,8 @@ project('spring-integration-r2dbc') {
853
821
project(' spring-integration-mqtt' ) {
854
822
description = ' Spring Integration MQTT Support'
855
823
dependencies {
856
- api project(' :spring-integration-core' )
857
824
api " org.eclipse.paho:org.eclipse.paho.client.mqttv3:$pahoMqttClientVersion "
825
+
858
826
optionalApi " org.eclipse.paho:org.eclipse.paho.mqttv5.client:$pahoMqttClientVersion "
859
827
860
828
testImplementation project(' :spring-integration-jmx' )
@@ -865,11 +833,7 @@ project('spring-integration-mqtt') {
865
833
project(' spring-integration-redis' ) {
866
834
description = ' Spring Integration Redis Support'
867
835
dependencies {
868
- api project(' :spring-integration-core' )
869
- api(' org.springframework.data:spring-data-redis' ) {
870
- exclude group : ' org.springframework'
871
- }
872
-
836
+ api ' org.springframework.data:spring-data-redis'
873
837
testImplementation " io.lettuce:lettuce-core:$lettuceVersion "
874
838
testImplementation ' com.fasterxml.jackson.core:jackson-databind'
875
839
}
@@ -882,15 +846,13 @@ project('spring-integration-redis') {
882
846
project(' spring-integration-rsocket' ) {
883
847
description = ' Spring Integration RSocket Support'
884
848
dependencies {
885
- api project(' :spring-integration-core' )
886
849
api " io.rsocket:rsocket-transport-netty:$rsocketVersion "
887
850
}
888
851
}
889
852
890
853
project(' spring-integration-scripting' ) {
891
854
description = ' Spring Integration Scripting Support'
892
855
dependencies {
893
- api project(' :spring-integration-core' )
894
856
optionalApi ' org.jetbrains.kotlin:kotlin-scripting-jsr223'
895
857
providedImplementation " org.graalvm.sdk:graal-sdk:$graalvmVersion "
896
858
providedImplementation " org.graalvm.js:js:$graalvmVersion "
@@ -911,10 +873,7 @@ project('spring-integration-scripting') {
911
873
project(' spring-integration-security' ) {
912
874
description = ' Spring Integration Security Support'
913
875
dependencies {
914
- api project(' :spring-integration-core' )
915
876
api ' org.springframework.security:spring-security-messaging'
916
-
917
- testImplementation ' org.springframework.security:spring-security-config'
918
877
}
919
878
}
920
879
@@ -947,7 +906,6 @@ project('spring-integration-smb') {
947
906
project(' spring-integration-stomp' ) {
948
907
description = ' Spring Integration STOMP Support'
949
908
dependencies {
950
- api project(' :spring-integration-core' )
951
909
optionalApi ' org.springframework:spring-websocket'
952
910
953
911
testImplementation project(' :spring-integration-websocket' )
@@ -973,9 +931,6 @@ project('spring-integration-stomp') {
973
931
974
932
project(' spring-integration-stream' ) {
975
933
description = ' Spring Integration Stream Support'
976
- dependencies {
977
- api project(' :spring-integration-core' )
978
- }
979
934
980
935
tasks. withType(JavaForkOptions ) {
981
936
jvmArgs ' --add-opens' , ' java.base/java.io=ALL-UNNAMED'
@@ -992,7 +947,6 @@ project('spring-integration-syslog') {
992
947
project(' spring-integration-test' ) {
993
948
description = ' Spring Integration Testing Framework'
994
949
dependencies {
995
- api project(' :spring-integration-core' )
996
950
api project(' :spring-integration-test-support' )
997
951
}
998
952
}
@@ -1026,7 +980,6 @@ project('spring-integration-webflux') {
1026
980
project(' spring-integration-websocket' ) {
1027
981
description = ' Spring Integration WebSockets Support'
1028
982
dependencies {
1029
- api project(' :spring-integration-core' )
1030
983
api ' org.springframework:spring-websocket'
1031
984
optionalApi ' org.springframework:spring-webmvc'
1032
985
providedImplementation " jakarta.servlet:jakarta.servlet-api:$servletApiVersion "
@@ -1047,7 +1000,6 @@ project('spring-integration-websocket') {
1047
1000
project(' spring-integration-ws' ) {
1048
1001
description = ' Spring Integration Web Services Support'
1049
1002
dependencies {
1050
- api project(' :spring-integration-core' )
1051
1003
api ' org.springframework:spring-oxm'
1052
1004
api ' org.springframework:spring-webmvc'
1053
1005
api(' org.springframework.ws:spring-ws-core' ) {
@@ -1072,7 +1024,6 @@ project('spring-integration-ws') {
1072
1024
project(' spring-integration-xml' ) {
1073
1025
description = ' Spring Integration XML Support'
1074
1026
dependencies {
1075
- api project(' :spring-integration-core' )
1076
1027
api ' org.springframework:spring-oxm'
1077
1028
api(' org.springframework.ws:spring-xml' ) {
1078
1029
exclude group : ' org.springframework'
@@ -1093,7 +1044,6 @@ project('spring-integration-xml') {
1093
1044
project(' spring-integration-xmpp' ) {
1094
1045
description = ' Spring Integration XMPP Support'
1095
1046
dependencies {
1096
- api project(' :spring-integration-core' )
1097
1047
api " org.igniterealtime.smack:smack-tcp:$smackVersion "
1098
1048
api " org.igniterealtime.smack:smack-java8:$smackVersion "
1099
1049
api " org.igniterealtime.smack:smack-extensions:$smackVersion "
@@ -1106,7 +1056,6 @@ project('spring-integration-xmpp') {
1106
1056
project(' spring-integration-zeromq' ) {
1107
1057
description = ' Spring Integration ZeroMQ Support'
1108
1058
dependencies {
1109
- api project(' :spring-integration-core' )
1110
1059
api " org.zeromq:jeromq:$jeroMqVersion "
1111
1060
1112
1061
optionalApi ' com.fasterxml.jackson.core:jackson-databind'
@@ -1125,7 +1074,6 @@ project('spring-integration-zip') {
1125
1074
project(' spring-integration-zookeeper' ) {
1126
1075
description = ' Spring Integration Zookeeper Support'
1127
1076
dependencies {
1128
- api project(' :spring-integration-core' )
1129
1077
api " org.apache.curator:curator-recipes:$curatorVersion "
1130
1078
1131
1079
testImplementation " org.apache.curator:curator-test:$curatorVersion "
0 commit comments