diff --git a/build.gradle b/build.gradle
index 3960777f934..4d8c25679b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -263,7 +263,7 @@ configure(javaProjects) { subproject ->
 
     tasks.withType(Javadoc) {
         options.addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
-//  TODO until all fixed      options.addBooleanOption('Werror', true) // fail build on Javadoc warnings
+        options.addBooleanOption('Werror', true) // fail build on Javadoc warnings
     }
 
     tasks.withType(JavaForkOptions) {
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/MappingUtils.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/MappingUtils.java
index 361d57fbb6b..cee28106302 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/MappingUtils.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/MappingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ private static org.springframework.amqp.core.Message doMapMessage(Message<?> mes
 	 * {@link ContentTypeDelegatingMessageConverter}, {@link AmqpHeaders#CONTENT_TYPE} and
 	 * {@link MessageHeaders#CONTENT_TYPE} will be used for the selection, with the AMQP
 	 * header taking precedence.
-	 * @param replyMessage the reply message.
+	 * @param message the reply message.
 	 * @param converter the message converter to use.
 	 * @param headerMapper the header mapper to use.
 	 * @param headersMappedLast true if headers are mapped after conversion.
diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaInboundGatewaySpec.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaInboundGatewaySpec.java
index 6b300ec4e5e..d2f71c958d3 100644
--- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaInboundGatewaySpec.java
+++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaInboundGatewaySpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ public S recoveryCallback(RecoveryCallback<?> recoveryCallback) {
 
 	/**
 	 * Specify a {@link BiConsumer} for seeks management during
-	 * {@link ConsumerSeekAware.ConsumerSeekCallback#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
+	 * {@link ConsumerSeekAware#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
 	 * call from the {@link org.springframework.kafka.listener.KafkaMessageListenerContainer}.
 	 * @param onPartitionsAssignedCallback the {@link BiConsumer} to use
 	 * @return the spec
diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaMessageDrivenChannelAdapterSpec.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaMessageDrivenChannelAdapterSpec.java
index c6c079cfdac..3a7db6dd90b 100644
--- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaMessageDrivenChannelAdapterSpec.java
+++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaMessageDrivenChannelAdapterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,7 +168,7 @@ public S filterInRetry(boolean filterInRetry) {
 
 	/**
 	 * Specify a {@link BiConsumer} for seeks management during
-	 * {@link ConsumerSeekAware.ConsumerSeekCallback#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
+	 * {@link ConsumerSeekAware#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
 	 * call from the {@link org.springframework.kafka.listener.KafkaMessageListenerContainer}.
 	 * @param onPartitionsAssignedCallback the {@link BiConsumer} to use
 	 * @return the spec
diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java
index 7eebada4806..379ae129a19 100644
--- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java
+++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,7 +165,7 @@ public void setRecoveryCallback(RecoveryCallback<?> recoveryCallback) {
 
 	/**
 	 * Specify a {@link BiConsumer} for seeks management during
-	 * {@link ConsumerSeekAware.ConsumerSeekCallback#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
+	 * {@link ConsumerSeekAware#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
 	 * call from the {@link org.springframework.kafka.listener.KafkaMessageListenerContainer}.
 	 * This is called from the internal
 	 * {@link org.springframework.kafka.listener.adapter.MessagingMessageListenerAdapter} implementation.
diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java
index 539d3becd5d..cf40018fd3f 100644
--- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java
+++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java
@@ -252,7 +252,7 @@ public void setPayloadType(Class<?> payloadType) {
 
 	/**
 	 * Specify a {@link BiConsumer} for seeks management during
-	 * {@link ConsumerSeekAware.ConsumerSeekCallback#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
+	 * {@link ConsumerSeekAware#onPartitionsAssigned(Map, ConsumerSeekAware.ConsumerSeekCallback)}
 	 * call from the {@link org.springframework.kafka.listener.KafkaMessageListenerContainer}.
 	 * This is called from the internal
 	 * {@link org.springframework.kafka.listener.adapter.MessagingMessageListenerAdapter} implementation.