diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java
index 45c8cfa98..bd8877c32 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaFilterProcessor.java
@@ -47,6 +47,7 @@
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 class CriteriaFilterProcessor {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java
index 603111e2c..b8520a513 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/CriteriaQueryProcessor.java
@@ -44,6 +44,7 @@
  * @author Rasmus Faber-Espensen
  * @author James Bodkin
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 class CriteriaQueryProcessor {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java
index 407243c89..ed9d71b30 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregation.java
@@ -23,7 +23,7 @@
  * AggregationContainer implementation for an Elasticsearch7 aggregation.
  *
  * @author Peter-Josef Meisch
- * @since 4.3
+ * @since 4.4
  */
 public class ElasticsearchAggregation implements AggregationContainer<Aggregation> {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java
index 79e865985..c42facfac 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchAggregations.java
@@ -23,7 +23,7 @@
  * AggregationsContainer implementation for the Elasticsearch7 aggregations.
  *
  * @author Peter-Josef Meisch
- * @since 4.3
+ * @since 4.4
  */
 public class ElasticsearchAggregations implements AggregationsContainer<Aggregations> {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java
index fca35228e..3ec90bc2d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchExceptionTranslator.java
@@ -43,7 +43,7 @@
  * @author Peter-Josef Meisch
  * @author Roman Puchkovskiy
  * @author Mark Paluch
- * @since 3.2
+ * @since 4.4
  */
 public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java
index 76476c17b..df559f17d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ElasticsearchRestTemplate.java
@@ -113,6 +113,7 @@
  * @author Gyula Attila Csorogi
  * @author Massimiliano Poggi
  * @author Farid Faoudi
+ * @since 4.4
  */
 public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java
index f51640c00..dc297f21e 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveElasticsearchTemplate.java
@@ -105,7 +105,7 @@
  * @author Russell Parry
  * @author Thomas Geese
  * @author Farid Faoudi
- * @since 3.2
+ * @since 4.4
  */
 public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOperations, ApplicationContextAware {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java
index 8062ccb31..6f2e16fed 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ReactiveIndexTemplate.java
@@ -65,7 +65,7 @@
 /**
  * @author Peter-Josef Meisch
  * @author George Popides
- * @since 4.1
+ * @since 4.4
  */
 class ReactiveIndexTemplate implements ReactiveIndexOperations {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java
index 039cd3afe..7c8eae1f8 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RequestFactory.java
@@ -117,7 +117,7 @@
  * @author Farid Faoudi
  * @author Peer Mueller
  * @author vdisk
- * @since 4.0
+ * @since 4.4
  */
 // todo make package private again after refactoring
 public class RequestFactory {
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java
index a754319b3..ab57df38d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/ResponseConverter.java
@@ -56,7 +56,7 @@
  *
  * @author George Popides
  * @author Peter-Josef Meisch
- * @since 4.2
+ * @since 4.4
  */
 public class ResponseConverter {
 	private ResponseConverter() {}
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java
index 2f8b289db..793e05d36 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/RestIndexTemplate.java
@@ -62,7 +62,7 @@
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @author George Popides
- * @since 4.0
+ * @since 4.4
  */
 class RestIndexTemplate extends AbstractIndexTemplate implements IndexOperations {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java
index 422d265ae..28a5f87b8 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/SearchHitsUtil.java
@@ -21,7 +21,7 @@
  * Utility class to prevent leaking of Lucene API into Spring Data Elasticsearch.
  *
  * @author Peter-Josef Meisch
- * @since 4.0
+ * @since 4.4
  */
 public final class SearchHitsUtil {
 	private SearchHitsUtil() {}
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java
index fabfb70f1..1238508dc 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClientFactoryBean.java
@@ -35,6 +35,7 @@
  *
  * @author Don Wellington
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java
index 03c22a316..e7ce292f0 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/RestClients.java
@@ -59,7 +59,7 @@
  * @author Henrique Amaral
  * @author Peter-Josef Meisch
  * @author Nic Hines
- * @since 3.2
+ * @since 4.4
  */
 public final class RestClients {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java
index b2ca0a3e1..e7a2faeaa 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultReactiveElasticsearchClient.java
@@ -147,7 +147,7 @@
  * @author Brian Clozel
  * @author Farid Faoudi
  * @author George Popides
- * @since 3.2
+ * @since 4.4
  * @see ClientConfiguration
  * @see ReactiveRestClients
  */
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java
index 8f7312b32..c7421190e 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/DefaultRequestCreator.java
@@ -17,6 +17,6 @@
 
 /**
  * @author Roman Puchkovskiy
- * @since 4.0
+ * @since 4.4
  */
 class DefaultRequestCreator implements RequestCreator {}
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java
index 8f03f2c29..a2e9c049b 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RawActionResponse.java
@@ -32,7 +32,7 @@
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
  * @author Mark Paluch
- * @since 3.2
+ * @since 4.4
  */
 // todo make package private again after refactoring?
 public class RawActionResponse extends ActionResponse {
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java
index d32958085..6b9b15d89 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/ReactiveElasticsearchClient.java
@@ -77,7 +77,7 @@
  * @author Henrique Amaral
  * @author Thomas Geese
  * @author Farid Faoudi
- * @since 3.2
+ * @since 4.4
  * @see ClientConfiguration
  * @see ReactiveRestClients
  */
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java
index c041f0335..3249c425d 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/reactive/RequestCreator.java
@@ -58,7 +58,7 @@
  * @author Roman Puchkovskiy
  * @author Farid Faoudi
  * @author George Popides
- * @since 4.0
+ * @since 4.4
  */
 public interface RequestCreator {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java
index ad45b59b6..077b2f3ec 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/NamedXContents.java
@@ -91,7 +91,7 @@
  * Only intended for internal use.
  *
  * @author Russell Parry
- * @since 4.0
+ * @since 4.4
  */
 public class NamedXContents {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java
index 29bd12249..6fb85b979 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/client/util/RequestConverters.java
@@ -119,7 +119,7 @@
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
  * @author Farid Faoudi
- * @since 3.2
+ * @since 4.4
  */
 @SuppressWarnings("JavadocReference")
 public class RequestConverters {
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java
index ff46b18ce..bca4d9d7e 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultClusterOperations.java
@@ -27,7 +27,7 @@
  * Default implementation of {@link ClusterOperations} using the {@link ElasticsearchRestTemplate}.
  *
  * @author Peter-Josef Meisch
- * @since 4.2
+ * @since 4.4
  */
 class DefaultClusterOperations implements ClusterOperations {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java
index b9a62ea00..7f245a5b1 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/DefaultReactiveClusterOperations.java
@@ -27,7 +27,7 @@
  * Default implementation of {@link ReactiveClusterOperations} using the {@link ReactiveElasticsearchOperations}.
  *
  * @author Peter-Josef Meisch
- * @since 4.2
+ * @since 4.4
  */
 public class DefaultReactiveClusterOperations implements ReactiveClusterOperations {
 	private final ReactiveElasticsearchOperations operations;
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java
index 22f79d3f3..b496ccd56 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/cluster/ElasticsearchClusterOperations.java
@@ -21,7 +21,7 @@
 
 /**
  * @author Peter-Josef Meisch
- * @since 4.3
+ * @since 4.4
  */
 public class ElasticsearchClusterOperations {
 	/**
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java
index ad64914fa..676807a3f 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractElasticsearchConfiguration.java
@@ -25,7 +25,7 @@
 /**
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
- * @since 3.2
+ * @since 4.4
  * @see ElasticsearchConfigurationSupport
  */
 public abstract class AbstractElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java
index 3182bf7e8..48cc9b3d8 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/config/AbstractReactiveElasticsearchConfiguration.java
@@ -28,7 +28,7 @@
 /**
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
- * @since 3.2
+ * @since 4.4
  * @see ElasticsearchConfigurationSupport
  */
 public abstract class AbstractReactiveElasticsearchConfiguration extends ElasticsearchConfigurationSupport {
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java
index 702d6499c..18abb7f33 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/DocumentAdapters.java
@@ -64,7 +64,7 @@
  * @author Peter-Josef Meisch
  * @author Roman Puchkovskiy
  * @author Matt Gilene
- * @since 4.0
+ * @since 4.4
  */
 public final class DocumentAdapters {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java
index aa27da295..69b55dc9e 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/document/SearchDocumentResponse.java
@@ -42,7 +42,7 @@
  * created with the {@link #from(SearchResponse,Function)} method.
  *
  * @author Peter-Josef Meisch
- * @since 4.0
+ * @since 4.4
  */
 public class SearchDocumentResponse {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java
index 154877adf..8a6e8fe0c 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/HighlightQueryBuilder.java
@@ -35,6 +35,7 @@
  * Converts the {@link Highlight} annotation from a method to an Elasticsearch {@link HighlightBuilder}.
  *
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 public class HighlightQueryBuilder {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java
index 60d279808..eda200643 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQuery.java
@@ -43,6 +43,7 @@
  * @author Jean-Baptiste Nizet
  * @author Martin Choraine
  * @author Peter-Josef Meisch
+ * @since 4.4
  */
 public class NativeSearchQuery extends BaseQuery {
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java
index 304d2cd47..94c7ce902 100755
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/NativeSearchQueryBuilder.java
@@ -55,6 +55,7 @@
  * @author Peter-Josef Meisch
  * @author Peer Mueller
  * @author vdisk
+ * @since 4.4
  */
 public class NativeSearchQueryBuilder {
 
@@ -105,17 +106,11 @@ public NativeSearchQueryBuilder withSort(SortBuilder<?> sortBuilder) {
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withSorts(Collection<SortBuilder<?>> sortBuilders) {
 		this.sortBuilders.addAll(sortBuilders);
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withSorts(SortBuilder<?>... sortBuilders) {
 		Collections.addAll(this.sortBuilders, sortBuilders);
 		return this;
@@ -131,9 +126,6 @@ public NativeSearchQueryBuilder withCollapseField(String collapseField) {
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withCollapseBuilder(@Nullable CollapseBuilder collapseBuilder) {
 		this.collapseBuilder = collapseBuilder;
 		return this;
@@ -148,17 +140,11 @@ public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder<?> agg
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withAggregations(Collection<AbstractAggregationBuilder<?>> aggregationBuilders) {
 		this.aggregationBuilders.addAll(aggregationBuilders);
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withAggregations(AbstractAggregationBuilder<?>... aggregationBuilders) {
 		Collections.addAll(this.aggregationBuilders, aggregationBuilders);
 		return this;
@@ -173,18 +159,12 @@ public NativeSearchQueryBuilder addAggregation(PipelineAggregationBuilder pipeli
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withPipelineAggregations(
 			Collection<PipelineAggregationBuilder> pipelineAggregationBuilders) {
 		this.pipelineAggregationBuilders.addAll(pipelineAggregationBuilders);
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withPipelineAggregations(PipelineAggregationBuilder... pipelineAggregationBuilders) {
 		Collections.addAll(this.pipelineAggregationBuilders, pipelineAggregationBuilders);
 		return this;
@@ -200,9 +180,6 @@ public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... hi
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withHighlightFields(Collection<HighlightBuilder.Field> highlightFields) {
 		this.highlightFields.addAll(highlightFields);
 		return this;
@@ -213,9 +190,6 @@ public NativeSearchQueryBuilder withIndicesBoost(Collection<IndexBoost> indicesB
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withIndicesBoost(IndexBoost... indicesBoost) {
 		Collections.addAll(this.indicesBoost, indicesBoost);
 		return this;
@@ -231,9 +205,6 @@ public NativeSearchQueryBuilder withPageable(Pageable pageable) {
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withFields(Collection<String> fields) {
 		this.fields.addAll(fields);
 		return this;
@@ -244,9 +215,6 @@ public NativeSearchQueryBuilder withFields(String... fields) {
 		return this;
 	}
 
-	/**
-	 * @since 4.4
-	 */
 	public NativeSearchQueryBuilder withStoredFields(Collection<String> storedFields) {
 
 		if (this.storedFields == null) {
@@ -257,9 +225,6 @@ public NativeSearchQueryBuilder withStoredFields(Collection<String> storedFields
 		return this;
 	}
 
-	/**
-	 * @since 4.4
-	 */
 	public NativeSearchQueryBuilder withStoredFields(String... storedFields) {
 
 		if (this.storedFields == null) {
@@ -282,7 +247,6 @@ public NativeSearchQueryBuilder withMinScore(float minScore) {
 	/**
 	 * @param trackScores whether to track scores.
 	 * @return this object
-	 * @since 3.1
 	 */
 	public NativeSearchQueryBuilder withTrackScores(boolean trackScores) {
 		this.trackScores = trackScores;
@@ -294,9 +258,6 @@ public NativeSearchQueryBuilder withIds(Collection<String> ids) {
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withIds(String... ids) {
 		Collections.addAll(this.ids, ids);
 		return this;
@@ -327,9 +288,6 @@ public NativeSearchQueryBuilder withMaxResults(Integer maxResults) {
 		return this;
 	}
 
-	/**
-	 * @since 4.2
-	 */
 	public NativeSearchQueryBuilder withTrackTotalHits(Boolean trackTotalHits) {
 		this.trackTotalHits = trackTotalHits;
 		return this;
@@ -345,9 +303,6 @@ public NativeSearchQueryBuilder withRescorerQuery(RescorerQuery rescorerQuery) {
 		return this;
 	}
 
-	/**
-	 * @since 4.3
-	 */
 	public NativeSearchQueryBuilder withSuggestBuilder(SuggestBuilder suggestBuilder) {
 		this.suggestBuilder = suggestBuilder;
 		return this;
diff --git a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java
index 23223597a..eb92e386b 100644
--- a/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java
+++ b/src/main/java/org/springframework/data/elasticsearch/backend/elasticsearch7/query/ScriptField.java
@@ -20,6 +20,7 @@
 /**
  * @author Ryan Murfitt
  * @author Artur Konczak
+ * @since 4.4
  */
 public class ScriptField {