Skip to content

Commit 3f5f32b

Browse files
committed
Bring back provider for modifiedFiles
Turns out Antora build fails on `grgit.status()` therefore we have to defer its evaluation until the `updateCopyrights` is called * Fix some typos in `whats-new.adoc`
1 parent 205a6dc commit 3f5f32b

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

build.gradle

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ ext {
4646
linkScmDevConnection = 'scm:git:ssh://[email protected]:spring-projects/spring-integration.git'
4747

4848
modifiedFiles =
49-
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
49+
providers.provider {
50+
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
51+
}
5052

5153
apacheSshdVersion = '2.10.0'
5254
artemisVersion = '2.29.0'
@@ -290,7 +292,7 @@ configure(javaProjects) { subproject ->
290292

291293
tasks.register('updateCopyrights') {
292294
onlyIf { !isCI }
293-
inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
295+
inputs.files(modifiedFiles.map(files -> files.filter { f -> f.path.contains(subproject.name) }))
294296
outputs.dir('build/classes')
295297

296298
doLast {
@@ -492,7 +494,7 @@ project('spring-integration-camel') {
492494
api 'org.apache.camel:camel-core-model'
493495

494496
testImplementation 'org.apache.camel:camel-test-junit5'
495-
testImplementation ('org.apache.camel:camel-spring') {
497+
testImplementation('org.apache.camel:camel-spring') {
496498
exclude group: 'org.springframework'
497499
}
498500
}
@@ -505,7 +507,7 @@ project('spring-integration-cassandra') {
505507
api project(':spring-integration-core')
506508
api 'org.springframework.data:spring-data-cassandra'
507509

508-
testImplementation ('org.testcontainers:cassandra') {
510+
testImplementation('org.testcontainers:cassandra') {
509511
exclude group: 'com.datastax.cassandra'
510512
}
511513
}
@@ -538,7 +540,7 @@ project('spring-integration-core') {
538540
optionalApi "com.jayway.jsonpath:json-path:$jsonpathVersion"
539541
optionalApi "com.esotericsoftware:kryo:$kryoVersion"
540542
optionalApi 'io.micrometer:micrometer-core'
541-
optionalApi ('io.micrometer:micrometer-tracing') {
543+
optionalApi('io.micrometer:micrometer-tracing') {
542544
exclude group: 'aopalliance'
543545
}
544546
optionalApi "io.github.resilience4j:resilience4j-ratelimiter:$resilience4jVersion"
@@ -548,7 +550,7 @@ project('spring-integration-core') {
548550
testImplementation "com.google.protobuf:protobuf-java-util:$protobufVersion"
549551
testImplementation "org.aspectj:aspectjweaver:$aspectjVersion"
550552
testImplementation 'io.micrometer:micrometer-observation-test'
551-
testImplementation ('io.micrometer:micrometer-tracing-integration-test') {
553+
testImplementation('io.micrometer:micrometer-tracing-integration-test') {
552554
exclude group: 'io.opentelemetry'
553555
exclude group: 'com.wavefront'
554556
exclude group: 'io.micrometer', module: 'micrometer-tracing-bridge-otel'
@@ -637,13 +639,13 @@ project('spring-integration-ftp') {
637639
}
638640

639641
project('spring-integration-graphql') {
640-
description = 'Spring Integration GraphQL Support'
641-
dependencies {
642-
api project(':spring-integration-core')
643-
api "org.springframework.graphql:spring-graphql:$springGraphqlVersion"
642+
description = 'Spring Integration GraphQL Support'
643+
dependencies {
644+
api project(':spring-integration-core')
645+
api "org.springframework.graphql:spring-graphql:$springGraphqlVersion"
644646

645647
testImplementation 'org.springframework:spring-web'
646-
}
648+
}
647649
}
648650

649651
project('spring-integration-groovy') {
@@ -741,7 +743,7 @@ project('spring-integration-jdbc') {
741743
testImplementation "org.apache.derby:derbyclient:$derbyVersion"
742744
testImplementation "org.postgresql:postgresql:$postgresVersion"
743745
testImplementation "mysql:mysql-connector-java:$mysqlVersion"
744-
testImplementation ("org.apache.commons:commons-dbcp2:$commonsDbcp2Version") {
746+
testImplementation("org.apache.commons:commons-dbcp2:$commonsDbcp2Version") {
745747
exclude group: 'commons-logging'
746748
}
747749
testImplementation 'org.testcontainers:mysql'
@@ -922,7 +924,7 @@ project('spring-integration-sftp') {
922924
dependencies {
923925
api project(':spring-integration-file')
924926
api 'org.springframework:spring-context-support'
925-
api ("org.apache.sshd:sshd-sftp:$apacheSshdVersion") {
927+
api("org.apache.sshd:sshd-sftp:$apacheSshdVersion") {
926928
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
927929
}
928930

@@ -1014,7 +1016,7 @@ project('spring-integration-webflux') {
10141016
}
10151017
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
10161018
testImplementation 'io.micrometer:micrometer-observation-test'
1017-
testImplementation ('io.micrometer:micrometer-tracing-integration-test') {
1019+
testImplementation('io.micrometer:micrometer-tracing-integration-test') {
10181020
exclude group: 'io.opentelemetry'
10191021
exclude group: 'com.wavefront'
10201022
exclude group: 'io.micrometer', module: 'micrometer-tracing-bridge-otel'
@@ -1092,12 +1094,12 @@ project('spring-integration-xml') {
10921094
}
10931095

10941096
project('spring-integration-xmpp') {
1095-
description = 'Spring Integration XMPP Support'
1096-
dependencies {
1097-
api project(':spring-integration-core')
1098-
api "org.igniterealtime.smack:smack-tcp:$smackVersion"
1099-
api "org.igniterealtime.smack:smack-java8:$smackVersion"
1100-
api "org.igniterealtime.smack:smack-extensions:$smackVersion"
1097+
description = 'Spring Integration XMPP Support'
1098+
dependencies {
1099+
api project(':spring-integration-core')
1100+
api "org.igniterealtime.smack:smack-tcp:$smackVersion"
1101+
api "org.igniterealtime.smack:smack-java8:$smackVersion"
1102+
api "org.igniterealtime.smack:smack-extensions:$smackVersion"
11011103

11021104
testImplementation project(':spring-integration-stream')
11031105
testImplementation "org.igniterealtime.smack:smack-experimental:$smackVersion"

src/reference/antora/modules/ROOT/pages/whats-new.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ See, for example, `transformWith()`, `splitWith()` in xref:dsl.adoc#java-dsl[ Ja
3737
See xref:configuration/global-properties.adoc[Global Properties] for more information.
3838

3939
- The `@MessagingGateway` and `GatewayEndpointSpec` provided by the Java DSL now expose the `errorOnTimeout` property of the internal `MethodInvocationGateway` extension of the `MessagingGatewaySupport`.
40-
See xref:gateway.adoc#gateway-no-response[ Gateway Behavior When No response Arrives] for more information.
40+
See xref:gateway.adoc#gateway-no-response[Gateway Behavior When No response Arrives] for more information.
41+
4142
[[x6.2-websockets]]
4243
=== WebSockets Changes
4344

4445
- For the server and client WebSocket containers, the send buffer overflow strategy is now configurable in `IntegrationWebSocketContainer` and in XML via `send-buffer-overflow-strategy`.
4546
This strategy determines the behavior when a session's outbound message buffer has reached the configured limit.
4647
See xref:web-sockets.adoc#websocket-client-container-attributes[WebSockets Support] for more information.
4748

48-
4949
[[x6.2-kafka]]
5050
=== Apache Kafka Support Changes
5151

0 commit comments

Comments
 (0)