Various docs fixes

* Remove unused from now on assets
* Fix `nav.adoc` order
* Fix some typos in the docs
* Fix links to SF docs on Antora
* Modify Gradle build files according to tasks registration recommendations
* Fix `antora.yml` removing `jvmargs` option since this cause the build failure on Windows

Author: artembilan

build.gradle

@@ -21,7 +21,7 @@ plugins {
     id 'org.ajoberstar.grgit' version '4.1.1'
     id 'io.spring.dependency-management' version '1.1.2'
     id 'com.jfrog.artifactory' version '4.33.1' apply false
-    id 'org.jetbrains.dokka' version "1.8.20"
+    id 'org.jetbrains.dokka' version '1.8.20'
     id 'org.antora' version '1.0.0'
     id 'io.spring.antora.generate-antora-yml' version '0.0.1'
 }
@@ -288,7 +288,7 @@ configure(javaProjects) { subproject ->
     ext.xLintArg = '-Xlint:all,-options,-processing'
     [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg, '-parameters']
 
-    task updateCopyrights {
+    tasks.register('updateCopyrights') {
         onlyIf { !isCI }
         inputs.files(modifiedFiles.map(files -> files.filter { f -> f.path.contains(subproject.name) }))
         outputs.dir('build/classes')
@@ -338,7 +338,7 @@ configure(javaProjects) { subproject ->
         }
     }
 
-    task testAll(type: Test, dependsOn: ['check'])
+    tasks.register('testAll', Test) { dependsOn['check'] }
 
     gradle.taskGraph.whenReady { graph ->
         if (graph.hasTask(testAll)) {
@@ -390,7 +390,7 @@ configure(javaProjects) { subproject ->
         }
     }
 
-    task checkClasspathForConflicts {
+    tasks.register('checkClasspathForConflicts') {
         onlyIf { isCI }
         inputs.files(configurations.runtimeClasspath)
 
@@ -1170,7 +1170,7 @@ sonar {
     }
 }
 
-task api(type: Javadoc) {
+tasks.register('api', Javadoc) {
     group = 'Documentation'
     description = 'Generates aggregated Javadoc API documentation.'
     title = "${rootProject.description} ${version} API"
@@ -1196,14 +1196,14 @@ task api(type: Javadoc) {
 }
 
 dokkaHtmlMultiModule {
-    dependsOn api
+    dependsOn 'api'
     moduleName.set('spring-integration')
     outputDirectory.set(file("$buildDir/kdoc"))
 }
 
 apply from: "${rootDir}/gradle/docs.gradle"
 
-task schemaZip(type: Zip) {
+tasks.register('schemaZip', Zip) {
     group = 'Distribution'
     archiveClassifier = 'schema'
     description = "Builds -${archiveClassifier} archive containing all " +
@@ -1238,7 +1238,8 @@ task schemaZip(type: Zip) {
     }
 }
 
-task docsZip(type: Zip, dependsOn: [dokkaHtmlMultiModule]) {
+tasks.register('docsZip', Zip) {
+    dependsOn 'dokkaHtmlMultiModule'
     group = 'Distribution'
     archiveClassifier = 'docs'
     description = "Builds -${archiveClassifier} archive containing api and reference " +
@@ -1257,7 +1258,9 @@ task docsZip(type: Zip, dependsOn: [dokkaHtmlMultiModule]) {
     }
 }
 
-task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
+tasks.register('distZip', Zip) {
+    dependsOn 'docsZip'
+    dependsOn 'schemaZip'
     group = 'Distribution'
     archiveClassifier = 'dist'
     description = "Builds -${archiveClassifier} archive, containing all jars and docs, " +
@@ -1299,7 +1302,8 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
     }
 }
 
-task dist(dependsOn: assemble) {
+tasks.register('dist') {
+    dependsOn assemble
     group = 'Distribution'
     description = 'Builds -dist, -docs and -schema distribution archives.'
 }

gradle/docs.gradle

@@ -23,12 +23,12 @@ tasks.named("generateAntoraYml") {
 	baseAntoraYmlFile = file('src/reference/antora/antora.yml')
 }
 
-tasks.create(name: 'createAntoraPartials', type: Sync) {
-	from { tasks.filterMetricsDocsContent.outputs }
+tasks.register('createAntoraPartials', Sync) {
+	from tasks.filterMetricsDocsContent.outputs
 	into layout.buildDirectory.dir('generated-antora-resources/modules/ROOT/partials')
 }
 
-tasks.create('generateAntoraResources') {
+tasks.register('generateAntoraResources') {
 	dependsOn 'createAntoraPartials'
 	dependsOn 'generateAntoraYml'
 }
@@ -44,15 +44,15 @@ dependencies {
 def observationInputDir = file('spring-integration-core/src/main/java/org/springframework/integration/support/management/observation').absolutePath
 def generatedDocsDir = file("$buildDir/reference/generated").absolutePath
 
-task generateObservabilityDocs(type: JavaExec) {
+tasks.register('generateObservabilityDocs', JavaExec) {
 	inputs.dir(observationInputDir)
 	outputs.dir(generatedDocsDir)
 	classpath configurations.micrometerDocs
 	args observationInputDir, /.+/, generatedDocsDir
 	mainClass = 'io.micrometer.docs.DocsGeneratorCommand'
 }
 
-task filterMetricsDocsContent(type: Copy) {
+tasks.register('filterMetricsDocsContent', Copy) {
 	dependsOn generateObservabilityDocs
 	from generatedDocsDir
 	include '_*.adoc'

src/reference/antora/antora.yml

@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     run:
-      command: gradlew -q "-Dorg.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError" :generateAntoraResources
+      command: gradlew :generateAntoraResources
       local: true
     scan:
       dir: build/generated-antora-resources

src/reference/antora/modules/ROOT/assets/images/epub-cover.png

@@ -159,6 +159,23 @@
 ** xref:http/header-mapping.adoc[]
 ** xref:http/int-graph-controller.adoc[]
 ** xref:http/samples.adoc[]
+* xref:ip.adoc[]
+** xref:ip/intro.adoc[]
+** xref:ip/udp-adapters.adoc[]
+** xref:ip/tcp-connection-factories.adoc[]
+** xref:ip/testing-connections.adoc[]
+** xref:ip/interceptors.adoc[]
+** xref:ip/tcp-events.adoc[]
+** xref:ip/tcp-adapters.adoc[]
+** xref:ip/tcp-gateways.adoc[]
+** xref:ip/correlation.adoc[]
+** xref:ip/note-nio.adoc[]
+** xref:ip/ssl-tls.adoc[]
+** xref:ip/tcp-advanced-techniques.adoc[]
+** xref:ip/endpoint-reference.adoc[]
+** xref:ip/msg-headers.adoc[]
+** xref:ip/annotation.adoc[]
+** xref:ip/dsl.adoc[]
 * xref:jdbc.adoc[]
 ** xref:jdbc/inbound-channel-adapter.adoc[]
 ** xref:jdbc/outbound-channel-adapter.adoc[]
@@ -203,23 +220,6 @@
 * xref:stomp.adoc[]
 * xref:stream.adoc[]
 * xref:syslog.adoc[]
-* xref:ip.adoc[]
-** xref:ip/intro.adoc[]
-** xref:ip/udp-adapters.adoc[]
-** xref:ip/tcp-connection-factories.adoc[]
-** xref:ip/testing-connections.adoc[]
-** xref:ip/interceptors.adoc[]
-** xref:ip/tcp-events.adoc[]
-** xref:ip/tcp-adapters.adoc[]
-** xref:ip/tcp-gateways.adoc[]
-** xref:ip/correlation.adoc[]
-** xref:ip/note-nio.adoc[]
-** xref:ip/ssl-tls.adoc[]
-** xref:ip/tcp-advanced-techniques.adoc[]
-** xref:ip/endpoint-reference.adoc[]
-** xref:ip/msg-headers.adoc[]
-** xref:ip/annotation.adoc[]
-** xref:ip/dsl.adoc[]
 * xref:webflux.adoc[]
 * xref:web-sockets.adoc[]
 * xref:ws.adoc[]
@@ -235,6 +235,7 @@
 ** xref:xml/validating-filter.adoc[]
 * xref:xmpp.adoc[]
 * xref:zeromq.adoc[]
+* xref:zip.adoc[]
 * xref:zookeeper.adoc[]
 * xref:error-handling.adoc[]
 * xref:spel.adoc[]
@@ -268,4 +269,3 @@
 ** xref:changes-2.1-2.2.adoc[]
 ** xref:changes-2.0-2.1.adoc[]
 ** xref:changes-1.0-2.0.adoc[]
-* xref:zip.adoc[]

src/reference/antora/modules/ROOT/assets/images/epub-cover.svg

@@ -2,7 +2,7 @@
 = Spring `ApplicationEvent` Support
 
 Spring Integration provides support for inbound and outbound `ApplicationEvents`, as defined by the underlying Spring Framework.
-For more information about Spring's support for events and listeners, see the https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#context-functionality-events[Spring Reference Manual].
+For more information about Spring's support for events and listeners, see the https://docs.spring.io/spring-framework/reference/core/beans/context-introduction.html#context-functionality-events[Spring Reference Manual].
 
 You need to include this dependency into your project:
 

src/reference/antora/modules/ROOT/nav.adoc

@@ -70,7 +70,7 @@ xref:spel.adoc[Spring Expression Language (SpEL)] :: Details about SpEL support
 xref:message-publishing.adoc[Message Publishing] :: The Publisher annotation etc.
 xref:jms.adoc#jms-ob-transactions[Transaction Support] :: Overview of transactions support in Spring Integration
 xref:security.adoc[Security in Spring Integration] :: Securing Spring Integration flows
-xref:kafka.adoc#kafka-inbound-gateway-configurartion[Configuration] :: Messaging annotations, task scheduler, global properties, message mapping
+xref:kafka.adoc#kafka-inbound-gateway-configuration[Configuration] :: Messaging annotations, task scheduler, global properties, message mapping
 xref:testing.adoc[Testing support] :: Test utilities, Integration mocks and testing framework
 xref:samples.adoc#samples-impl[Spring Integration Samples] :: The samples dedicated project
 xref:resources.adoc[Additional Resources] :: Other resources related to project

src/reference/antora/modules/ROOT/pages/event.adoc

@@ -35,7 +35,7 @@ The outbound channel adapter uses the `JmsTemplate` to convert and send a JMS me
 
 By using `JmsTemplate` and the `MessageListener` container, Spring Integration relies on Spring's JMS support.
 This is important to understand, since most of the attributes exposed on these adapters configure the underlying `JmsTemplate` and `MessageListener` container.
-For more details about `JmsTemplate` and the `MessageListener` container, see the https://docs.spring.io/spring/docs/current/spring-framework-reference/html/jms.html[Spring JMS documentation].
+For more details about `JmsTemplate` and the `MessageListener` container, see the https://docs.spring.io/spring-framework/reference/integration/jms.html[Spring JMS documentation].
 
 Whereas the JMS channel adapters are intended for unidirectional messaging (send-only or receive-only), Spring Integration also provides inbound and outbound JMS Gateways for request and reply operations.
 The inbound gateway relies on one of Spring's `MessageListener` container implementations for message-driven reception.
@@ -886,7 +886,7 @@ If configured properly, the JMS-backed message channel also supports transaction
 In other words, a producer would not actually write to a transactional JMS-backed channel if its send operation is part of a transaction that rolls back.
 Likewise, a consumer would not physically remove a JMS message from the channel if the reception of that message is part of a transaction that rolls back.
 Note that the producer and consumer transactions are separate in such a scenario.
-This is significantly different than the propagation of a transactional context across a simple, synchronous `<channel/>` element that has no `<queue/>` child element.
+This is significantly different from the propagation of a transactional context across a simple, synchronous `<channel/>` element that has no `<queue/>` child element.
 
 Since the preceding example above references a JMS Queue instance, it acts as a point-to-point channel.
 If, on the other hand, you need publish-subscribe behavior, you can use a separate element and reference a JMS Topic instead.

src/reference/antora/modules/ROOT/pages/index.adoc

@@ -566,7 +566,7 @@ public IntegrationFlow outboundGateFlow() {
 
 The inbound gateway is for request/reply operations.
 
-[[kafka-inbound-gateway-configurartion]]
+[[kafka-inbound-gateway-configuration]]
 === Configuration
 
 The following example shows how to configure an inbound gateway:

src/reference/antora/modules/ROOT/pages/jms.adoc

@@ -269,10 +269,10 @@ The following example shows how to an asynchronous `publishing-interceptor`:
 ----
 <int:service-activator  input-channel="inputChannel" output-channel="outputChannel" ref="sampleservice"/>
 
-<bean id="sampleservice" class="test.SampleService"/>
+<bean id="sampleService" class="test.SampleService"/>
 
 <aop:config>
-  <aop:advisor advice-ref="interceptor" pointcut="bean(sampleservice)" />
+  <aop:advisor advice-ref="interceptor" pointcut="bean(sampleService)" />
 </aop:config>
 
 <int:publishing-interceptor id="interceptor" >