diff --git a/.gitignore b/.gitignore
index 1a16ace33..78662375b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ target/
 build/
 node_modules
 node
-package.json
 package-lock.json
 
-.mvn/.gradle-enterprise
+.mvn/.develocity
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index ebd761025..e0857eaa2 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>gradle-enterprise-maven-extension</artifactId>
-		<version>1.19.2</version>
-	</extension>
-	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>common-custom-user-data-maven-extension</artifactId>
-		<version>1.12.4</version>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.22</version>
 	</extension>
 </extensions>
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
deleted file mode 100644
index 111c70434..000000000
--- a/.mvn/gradle-enterprise.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<gradleEnterprise
-		xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
-	<server>
-		<url>https://ge.spring.io</url>
-	</server>
-	<buildScan>
-		<backgroundBuildScanUpload>false</backgroundBuildScanUpload>
-		<captureGoalInputFiles>true</captureGoalInputFiles>
-		<publishIfAuthenticated>true</publishIfAuthenticated>
-		<obfuscation>
-			<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
-		</obfuscation>
-	</buildScan>
-	<buildCache>
-		<local>
-			<enabled>false</enabled>
-		</local>
-		<remote>
-			<server>
-				<credentials>
-					<username>${env.DEVELOCITY_CACHE_USERNAME}</username>
-					<password>${env.DEVELOCITY_CACHE_PASSWORD}</password>
-				</credentials>
-			</server>
-			<enabled>false</enabled>
-			<storeEnabled>#{env['DEVELOCITY_CACHE_USERNAME'] != null and env['DEVELOCITY_CACHE_PASSWORD'] != null}</storeEnabled>
-		</remote>
-	</buildCache>
-</gradleEnterprise>
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 000000000..32599cefe
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,10 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index ef912364a..2f287b33b 100755
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-#Thu Dec 14 08:40:47 CET 2023
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+#Thu Nov 07 09:49:33 CET 2024
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/Jenkinsfile b/Jenkinsfile
index 56472a9e2..6a29e0540 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/3.3.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -32,14 +32,15 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-						sh "PROFILE=ci JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
-						sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+							sh "PROFILE=ci JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+							sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+						}
 					}
 				}
 			}
@@ -61,14 +62,15 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=ci JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
-								sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=ci JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+									sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+								}
 							}
 						}
 					}
@@ -90,24 +92,24 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-								"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
-								"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
-								"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
-								"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root " +
-								"-Dartifactory.server=${p['artifactory.url']} " +
-								"-Dartifactory.username=${ARTIFACTORY_USR} " +
-								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
-								"-Dartifactory.build-name=spring-data-couchbase " +
-								"-Dartifactory.build-number=spring-data-couchbase-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
-								"-Dmaven.test.skip=true clean deploy -U -B"
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+								sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
+									"-Dartifactory.server=${p['artifactory.url']} " +
+									"-Dartifactory.username=${ARTIFACTORY_USR} " +
+									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+									"-Dartifactory.build-name=spring-data-couchbase " +
+									"-Dartifactory.build-number=spring-data-couchbase-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase " +
+									"-Dmaven.test.skip=true clean deploy -U -B"
+						}
 					}
 				}
 			}
diff --git a/ci/clean.sh b/ci/clean.sh
index 983c92be0..732797ea2 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -2,12 +2,7 @@
 
 set -euo pipefail
 
-export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
-export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}
 
-# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
-export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
-
 MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
-  ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase
+  ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 60057f265..6dff72206 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,10 +1,10 @@
 # Java versions
-java.main.tag=17.0.9_9-jdk-focal
-java.next.tag=21.0.1_12-jdk-jammy
+java.main.tag=17.0.13_11-jdk-focal
+java.next.tag=22.0.2_9-jdk-jammy
 
 # Docker container images - standard
-docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
 
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.25
@@ -14,6 +14,7 @@ docker.mongodb.7.0.version=7.0.2
 
 # Supported versions of Redis
 docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
 
 # Supported versions of Cassandra
 docker.cassandra.3.version=3.11.16
@@ -25,9 +26,10 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 # Credentials
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
+docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
+docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 artifactory.url=https://repo.spring.io
 artifactory.repository.snapshot=libs-snapshot-local
-develocity.cache.credentials=gradle_enterprise_cache_user
 develocity.access-key=gradle_enterprise_secret_access_key
 jenkins.user.name=spring-builds+jenkins
diff --git a/ci/test.sh b/ci/test.sh
index c70566ece..0d015bed4 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -3,15 +3,9 @@
 set -euo pipefail
 
 mkdir -p /tmp/jenkins-home/.m2/spring-data-couchbase
-chown -R 1001:1001 .
 
-export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
-export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}
 
-# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
-export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
-
 MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
   ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase
+  -P${PROFILE} clean dependency:list test -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..057a40fe8
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.6",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.0-alpha.7",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.13.0",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.11"
+  }
+}
diff --git a/pom.xml b/pom.xml
index 0ec87200e..c60ca900f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-couchbase</artifactId>
-    <version>5.3.0</version>
+    <version>5.3.11-SNAPSHOT</version>
 
     <name>Spring Data Couchbase</name>
     <description>Spring Data integration for Couchbase</description>
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.11-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <couchbase>3.6.0</couchbase>
+        <couchbase>3.6.3</couchbase>
         <couchbase.osgi>3.6.0</couchbase.osgi>
-        <springdata.commons>3.3.0</springdata.commons>
+        <springdata.commons>3.3.11-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.couchbase</java-module-name>
         <hibernate.validator>7.0.1.Final</hibernate.validator>
         <couchbase.encryption>3.1.0</couchbase.encryption>
@@ -48,19 +48,7 @@
             <artifactId>querydsl-apt</artifactId>
             <version>${querydsl}</version>
             <classifier>jakarta</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.inject</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -262,9 +250,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <proc>none</proc>
-                </configuration>
                 <executions>
                     <execution>
                         <id>test-annotation-processing</id>
@@ -352,7 +337,7 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
+						<groupId>org.antora</groupId>
 						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
@@ -361,7 +346,19 @@
 	</profiles>
 
 	<repositories>
-		
-		
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>
 </project>
diff --git a/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml
index 1c58efae6..af730e043 100644
--- a/src/main/antora/antora-playbook.yml
+++ b/src/main/antora/antora-playbook.yml
@@ -3,8 +3,7 @@
 # The purpose of this Antora playbook is to build the docs in the current branch.
 antora:
   extensions:
-    - '@antora/collector-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-couchbase'
 site:
   title: Spring Data Couchbase
@@ -22,13 +21,12 @@ content:
       start_path: src/main/antora
 asciidoc:
   attributes:
-    page-pagination: ''
     hide-uri-scheme: '@'
     tabs-sync-option: '@'
-    chomp: 'all'
   extensions:
     - '@asciidoctor/tabs'
     - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/javadoc-extension'
   sourcemap: true
 urls:
   latest_version_segment: ''
@@ -38,5 +36,5 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
     snapshot: true
diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
index e6cba9714..7c0f37f68 100644
--- a/src/main/antora/antora.yml
+++ b/src/main/antora/antora.yml
@@ -10,3 +10,8 @@ ext:
         local: true
       scan:
         dir: target/classes/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
diff --git a/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc
index 2d32ec487..ac8b6a553 100644
--- a/src/main/antora/modules/ROOT/nav.adoc
+++ b/src/main/antora/modules/ROOT/nav.adoc
@@ -28,4 +28,5 @@
 ** xref:repositories/query-keywords-reference.adoc[]
 ** xref:repositories/query-return-types-reference.adoc[]
 
-* https://github.com/spring-projects/spring-data-commons/wiki[Wiki]
+* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]
diff --git a/src/main/antora/modules/ROOT/pages/couchbase/repository.adoc b/src/main/antora/modules/ROOT/pages/couchbase/repository.adoc
index ede1221ba..df8a32df2 100644
--- a/src/main/antora/modules/ROOT/pages/couchbase/repository.adoc
+++ b/src/main/antora/modules/ROOT/pages/couchbase/repository.adoc
@@ -33,33 +33,47 @@ An advanced usage is described in <<couchbase.repository.multibucket>>.
 
 [[couchbase.repository.configuration.dsl]]
 === QueryDSL Configuration
-Spring Data Couchbase supports QueryDSL for building type-safe queries. To enable code generation you need to set `spring-data-couchbase` as annotation processor on your project.
+Spring Data Couchbase supports QueryDSL for building type-safe queries. To enable code generation, setting `CouchbaseAnnotationProcessor` as an annotation processor is required.
+Additionally, the runtime needs querydsl-apt to enable QueryDSL on repositories.
 
 .Maven Configuration Example
 ====
 [source,xml]
 ----
+    . existing depdendencies including those required for spring-data-couchbase
+    .
+    .
+    <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-apt</artifactId>
+        <version>${querydslVersion}</version>
+    </dependency>
+</dependencies>
+
 <build>
     <plugins>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>[compiler-plugin-version]</version>
-            <configuration>
-                <annotationProcessorPaths>
-                    <!-- path to the annotation processor -->
-                    <path>
-                        <groupId>com.querydsl</groupId>
-                        <artifactId>querydsl-apt</artifactId>
-                        <version>[version]</version>
-                    </path>
-                    <path>
-                        <groupId>org.springframework.data</groupId>
-                        <artifactId>spring-data-couchbase</artifactId>
-                        <version>[version]</version>
-                    </path>
-                </annotationProcessorPaths>
-            </configuration>
+                <executions>
+                    <execution>
+                        <id>annotation-processing</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <proc>only</proc>
+                            <annotationProcessors>
+                                <annotationProcessor>org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor</annotationProcessor>
+                            </annotationProcessors>
+                            <generatedTestSourcesDirectory>target/generated-sources</generatedTestSourcesDirectory>
+                            <compilerArgs>
+                                <arg>-Aquerydsl.logInfo=true</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                </executions>
         </plugin>
     </plugins>
 </build>
@@ -69,10 +83,19 @@ Spring Data Couchbase supports QueryDSL for building type-safe queries. To enabl
 
 .Gradle Configuration Example
 ====
-[source,groovy]
+[source,groovy,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-annotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}'
-annotationProcessor 'org.springframework.data:spring-data-couchbase:${springDataCouchbaseVersion}'
+dependencies {
+    annotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}'
+    annotationProcessor 'org.springframework.data:spring-data-couchbase'
+    testAnnotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}'
+    testAnnotationProcessor 'org.springframework.data:spring-data-couchbase'
+}
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs += [
+            "-processor",
+            "org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor"]
+}
 ----
 ====
 
diff --git a/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java b/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java
index 40e95057c..dc2a9ed5a 100644
--- a/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/CouchbaseClientFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java b/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java
index 6d74b1a6c..3e82d71d0 100644
--- a/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java b/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java
index d1a6e87f0..64669acbf 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CacheKeyPrefix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
index 19fd9fe19..8ee5780e0 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.couchbase.cache;
 
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,7 +24,6 @@
 import java.util.concurrent.Callable;
 
 import org.springframework.cache.support.AbstractValueAdaptingCache;
-import org.springframework.cache.support.SimpleValueWrapper;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
@@ -31,6 +31,13 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
+/**
+ * Couchbase-backed Cache Methods that take a Class return non-wrapped objects - cache-miss cannot be distinguished from
+ * cached null - this is what AbstractValueAdaptingCache does Methods that do not take a Class return wrapped objects -
+ * the wrapper is null for cache-miss - the exception is T get(final Object key, final Callable&lt;T&gt; valueLoader), which
+ * does not return a wrapper because if there is a cache-miss, it gets the value from valueLoader (and caches it). There
+ * are anomalies with get(key, ValueLoader) - which returns non-wrapped object.
+ */
 public class CouchbaseCache extends AbstractValueAdaptingCache {
 
 	private final String name;
@@ -70,11 +77,18 @@ public CouchbaseCacheWriter getNativeCache() {
 		return cacheWriter;
 	}
 
+	/**
+	 * same as inherited, but passes clazz for transcoder
+	 */
+	protected Object lookup(final Object key, Class<?> clazz) {
+		return cacheWriter.get(cacheConfig.getCollectionName(), createCacheKey(key), cacheConfig.getValueTranscoder(),
+				clazz);
+	}
+
 	@Override
 	protected Object lookup(final Object key) {
-		return cacheWriter.get(cacheConfig.getCollectionName(), createCacheKey(key), cacheConfig.getValueTranscoder());
+		return lookup(key, Object.class);
 	}
-
 	/**
 	 * Returns the configuration for this {@link CouchbaseCache}.
 	 */
@@ -97,33 +111,56 @@ public synchronized <T> T get(final Object key, final Callable<T> valueLoader) {
 	}
 
 	@Override
-	public void put(final Object key, final Object value) {
-		if (!isAllowNullValues() && value == null) {
+	@SuppressWarnings("unchecked")
+	public <T> T get(final Object key, Class<T> type) {
+		Object value = this.fromStoreValue(this.lookup(key, type));
+		if (value != null && type != null && !type.isInstance(value)) {
+			throw new IllegalStateException("Cached value is not of required type [" + type.getName() + "]: " + value);
+		} else {
+			return (T) value;
+		}
+	}
 
-			throw new IllegalArgumentException(String.format(
-					"Cache '%s' does not allow 'null' values. Avoid storing null via '@Cacheable(unless=\"#result == null\")' or "
-							+ "configure CouchbaseCache to allow 'null' via CouchbaseCacheConfiguration.",
-					name));
+	public synchronized <T> T get(final Object key, final Callable<T> valueLoader, Class<T> type) {
+		T value = get(key, type);
+		if (value == null) { // cannot distinguish between cache miss and cached null
+			value = valueFromLoader(key, valueLoader);
+			put(key, value);
 		}
+		return value;
+	}
 
+	@Override
+	public void put(final Object key, final Object value) {
 		cacheWriter.put(cacheConfig.getCollectionName(), createCacheKey(key), toStoreValue(value), cacheConfig.getExpiry(),
 				cacheConfig.getValueTranscoder());
 	}
 
 	@Override
 	public ValueWrapper putIfAbsent(final Object key, final Object value) {
-		if (!isAllowNullValues() && value == null) {
-			return get(key);
-		}
 
 		Object result = cacheWriter.putIfAbsent(cacheConfig.getCollectionName(), createCacheKey(key), toStoreValue(value),
 				cacheConfig.getExpiry(), cacheConfig.getValueTranscoder());
 
-		if (result == null) {
-			return null;
-		}
+		return toValueWrapper(result);
+	}
 
-		return new SimpleValueWrapper(result);
+	/**
+	 * Not sure why this isn't in AbstractValueAdaptingCache
+	 * 
+	 * @param key
+	 * @param value
+	 * @param clazz
+	 * @return
+	 * @param <T>
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T putIfAbsent(final Object key, final Object value, final Class<T> clazz) {
+
+		Object result = cacheWriter.putIfAbsent(cacheConfig.getCollectionName(), createCacheKey(key),
+				toStoreValue(value), cacheConfig.getExpiry(), cacheConfig.getValueTranscoder(), clazz);
+
+		return (T) result;
 	}
 
 	@Override
@@ -168,6 +205,9 @@ protected String createCacheKey(final Object key) {
 	 * @throws IllegalStateException if {@code key} cannot be converted to {@link String}.
 	 */
 	protected String convertKey(final Object key) {
+		if (key == null) {
+			throw new IllegalArgumentException(String.format("Cache '%s' does not allow 'null' key.", name));
+		}
 		if (key instanceof String) {
 			return (String) key;
 		}
diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java
index 226f5c594..a618c66ca 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
@@ -62,7 +62,7 @@ public static CouchbaseCacheConfiguration defaultCacheConfig() {
 	/**
 	 * Registers default cache key converters. The following converters get registered:
 	 * <ul>
-	 * <li>{@link String} to {@link byte byte[]} using UTF-8 encoding.</li>
+	 * <li>{@link String} to byte using UTF-8 encoding.</li>
 	 * <li>{@link SimpleKey} to {@link String}</li>
 	 * </ul>
 	 * 
diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
index f154f78f7..4e1954adb 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java
index 58ae44dde..cb9450920 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/CouchbaseCacheWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
@@ -48,6 +48,20 @@ public interface CouchbaseCacheWriter {
 	Object putIfAbsent(String collectionName, String key, Object value, @Nullable Duration expiry,
 			@Nullable Transcoder transcoder);
 
+	/**
+	 * Write the given value to Couchbase if the key does not already exist.
+	 *
+	 * @param collectionName The cache name must not be {@literal null}.
+	 * @param key The key for the cache entry. Must not be {@literal null}.
+	 * @param value The value stored for the key. Must not be {@literal null}.
+	 * @param expiry Optional expiration time. Can be {@literal null}.
+	 * @param transcoder Optional transcoder to use. Can be {@literal null}.
+	 * @param clazz Optional class for contentAs(clazz)
+	 */
+	@Nullable
+	Object putIfAbsent(String collectionName, String key, Object value, @Nullable Duration expiry,
+			@Nullable Transcoder transcoder, @Nullable Class<?> clazz);
+
 	/**
 	 * Get the binary value representation from Couchbase stored for the given key.
 	 *
@@ -59,6 +73,18 @@ Object putIfAbsent(String collectionName, String key, Object value, @Nullable Du
 	@Nullable
 	Object get(String collectionName, String key, @Nullable Transcoder transcoder);
 
+	/**
+	 * Get the binary value representation from Couchbase stored for the given key.
+	 *
+	 * @param collectionName must not be {@literal null}.
+	 * @param key must not be {@literal null}.
+	 * @param transcoder Optional transcoder to use. Can be {@literal null}.
+	 * @param clazz Optional class for contentAs(clazz)
+	 * @return {@literal null} if key does not exist.
+	 */
+	@Nullable
+	Object get(String collectionName, String key, @Nullable Transcoder transcoder, @Nullable Class<?> clazz);
+
 	/**
 	 * Remove the given key from Couchbase.
 	 *
diff --git a/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java b/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java
index 73fe4ad29..20b6c9f5b 100644
--- a/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java
+++ b/src/main/java/org/springframework/data/couchbase/cache/DefaultCouchbaseCacheWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
@@ -18,12 +18,14 @@
 
 import static com.couchbase.client.core.io.CollectionIdentifier.DEFAULT_COLLECTION;
 import static com.couchbase.client.core.io.CollectionIdentifier.DEFAULT_SCOPE;
-import static com.couchbase.client.java.kv.GetOptions.*;
-import static com.couchbase.client.java.kv.InsertOptions.*;
-import static com.couchbase.client.java.kv.UpsertOptions.*;
-import static com.couchbase.client.java.query.QueryOptions.*;
+import static com.couchbase.client.java.kv.GetOptions.getOptions;
+import static com.couchbase.client.java.kv.InsertOptions.insertOptions;
+import static com.couchbase.client.java.kv.UpsertOptions.upsertOptions;
+import static com.couchbase.client.java.query.QueryOptions.queryOptions;
 import static com.couchbase.client.java.query.QueryScanConsistency.REQUEST_PLUS;
 
+import io.micrometer.common.lang.Nullable;
+
 import java.time.Duration;
 
 import org.springframework.data.couchbase.CouchbaseClientFactory;
@@ -65,6 +67,22 @@ public void put(final String collectionName, final String key, final Object valu
 	@Override
 	public Object putIfAbsent(final String collectionName, final String key, final Object value, final Duration expiry,
 			final Transcoder transcoder) {
+		return putIfAbsent(collectionName, key, value, expiry, transcoder, Object.class);
+	}
+
+	/**
+	 * same as above, plus clazz
+	 * 
+	 * @param collectionName
+	 * @param key
+	 * @param value
+	 * @param expiry
+	 * @param transcoder
+	 * @param clazz
+	 */
+	@Override
+	public Object putIfAbsent(final String collectionName, final String key, final Object value, final Duration expiry,
+			final Transcoder transcoder, @Nullable final Class<?> clazz) {
 		InsertOptions options = insertOptions();
 
 		if (expiry != null) {
@@ -79,15 +97,20 @@ public Object putIfAbsent(final String collectionName, final String key, final O
 			return null;
 		} catch (final DocumentExistsException ex) {
 			// If the document exists, return the current one per contract
-			return get(collectionName, key, transcoder);
+			return get(collectionName, key, transcoder, clazz);
 		}
 	}
 
 	@Override
 	public Object get(final String collectionName, final String key, final Transcoder transcoder) {
-		// TODO .. the decoding side transcoding needs to be figured out?
+		return get(collectionName, key, transcoder, Object.class);
+	}
+
+	@Override
+	public Object get(final String collectionName, final String key, final Transcoder transcoder,
+			final Class<?> clazz) {
 		try {
-			return getCollection(collectionName).get(key, getOptions().transcoder(transcoder)).contentAs(Object.class);
+			return getCollection(collectionName).get(key, getOptions().transcoder(transcoder)).contentAs(clazz);
 		} catch (DocumentNotFoundException ex) {
 			return null;
 		}
diff --git a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
index 4db4a2936..3b24aaa8d 100644
--- a/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
+++ b/src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/config/BeanNames.java b/src/main/java/org/springframework/data/couchbase/config/BeanNames.java
index 5e5e18d76..25b6258df 100644
--- a/src/main/java/org/springframework/data/couchbase/config/BeanNames.java
+++ b/src/main/java/org/springframework/data/couchbase/config/BeanNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java
index 7152b7e91..967b9db75 100644
--- a/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java b/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java
index 1ef7d29f0..4913f597b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CollectionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java
index d1546b40a..eeac8dda3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseDataIntegrityViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
index cb59143df..60666625b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
index 599c36c49..541c07439 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java
index 97a25ef78..12b7f767b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseQueryExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
index 1965044fc..5dd5313b9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java
index 8714296df..05277c691 100644
--- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java
index 970fac9b3..c454dfac4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java
index 6aa163649..5dfc2429e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableExistsByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java
index 1894eac3d..5aaf204b3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java
index 493b28ba8..bfe71e111 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByAnalyticsOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java
index 83a5d1329..2be2c338b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java
index 647531f7c..e1bf1305b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java
index 628945458..d7f0d24d3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java
index f3dad59a9..e201f2e15 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java
index ece7459d8..9a57edcb9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java
index dfc586a80..cdb1308e3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableFindFromReplicasByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java
index aa385ee02..77e926e98 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java
index 755719ab1..daf40b847 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableInsertByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperation.java
index 956726161..f4c711123 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java
index c64c9fda5..fee04bd2d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableMutateInByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperation.java
index a5690da64..684b6d5eb 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperationSupport.java
index 8f22dca24..656aaa819 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRangeScanOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java
index dd4c9c0b6..0dbed2a65 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java
index da8d350df..95a6d775a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java
index bcf57c9d3..65cc00e1d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java
index da585666b..da04c6ab7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java
index d536034dc..80be9505f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java
index eb0ac9286..65d9b3a5a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableReplaceByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java
index f9d622419..c808efa28 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java
index ae6e9880b..fbeb540a5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ExecutableUpsertByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java
index b9dca36e6..b799c0c5f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java
+++ b/src/main/java/org/springframework/data/couchbase/core/FluentCouchbaseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java b/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java
index 4d90f591a..4c19404c9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java
+++ b/src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java b/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java
index a91609983..4c145fd33 100644
--- a/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java
+++ b/src/main/java/org/springframework/data/couchbase/core/OperationCancellationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java b/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java
index 19da9740e..a1e39ca1c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java
+++ b/src/main/java/org/springframework/data/couchbase/core/OperationInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java
index 788399624..64e2c9197 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java
index 763701854..c41e9d2ef 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java
index 5b9843536..558eed09e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java
index 06c3b96a0..6954a06c9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java
index b80c5682f..f8e03ea4c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java
index 52a3a63e6..5fe94a070 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java
index 6f9969902..aab918318 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java
index 1c85a1a15..4b0d3a07c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
index 02f045bcf..6a848aa69 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java
index 0e85c1f56..f4479c13a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
index 4b7faa5d5..523d882b3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java
index 5eaedaaa1..aa1c94019 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java
index 4bf7d66c0..a93302752 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java
index 5baa6eac2..7a55a44c2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveFluentCouchbaseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java
index 3411b5123..3ef286848 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java
index c6dfb5924..28add4a4b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java
index 41756fd3a..6ec3df7d2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java
index 4d09819d7..3dc1fd4f2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveMutateInByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperation.java
index eb7231d25..183dc1a21 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperationSupport.java
index ee49994d4..8e0c825e4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRangeScanOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java
index e3a3223f0..bbae989e2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java
index 16d46fc78..ff8f8613c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java
index 69e31ddf8..b91097f69 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java
index 10b22f9e5..cc9b3c50e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByQueryOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java
index 8e5952578..fd4a27a9f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
index fa176074c..05392598a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java
index a128ac09f..24be1c749 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java
index 8f118d6a4..8b8d0a72c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java
index ea0c4e62e..aa5bf920d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java b/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java
index 514392785..84620fb94 100644
--- a/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java
+++ b/src/main/java/org/springframework/data/couchbase/core/RemoveResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java
index 8e176a815..935392ab4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java b/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java
index e3ed92cf1..5661ba7b5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/core/TransactionalSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java b/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java
index 5cc10d08f..41d2cd4f8 100644
--- a/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java
+++ b/src/main/java/org/springframework/data/couchbase/core/UnsupportedCouchbaseFeatureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
index f22e13372..6f2c8f738 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
index f9149c530..7a2bbe8cd 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
@@ -1,6 +1,6 @@
 package org.springframework.data.couchbase.core.convert;
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/ConverterHasNoConversion.java b/src/main/java/org/springframework/data/couchbase/core/convert/ConverterHasNoConversion.java
index 695ba796d..af2c2a01a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/ConverterHasNoConversion.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/ConverterHasNoConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java b/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java
index ac4dbcfde..46edc64df 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/ConverterRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java
index 190898969..8226e6d83 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConversionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
index 48afdfd06..748c02734 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java
index de3233659..75303d214 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseCustomConversions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java
index 003938746..484420eab 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseDocumentPropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java
index f62627eb0..219f1e220 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseJsr310Converters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
index 7daf075b4..83d29b260 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java
index 8e6e65211..0c197667c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
index f2d7fec4d..aba239ad5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbaseWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java
index cda2f75ce..9493fad35 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java b/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java
index bd359bc7d..dd2f47871 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CustomConversions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java
index 8f3787773..860d79c40 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/DateConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java
index d39becb65..58f284ac1 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/DefaultCouchbaseTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
index a3f7d7184..3b02722ed 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/JsonValueConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/JsonValueConverter.java
index 7ebffa49e..0eb576e32 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/JsonValueConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/JsonValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index 070750d6f..c5afb8879 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
index f0538eefa..7392ecfd3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
index 784fe3d82..472c377fa 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java b/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java
index 60b1efe61..1496d1a1e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/TypeAwareTypeInformationMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
index 5ad63584c..df465939d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java b/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java
index 3c2cbbbc6..597d5018f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java b/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java
index d89563089..d3aa9433d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/translation/TranslationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java
index fdbe6e05c..54190a6d4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java
index 64ef7fe3d..d8174e67d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/CompositeQueryIndexes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java
index e6211b809..3586b9a6e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java
index 78423447d..1ca50fbd1 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/CouchbasePersistentEntityIndexResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java b/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java
index 33872bc6d..3239d2a7b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/IndexDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2024 the original author or authors.
+ * Copyright 2011-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java
index aed87151d..f06237591 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexDirection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java
index d536759b9..d14a395c3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java
index 8cfa3c59f..5e90b4294 100644
--- a/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java
+++ b/src/main/java/org/springframework/data/couchbase/core/index/QueryIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
index 8c5d1955f..9a210a92d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
index 577d7bda1..b6213cbcf 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java
index 1478d3614..49428c503 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java
index b5a39bde3..7b054edfc 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java
index 4ecfc93d8..2d6b9a03a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseMappingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
index bac05ead3..3a9b5aa0d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
index a95f898e8..e42878c43 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbasePersistentProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java
index eeecda742..a40d71dc0 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseSimpleTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java
index 23986550d..2090409df 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseStorable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
index d59c1d38e..ef8c61bf4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Document.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java
index 80dfc2b75..334de2967 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java
index cf47fe79a..043f70fe7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Expiry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java b/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
index 267ee23f2..99b17f63b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java b/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java
index af0318209..f819375e7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/KeySettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java
index 69c7ec8f9..93546f7b0 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AbstractCouchbaseEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java
index a923790e4..6e255742c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java
index dc2c0aa1c..6ccce2ea1 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterDeleteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java
index a07b36559..597ec6aee 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterSaveEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java
index 5c82c0e95..c864aef20 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEntityCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
index 75b9daef0..321743d16 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java
index f8cd1423a..1d2404cf3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java
index 65eae234c..52f237311 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeConvertEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java
index 2c1948028..3a6440957 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeDeleteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java
index fda4735c4..daa7c3f59 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/BeforeSaveEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java
index 7885609e3..829d6803e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/CouchbaseMappingEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java
index f291ebe1b..d8c71a2cf 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/LoggingEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java
index cacb59991..686bb47bd 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAfterConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java
index 26f3aa4f8..56ace58e9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java
index ca6b61408..a819d2942 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ReactiveBeforeConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java
index 6874d6c0f..14f5cd2e2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/event/ValidatingCouchbaseEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java
index 331461d7e..049ddd8b5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GeneratedValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java
index 4912be5be..4e11108e8 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/id/GenerationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java
index 16622b4e7..a031b88d3 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java
index 407d29e4b..0d3290bc7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdPrefix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java
index b86427c8e..ac9494136 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java
+++ b/src/main/java/org/springframework/data/couchbase/core/mapping/id/IdSuffix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java
index a3bf88e0b..2254580f9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/AnalyticsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java b/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java
index dde326b18..0303c9ab5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/Consistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java b/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java
index 2b42b171d..5c6eadc9b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/Dimensional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java b/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java
index e1799a9e5..8dbf02c43 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/FetchType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java b/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java
index 0732f0f73..83ca7c6c9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/HashSide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Meta.java b/src/main/java/org/springframework/data/couchbase/core/query/Meta.java
index 396250f01..fd22d5f3f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/Meta.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/Meta.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java b/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java
index d904b2eb0..a27d967d4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java
index 69fe1dd84..9d0816de4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/N1QLQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java
index 9713d5c37..1d3163077 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/N1qlJoin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java
index de5192f34..746ff2016 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/N1qlPrimaryIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java
index a0a66f31e..2e9b8ae9a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/N1qlSecondaryIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java b/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java
index 5f0c0dce0..775605c53 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/Query.java b/src/main/java/org/springframework/data/couchbase/core/query/Query.java
index 2a549b948..592bd42d6 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/Query.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
index 0848cb916..70346ac2c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java
index 65f9415ad..5bc5a199a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteriaDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 the original author or authors.
+ * Copyright 2010-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java b/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java
index 35a13ebd3..96d7c53bb 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/StringQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/View.java b/src/main/java/org/springframework/data/couchbase/core/query/View.java
index e3caae868..eb0cff9fc 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/View.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/View.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java b/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java
index 007c77d21..d454ed6e2 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/ViewIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java b/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java
index 5245077e6..6f35f1001 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/WithConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java b/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java
index 96b88fadd..bdb1d2b7a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/AnyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java
index 9018d4091..28a8374ed 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/AnyIdReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/ConsistentWith.java b/src/main/java/org/springframework/data/couchbase/core/support/ConsistentWith.java
index b94ce527e..43fd47da7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/ConsistentWith.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/ConsistentWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java b/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java
index 53c718761..2faf860ad 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/InCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/InScope.java b/src/main/java/org/springframework/data/couchbase/core/support/InScope.java
index 3063131f9..10b3b573b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/InScope.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/InScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java
index bf02516fb..3ce652e75 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java
index d9063714e..89b0dfac0 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java
index 4e5b50b8e..c0c614a20 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllEntityReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java
index 5303c6d86..9a8cd5053 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExists.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java
index 0305ef4b6..00bf17d06 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllExistsReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java
index 8e2b4bcb9..f45304fdb 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java
index 65fe4219f..dad971732 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllIdReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java
index 14b880947..cb21779e7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/OneAndAllReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java b/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java
index c36b7fb1b..2e3db313f 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/PseudoArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java b/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java
index c5fc3ce21..a157dc5fc 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/TemplateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java
index 48c6bae5c..1384d0c79 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java
index 32671508f..60a3c0905 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java
index e0b59c5ec..786458c2e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithAnalyticsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithBatchByteLimit.java b/src/main/java/org/springframework/data/couchbase/core/support/WithBatchByteLimit.java
index 2edfd18c8..9f8b855c9 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithBatchByteLimit.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithBatchByteLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithBatchItemLimit.java b/src/main/java/org/springframework/data/couchbase/core/support/WithBatchItemLimit.java
index 30337b632..cd844a87e 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithBatchItemLimit.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithBatchItemLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java b/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java
index 1a0ea99ff..98739a813 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java b/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java
index fa0ebeff7..8b85ce527 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithDistinct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java b/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java
index aeebb9750..52e5201e4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithDurability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java
index 3d2732912..651e4e175 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithExistsOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java b/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java
index 61d72186f..dd8aed9f7 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithExpiry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java
index 89426f149..34605040b 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithGetAnyReplicaOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java
index 496afa06c..2aca9a984 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithGetOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java
index f7ea39c51..af39354f4 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithInsertOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithLock.java b/src/main/java/org/springframework/data/couchbase/core/support/WithLock.java
index ba01d9908..db37fd548 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithLock.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInOptions.java
index bb1b214c9..601930300 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInPaths.java b/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInPaths.java
index e12bf792b..063c94a3d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInPaths.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithMutateInPaths.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java
index 69ae2d562..283da2b93 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithProjecting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java
index 4c59a278d..cca67be04 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithProjection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java b/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java
index 933d3e45f..50cc22531 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithProjectionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java b/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java
index 9a3f95dfe..02e1f14d8 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java
index 7d179bdc0..2547e023c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithQueryOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java
index 1193162b1..c1140a8d6 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithRemoveOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java
index a570e128f..3982bec8a 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithReplaceOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithScanOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithScanOptions.java
index bdeb9db86..9448dd8d8 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithScanOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithScanOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithScanSort.java b/src/main/java/org/springframework/data/couchbase/core/support/WithScanSort.java
index 2343f3bf6..183914fcf 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithScanSort.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithScanSort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java b/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java
index 5aae61eb9..629767711 100644
--- a/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java
+++ b/src/main/java/org/springframework/data/couchbase/core/support/WithUpsertOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/querydsl/document/AbstractCouchbaseQueryDSL.java b/src/main/java/org/springframework/data/couchbase/querydsl/document/AbstractCouchbaseQueryDSL.java
index 868b2c06a..62a1c6b98 100644
--- a/src/main/java/org/springframework/data/couchbase/querydsl/document/AbstractCouchbaseQueryDSL.java
+++ b/src/main/java/org/springframework/data/couchbase/querydsl/document/AbstractCouchbaseQueryDSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/querydsl/document/CouchbaseDocumentSerializer.java b/src/main/java/org/springframework/data/couchbase/querydsl/document/CouchbaseDocumentSerializer.java
index 77b00f7ed..866f951bf 100644
--- a/src/main/java/org/springframework/data/couchbase/querydsl/document/CouchbaseDocumentSerializer.java
+++ b/src/main/java/org/springframework/data/couchbase/querydsl/document/CouchbaseDocumentSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/Collection.java b/src/main/java/org/springframework/data/couchbase/repository/Collection.java
index 1e2beabc3..3f7565124 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/Collection.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/Collection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
index ef8596dfc..170a5051d 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java b/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java
index 01660c0b9..a3c40e4a9 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/DynamicProxyable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/Options.java b/src/main/java/org/springframework/data/couchbase/repository/Options.java
index c31aa0806..a01609e08 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/Options.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/Options.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/Query.java b/src/main/java/org/springframework/data/couchbase/repository/Query.java
index 37b465c71..35440eb75 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/Query.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java
index eb125e8ea..8a337e65b 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java b/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java
index a9bf927cd..96f4a9db4 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/ScanConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/Scope.java b/src/main/java/org/springframework/data/couchbase/repository/Scope.java
index b201a56f5..bcd9e7e08 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/Scope.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
index 5e770f948..7513514be 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java
index bbda6b531..bc16d5e67 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableCouchbaseAuditing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java
index 0013254c7..eead779ac 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/EnableReactiveCouchbaseAuditing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java
index 74926650c..c4533e4d4 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/PersistentEntitiesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java
index 14e2691d8..ee4db995f 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/auditing/ReactiveCouchbaseAuditingRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java
index ce36778ce..a1dd976c8 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java
index 27e9d83c5..bac5e45ef 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/cdi/CouchbaseRepositoryExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
index abc9530e6..716237390 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
index 7232d0b26..2f7888dae 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/CouchbaseRepositoryConfigurationExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java b/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
index 402ab8495..d0e12943e 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/EnableCouchbaseRepositories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java b/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java
index 0399cd759..0bf52ed11 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/EnableReactiveCouchbaseRepositories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java
index 503c70f7e..8359781b9 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java
index 1a6074ab5..9b6f9815d 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveCouchbaseRepositoryConfigurationExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java
index f0e4836f3..b9a983a1c 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/ReactiveRepositoryOperationsMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java b/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java
index ece36e106..44c121642 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/config/RepositoryOperationsMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/package-info.java
index b6a2422fc..5a26eed86 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/package-info.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java
index 3d2c8ea96..2a6deb4e3 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java
index 185ca1430..5baa9b4cc 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
index d34616ab2..30fcb4c53 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractN1qlBasedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java
index 0481a13f6..2e7e32646 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/AbstractReactiveCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java b/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java
index 65a14bbce..0bfb7ceeb 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ConvertingIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
index 0a4c63b50..a6e8491df 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseEntityInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java
index 581239951..d4344a1cb 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbasePartTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java
index 8a5f079d5..e9478be35 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java
index 545a585c1..480faa141 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseQueryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java
index 0f0586199..065ded5b1 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java b/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java
index 5c56b8e9b..32f7f9c6b 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/CountFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
index 481215b10..0456e9519 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlCountQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java
index 7b5753327..c56feba96 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlMutateQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
index a2935a095..180fe56ca 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java
index 8b5bd58e4..1d477a1cb 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/N1qlRepositoryQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java
index 418bee5f6..60d962bdd 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/OldN1qlQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java
index a2c4f7902..fa0e96e7f 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
index cb2c0e0d2..92aa03865 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlBasedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java
index ccc0aab5a..681096ba5 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/PartTreeN1qlQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
index 700f0c392..e8084cebe 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveAbstractN1qlBasedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java
index 38344b120..e2b6126be 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java
index df33f1123..11813f840 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java
index 3c6e77664..9c24e6376 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseQueryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java
index 51a63b31d..ccc3319b1 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java
index 9bf2402d7..eb186be2d 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveN1qlRepositoryQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java
index 8879591aa..e84dc3c34 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java
index bfa35851f..1246d4f63 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactivePartTreeN1qlBasedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java
index 9552bab30..c1e93b4db 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ReactiveStringBasedCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java b/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java
index 2b1424fa1..37f152116 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/ResultProcessingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java
index f547a4e68..ee4c3be85 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
index eb079c5dc..ca0c454da 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java
index 10c39cee7..7aab0ff12 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java
index 0fdb7ab84..a61680228 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/support/AwtPointInShapeEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java
index a09a1333e..10738b360 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/support/GeoUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java
index 151b6798f..83d4d2ed6 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlQueryCreatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java
index 7d9bf8fb3..eac409ce5 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java b/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java
index e7f0a2617..0769d09eb 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/support/PointInShapeEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java b/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java
index 14e97ac9e..05f994976 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/BasicQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java
index c3b26b540..2f3071611 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2024 the original author or authors.
+ * Copyright 2011-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.
@@ -79,7 +79,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 			return ALLOW_OTHER_PROCESSORS_TO_CLAIM_ANNOTATIONS;
 		}
 
-    Configuration conf = createConfiguration(roundEnv);
+                Configuration conf = createConfiguration(roundEnv);
 		try {
 			conf.getTypeMappings();
 		} catch (NoClassDefFoundError cnfe ){
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java
index a4a030b3e..e8d8edcfb 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
index 871528943..5bb32aad0 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
index 79455864a..95cf7f640 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CouchbaseRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java
index dd3a0c40c..3490d82a8 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java
index 1a337213f..38f974202 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/CrudMethodMetadataPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java b/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java
index 8895ba1f1..4d1722bf5 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/DBRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java b/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java
index 4f7c32bfa..3bbe8ba0e 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/DynamicInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java
index f9397144a..f174bcc1a 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/FetchableFluentQuerySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/FindMethod.java b/src/main/java/org/springframework/data/couchbase/repository/support/FindMethod.java
index 6d59a5815..22b37479e 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/FindMethod.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/FindMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-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.
@@ -66,6 +66,14 @@ private static Method internalFind(Method[] toTest, String name, Class[] paramet
             }
             int j;
             for (j = 0; j < l; j++) {
+                if(params[j] == int.class && parameterTypes[j] == Integer.class )
+                    continue;
+                if(params[j] == long.class && parameterTypes[j] == Long.class )
+                    continue;
+                if(params[j] == double.class && parameterTypes[j] == Double.class )
+                    continue;
+                if(params[j] == boolean.class && parameterTypes[j] == Boolean.class )
+                    continue;
                 if (!params[j].isAssignableFrom(parameterTypes[j]))
                     break;
             }
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java b/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
index c3d93d501..aaa8e498d 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/MappingCouchbaseEntityInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java
index 8b7cf9380..5964f6251 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslCouchbasePredicateExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java
index 93cf6f59e..ef9cdc6c1 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/QuerydslPredicateExecutorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java
index 8c5a9221b..667e96088 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java
index 12f18e096..d7df9c770 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/ReactiveCouchbaseRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
index 2b2b22da0..f71ea46cd 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java
index 7f7d8bba9..7d7eebfc5 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java
index d90ae07f3..75fff6399 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java
index 131914e26..805583e4f 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java
index 2af2a5108..07b4d5d30 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2024 the original author or authors.
+ * Copyright 2011-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/Util.java b/src/main/java/org/springframework/data/couchbase/repository/support/Util.java
index 9af5ecf67..873379b2c 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/Util.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java b/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java
index 757b51c0d..60654db7d 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/ViewMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java
index 32fa4b576..205691d89 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java b/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java
index 85b7a3f5d..59123d022 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/support/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java
index 96c1ae896..0bd56a69a 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseCallbackTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -18,6 +18,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -89,6 +90,7 @@ public <T> T execute(TransactionDefinition definition, TransactionCallback<T> ca
 	@Stability.Internal
 	<T> Flux<T> executeReactive(TransactionDefinition definition,
 			org.springframework.transaction.reactive.TransactionCallback<T> callback) {
+		final CouchbaseResourceHolder couchbaseResourceHolder = new CouchbaseResourceHolder(null,  getSecurityContext()); // caller's resources
 		return TransactionalSupport.checkForTransactionInThreadLocalStorage().flatMapMany(isInTransaction -> {
 			boolean isInExistingTransaction = isInTransaction.isPresent();
 			boolean createNewTransaction = handlePropagation(definition, isInExistingTransaction);
@@ -100,17 +102,20 @@ <T> Flux<T> executeReactive(TransactionDefinition definition,
 			} else {
 				return Mono.error(new UnsupportedOperationException("Unsupported operation"));
 			}
-		});
+		}).contextWrite( // set CouchbaseResourceHolder containing caller's SecurityContext
+				ctx -> ctx.put(CouchbaseResourceHolder.class, couchbaseResourceHolder));
 	}
 
 	private <T> T executeNewTransaction(TransactionCallback<T> callback) {
 		final AtomicReference<T> execResult = new AtomicReference<>();
+		final CouchbaseResourceHolder couchbaseResourceHolder = new CouchbaseResourceHolder(null,  getSecurityContext());
 
 		// Each of these transactions will block one thread on the underlying SDK's transactions scheduler. This
 		// scheduler is effectively unlimited, but this can still potentially lead to high thread usage by the application.
 		// If this is an issue then users need to instead use the standard Couchbase reactive transactions SDK.
 		try {
 			TransactionResult ignored = couchbaseClientFactory.getCluster().transactions().run(ctx -> {
+				setSecurityContext(couchbaseResourceHolder.getSecurityContext()); // set the security context for the transaction
 				CouchbaseTransactionStatus status = new CouchbaseTransactionStatus(ctx, true, false, false, true, null);
 
 				T res = callback.doInTransaction(status);
@@ -173,12 +178,16 @@ public boolean isCompleted() {
 					}
 				};
 
-				return Flux.from(callback.doInTransaction(status)).doOnNext(v -> out.add(v)).then(Mono.defer(() -> {
-					if (status.isRollbackOnly()) {
-						return Mono.error(new TransactionRollbackRequestedException("TransactionStatus.isRollbackOnly() is set"));
-					}
-					return Mono.empty();
-				}));
+				// Get caller's resources, set SecurityContext for the transaction
+				return CouchbaseResourceOwner.get().map(cbrh -> cbrh.map( c -> setSecurityContext(c.getSecurityContext())))
+						.flatMap(ignore -> Flux.from(callback.doInTransaction(status)).doOnNext(v -> out.add(v))
+								.then(Mono.defer(() -> {
+									if (status.isRollbackOnly()) {
+										return Mono.error(new TransactionRollbackRequestedException(
+												"TransactionStatus.isRollbackOnly() is set"));
+									}
+									return Mono.empty();
+								})));
 			});
 
 		}, this.options).thenMany(Flux.defer(() -> Flux.fromIterable(out))).onErrorMap(ex -> {
@@ -288,4 +297,27 @@ public void rollback(TransactionStatus ignored) throws TransactionException {
 		throw new UnsupportedOperationException(
 				"Direct programmatic use of the Couchbase PlatformTransactionManager is not supported");
 	}
+
+	static private Object getSecurityContext() {
+		try {
+			Class<?> securityContextHolderClass = Class
+					.forName("org.springframework.security.core.context.SecurityContextHolder");
+			return securityContextHolderClass.getMethod("getContext").invoke(null);
+		} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
+				| InvocationTargetException cnfe) {
+		}
+		return null;
+	}
+
+	static private <S> S setSecurityContext(S sc) {
+		try {
+			Class<?> securityContextHolder = Class.forName("org.springframework.security.core.context.SecurityContext");
+			Class<?> securityContextHolderClass = Class
+					.forName("org.springframework.security.core.context.SecurityContextHolder");
+			securityContextHolderClass.getMethod("setContext", new Class[] { securityContextHolder }).invoke(null, sc);
+		} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
+				| InvocationTargetException cnfe) {}
+		return sc;
+	}
+
 }
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java
index ae2085d21..d0d54be0d 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
@@ -34,6 +34,8 @@
 public class CouchbaseResourceHolder extends ResourceHolderSupport {
 
 	private @Nullable CoreTransactionAttemptContext core; // which holds the atr
+	private @Nullable Object securityContext; // SecurityContext. We don't have the class.
+
 	Map<Integer, Object> getResultMap = new HashMap<>();
 
 	/**
@@ -42,7 +44,17 @@ public class CouchbaseResourceHolder extends ResourceHolderSupport {
 	 * @param core the associated {@link CoreTransactionAttemptContext}. Can be {@literal null}.
 	 */
 	public CouchbaseResourceHolder(@Nullable CoreTransactionAttemptContext core) {
+		this(core, null);
+	}
+
+	/**
+	 * Create a new {@link CouchbaseResourceHolder} for a given {@link CoreTransactionAttemptContext session}.
+	 *
+	 * @param core the associated {@link CoreTransactionAttemptContext}. Can be {@literal null}.
+	 */
+	public CouchbaseResourceHolder(@Nullable CoreTransactionAttemptContext core, @Nullable Object securityContext) {
 		this.core = core;
+		this.securityContext = securityContext;
 	}
 
 	/**
@@ -53,6 +65,14 @@ public CoreTransactionAttemptContext getCore() {
 		return core;
 	}
 
+	/**
+	 * @return the associated {@link CoreTransactionAttemptContext}. Can be {@literal null}.
+	 */
+	@Nullable
+	public Object getSecurityContext() {
+		return securityContext;
+	}
+
 	public Object transactionResultHolder(Object holder, Object o) {
 		getResultMap.put(System.identityHashCode(o), holder);
 		return holder;
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceOwner.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceOwner.java
new file mode 100644
index 000000000..8be143e67
--- /dev/null
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseResourceOwner.java
@@ -0,0 +1,41 @@
+package org.springframework.data.couchbase.transaction;
+
+import reactor.core.publisher.Mono;
+
+import java.util.Optional;
+
+import com.couchbase.client.core.annotation.Stability.Internal;
+
+@Internal
+public class CouchbaseResourceOwner {
+	private static final ThreadLocal<CouchbaseResourceHolder> marker = new ThreadLocal();
+
+	public CouchbaseResourceOwner() {}
+
+	public static void set(CouchbaseResourceHolder toInject) {
+		if (marker.get() != null) {
+			throw new IllegalStateException(
+					"Trying to set resource holder when already inside a transaction - likely an internal bug, please report it");
+		} else {
+			marker.set(toInject);
+		}
+	}
+
+	public static void clear() {
+		marker.remove();
+	}
+
+	public static Mono<Optional<CouchbaseResourceHolder>> get() {
+		return Mono.deferContextual((ctx) -> {
+			CouchbaseResourceHolder fromThreadLocal = marker.get();
+			CouchbaseResourceHolder fromReactive = ctx.hasKey(CouchbaseResourceHolder.class)
+					? ctx.get(CouchbaseResourceHolder.class)
+					: null;
+			if (fromThreadLocal != null) {
+				return Mono.just(Optional.of(fromThreadLocal));
+			} else {
+				return fromReactive != null ? Mono.just(Optional.of(fromReactive)) : Mono.just(Optional.empty());
+			}
+		});
+	}
+}
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java
index b2cd229df..71b81a989 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java
index 5620ffd48..6cd7accc8 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java
index 3705af7c4..19641cda8 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java
index 876f65354..8130573ac 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/CouchbaseTransactionalOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java
index 461a4af94..20b797270 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionRollbackRequestedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java
index 004f10700..131da19d2 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemAmbiguousException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java
index 4e98bfe63..f73e0f4c9 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemCouchbaseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java
index 54d8ad82f..0fa0c2faf 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/error/TransactionSystemUnambiguousException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java b/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java
index b762e875f..b13cbfea8 100644
--- a/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java
+++ b/src/main/java/org/springframework/data/couchbase/transaction/error/UncategorizedTransactionDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 616ab13f5..000000000
--- a/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.data.couchbase.repository.support.CouchbaseAnnotationProcessor
\ No newline at end of file
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 190db66c8..2ec297274 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data Couchbase 5.3 GA (2024.0.0)
+Spring Data Couchbase 5.3.10 (2024.0.10)
 Copyright (c) [2013-2019] Couchbase / Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -43,6 +43,16 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java b/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java
index cd0ebf367..1e5d8a95d 100644
--- a/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java
+++ b/src/test/java/org/springframework/data/couchbase/cache/CacheUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -26,9 +26,11 @@
  */
 class CacheUser implements Serializable {
 	// private static final long serialVersionUID = 8817717605659870262L;
-	String firstname;
-	String lastname;
-	String id;
+	String firstname; // must have getter/setter for Serialize/Deserialize
+	String lastname; // must have getter/setter for Serialize/Deserialize
+	String id; // must have getter/setter for Serialize/Deserialize
+
+	public CacheUser() {};
 
 	public CacheUser(String id, String firstname, String lastname) {
 		this.id = id;
@@ -40,6 +42,25 @@ public String getId() {
 		return id;
 	}
 
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public String getLastname() {
+		return lastname;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
 	// define equals for assertEquals()
 	public boolean equals(Object o) {
 		if (o == null) {
diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java
index 99fe7c5c3..f0153fb49 100644
--- a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -68,6 +68,32 @@ void cachePutGet() {
 		assertEquals(user2, cache.get(user2.getId()).get()); // get user2
 	}
 
+	@Test
+	void cacheGetValueLoaderWithClass() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		assertNull(cache.get(user1.getId(), CacheUser.class)); // was not put -> cacheMiss
+		assertEquals(user1, cache.get(user1.getId(), () -> user1)); // put and get user1
+		assertEquals(user1, cache.get(user1.getId(), () -> user1, CacheUser.class)); // already put, get user1
+
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user2.getId(), CacheUser.class)); // was not put -> cacheMiss
+		assertEquals(user2, cache.get(user2.getId(), () -> user2, CacheUser.class)); // put and get user2
+		assertEquals(user2, cache.get(user2.getId(), () -> user2, CacheUser.class)); // already put, get user2
+	}
+
+	@Test
+	void cacheGetValueLoaderNoClass() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		assertNull(cache.get(user1.getId())); // was not put -> cacheMiss
+		assertEquals(user1, cache.get(user1.getId(), () -> user1)); // put and get user1
+		assertEquals(user1, cache.get(user1.getId(), () -> user1)); // already put, get user1
+
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user2.getId())); // was not put -> cacheMiss
+		assertEquals(user2, cache.get(user2.getId(), () -> user2)); // put and get user2
+		assertEquals(user2, cache.get(user2.getId(), () -> user2)); // already put, get user2
+	}
+
 	@Test
 	void cacheEvict() {
 		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionTranscoderIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionTranscoderIntegrationTests.java
new file mode 100644
index 000000000..c77d31608
--- /dev/null
+++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheCollectionTranscoderIntegrationTests.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2022-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.
+ * You may obtain a copy of the License at
+ *
+ *        https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.couchbase.cache;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.UUID;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.domain.Config;
+import org.springframework.data.couchbase.util.Capabilities;
+import org.springframework.data.couchbase.util.ClusterType;
+import org.springframework.data.couchbase.util.CollectionAwareIntegrationTests;
+import org.springframework.data.couchbase.util.IgnoreWhen;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+/**
+ * CouchbaseCache tests Theses tests rely on a cb server running.
+ *
+ * @author Michael Reiche
+ */
+@IgnoreWhen(clusterTypes = ClusterType.MOCKED, missesCapabilities = { Capabilities.COLLECTIONS })
+@SpringJUnitConfig(Config.class)
+@DirtiesContext
+class CouchbaseCacheCollectionTranscoderIntegrationTests extends CollectionAwareIntegrationTests {
+
+	volatile CouchbaseCache cache;
+
+	@Autowired CouchbaseTemplate couchbaseTemplate;
+
+	@BeforeEach
+	@Override
+	public void beforeEach() {
+		super.beforeEach();
+		cache = CouchbaseCacheManager.create(couchbaseTemplate.getCouchbaseClientFactory()).createCouchbaseCache(
+				"myCache", CouchbaseCacheConfiguration.defaultCacheConfig().collection("my_collection").valueTranscoder(
+						couchbaseTemplate.getCouchbaseClientFactory().getCluster().environment().transcoder()));
+
+		cache.clear();
+	}
+
+	@Test
+	void cachePutGet() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user1.getId(), CacheUser.class)); // was not put -> cacheMiss
+		cache.put(user1.getId(), user1); // put user1
+		cache.put(user2.getId(), user2); // put user2
+		assertEquals(user1, cache.get(user1.getId(), CacheUser.class)); // get user1
+		assertEquals(user2, cache.get(user2.getId(), CacheUser.class)); // get user2
+	}
+
+	@Test
+	void cacheGetValueLoaderWithClass() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		assertNull(cache.get(user1.getId(), CacheUser.class)); // was not put -> cacheMiss
+		assertEquals(user1, cache.get(user1.getId(), () -> user1)); // put and get user1
+		assertEquals(user1, cache.get(user1.getId(), () -> user1, CacheUser.class)); // already put, get user1
+
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user2.getId(), CacheUser.class)); // was not put -> cacheMiss
+		assertEquals(user2, cache.get(user2.getId(), () -> user2, CacheUser.class)); // put and get user2
+		assertEquals(user2, cache.get(user2.getId(), () -> user2, CacheUser.class)); // already put, get user2
+	}
+
+	@Test
+	void cacheGetValueLoaderNoClass() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		assertNull(cache.get(user1.getId())); // was not put -> cacheMiss
+		assertEquals(user1, cache.get(user1.getId(), () -> user1)); // put and get user1
+		assertEquals(user1, cache.get(user1.getId(), () -> user1, CacheUser.class)); // already put, get user1, needs class
+
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user2.getId())); // was not put -> cacheMiss
+		assertEquals(user2, cache.get(user2.getId(), () -> user2)); // put and get user2
+		assertEquals(user2, cache.get(user2.getId(), () -> user2 , CacheUser.class)); // already put, get user2, needs class
+	}
+
+	@Test
+	void cacheEvict() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		cache.put(user1.getId(), user1); // put user1
+		cache.put(user2.getId(), user2); // put user2
+		cache.evict(user1.getId()); // evict user1
+		assertNull(cache.get(user1.getId(), CacheUser.class)); // get user1 -> not present
+		assertEquals(user2, cache.get(user2.getId(), CacheUser.class)); // get user2 -> present
+	}
+
+	@Test
+	void cacheClear() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		cache.put(user1.getId(), user1); // put user1
+		cache.put(user2.getId(), user2); // put user2
+		cache.clear();
+		assertNull(cache.get(user1.getId(), CacheUser.class)); // get user1 -> not present
+		assertNull(cache.get(user2.getId(), CacheUser.class)); // get user2 -> not present
+	}
+
+	@Test
+	void cacheHitMiss() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.get(user2.getId(), CacheUser.class)); // get user2 -> cacheMiss
+		// cache.put(user1.getId(), null); // JsonTranscoder cannot handle null
+		// assertNotNull(cache.get(user1.getId(),CacheUser.class)); // cacheHit null
+		// assertNull(cache.get(user1.getId(),CacheUser.class)); // fetch cached null
+	}
+
+	@Test
+	void cachePutIfAbsent() {
+		CacheUser user1 = new CacheUser(UUID.randomUUID().toString(), "first1", "last1");
+		CacheUser user2 = new CacheUser(UUID.randomUUID().toString(), "first2", "last2");
+		assertNull(cache.putIfAbsent(user1.getId(), user1, CacheUser.class)); // should put user1, return null
+		assertEquals(user1, cache.putIfAbsent(user1.getId(), user2, CacheUser.class)); // should not put user2, should
+																						// return user1
+		assertEquals(user1, cache.get(user1.getId(), CacheUser.class)); // user1.getId() is still user1
+	}
+
+}
diff --git a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java
index 9eaddfddd..ea04bb39b 100644
--- a/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/cache/CouchbaseCacheIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
index 68ed965f3..e6306e7d2 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateKeyValueIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java
index 260be1936..c698a7361 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java
index cedc65d61..c6c3705fd 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java
index f196c5118..6fcfda15e 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/CustomTypeKeyIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
index 2dba89bca..e178dafc4 100644
--- a/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateKeyValueIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java b/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java
index f0a419d8c..4bbe1db33 100644
--- a/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/convert/translation/JacksonTranslationServiceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java
index 95bd73795..87ded75f9 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentEntityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java
index 0be6d0928..fbe3ea977 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java
index 4974d7adb..0a80135a5 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/CustomConvertersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
index ae096e5b1..f8c39c407 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java b/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
index 70379e7d9..f699644ca 100644
--- a/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java
index 61ee6e567..6b9f280de 100644
--- a/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/query/ReactiveCouchbaseTemplateQueryCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java
index c3e61fbb7..8c2b1fcc0 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AbstractEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java
index a9cc6a1fc..465eaf028 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AbstractUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java
index ca1fdd03a..95d002de4 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AbstractUserRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java
index 74d680391..776671693 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AbstractingMappingCouchbaseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java b/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java
index 03e9cb481..8fafdabdd 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AbstractingTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Address.java b/src/test/java/org/springframework/data/couchbase/domain/Address.java
index d5068e744..6f39a5ac0 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Address.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java
index a171a06cd..4afadee23 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AddressAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java b/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java
index 990197c07..fb8a66ba1 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AddressWithEncStreet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Airline.java b/src/test/java/org/springframework/data/couchbase/domain/Airline.java
index 7754e3ce0..bbe1210fd 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Airline.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Airline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectioned.java b/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectioned.java
index 051e7b4b9..af84ba42c 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectioned.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectioned.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectionedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectionedRepository.java
index 0d1681cbe..a3f3a6ab4 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectionedRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirlineCollectionedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java
index 04a7bb4dd..fb01833d9 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirlineRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Airport.java b/src/test/java/org/springframework/data/couchbase/domain/Airport.java
index 74940cd61..9bad65f5b 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Airport.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Airport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValue.java b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValue.java
index 82a18ecf4..b19781423 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValue.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValueRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValueRepository.java
index 73ec94556..a1d1a9a58 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValueRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValueRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValuedObject.java b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValuedObject.java
index f0c7569b5..ebb1b34e4 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValuedObject.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportJsonValuedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java b/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java
index d633c557f..f85d5d8f7 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportMini.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
index a5502a541..64cc95320 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java
index 6fa6ef096..50c7819a7 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java
index f94e693b2..89bf638ad 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportRepositoryScanConsistencyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java b/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java
index 491ef34bd..3b4728f25 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AssessmentDO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/BigAirline.java b/src/test/java/org/springframework/data/couchbase/domain/BigAirline.java
index 8272b765e..a85992999 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/BigAirline.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/BigAirline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/BigAirlineRepository.java b/src/test/java/org/springframework/data/couchbase/domain/BigAirlineRepository.java
index b19f397be..8534ee2d6 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/BigAirlineRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/BigAirlineRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java b/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java
index fba8ec4e1..ab018e3cf 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/CapellaConnectSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java b/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java
index ef77e6eec..af5b5e992 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ComparableEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Config.java b/src/test/java/org/springframework/data/couchbase/domain/Config.java
index 0d9cbc04e..047766660 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Config.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ConfigScoped.java b/src/test/java/org/springframework/data/couchbase/domain/ConfigScoped.java
index eaea62695..e67a69239 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ConfigScoped.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ConfigScoped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Course.java b/src/test/java/org/springframework/data/couchbase/domain/Course.java
index d60d2022c..58715ee55 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Course.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Course.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java b/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java
index ff4e07822..f7c0d60c8 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/CustomMappingCouchbaseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/EBTurbulenceCategory.java b/src/test/java/org/springframework/data/couchbase/domain/EBTurbulenceCategory.java
index 57c3cfd9f..3fe41a9f4 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/EBTurbulenceCategory.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/EBTurbulenceCategory.java
@@ -1,7 +1,7 @@
 package org.springframework.data.couchbase.domain;
 
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/EITurbulenceCategory.java b/src/test/java/org/springframework/data/couchbase/domain/EITurbulenceCategory.java
index 70d4b45ea..01b61710e 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/EITurbulenceCategory.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/EITurbulenceCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/EJsonCreatorTurbulenceCategory.java b/src/test/java/org/springframework/data/couchbase/domain/EJsonCreatorTurbulenceCategory.java
index f2a874996..9dc7dd003 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/EJsonCreatorTurbulenceCategory.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/EJsonCreatorTurbulenceCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ETurbulenceCategory.java b/src/test/java/org/springframework/data/couchbase/domain/ETurbulenceCategory.java
index 1f2cb6c6a..581388bf6 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ETurbulenceCategory.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ETurbulenceCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java
index dbd8f356e..f193780df 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/FluxIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Library.java b/src/test/java/org/springframework/data/couchbase/domain/Library.java
index 4f990eb36..65d8ba99b 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Library.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Library.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java b/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java
index 768ec8a8b..16afa96d1 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/LibraryRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/MyPersonRepository.java b/src/test/java/org/springframework/data/couchbase/domain/MyPersonRepository.java
index 19d6c1f49..973c9144d 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/MyPersonRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/MyPersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java b/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java
index 5abc2aaec..dbaf94839 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/NaiveAuditorAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java b/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java
index f03448551..e8181978b 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/OtherUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Person.java b/src/test/java/org/springframework/data/couchbase/domain/Person.java
index a450555a9..c42c46e20 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Person.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java b/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java
index 84071162f..7f76f490f 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
index 9b6e048ac..a89aac043 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java b/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java
index 97cfe543d..88f6aafc0 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonValueRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability.java b/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability.java
index 10ce6568e..c49c53939 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability2.java b/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability2.java
index f2f25a9ae..4f991b616 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability2.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonWithDurability2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java b/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java
index 43d7245b3..ed3494804 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/PersonWithoutVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java
index d36fd846c..b7312f716 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirlineRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java
index 3ea4f229b..42870920e 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
@@ -54,6 +54,9 @@ public interface ReactiveAirportRepository
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 	Flux<Airport> findAll();
 
+	@Query("#{#n1ql .selectEntity} WHERE #{#n1ql.filter} ORDER BY $3 $4 LIMIT $1 OFFSET $2 ")
+	Flux<Airport> findAllTestPrimitives(int iint, long llong, double ddouble, boolean bbolean);
+
 	@Override
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 	Mono<Void> deleteAll();
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java
index 6478c0207..405ff3c35 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveAirportRepositoryAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java
index c5e1888fe..c13ebd5b9 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveNaiveAuditorAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java
index 459a75e0c..0f0205b57 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactivePersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java
index 360a6b44c..2052fcdc2 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserColRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java
index b61ae9b6e..e0213153a 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/ReactiveUserRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Submission.java b/src/test/java/org/springframework/data/couchbase/domain/Submission.java
index de4245d40..acf93aa31 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/Submission.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/Submission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java
index 2dbf81ed3..e6bb6d7b9 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java
index bca13b3de..b9da11482 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/SubscriptionTokenRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java b/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java
index 9d56fe140..01ea68694 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/TestEncrypted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/User.java b/src/test/java/org/springframework/data/couchbase/domain/User.java
index 268ce707d..0d6cd7124 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/User.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java
index b74fa1c3b..05ea6e17b 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java
index 5a9ffb711..526b1e6e7 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java
index 48b4b80a1..2953a7104 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotated3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurability.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurability.java
index fdea2f319..e359011db 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurability.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurabilityExpression.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurabilityExpression.java
index 6f18c883d..e78431a7c 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurabilityExpression.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedDurabilityExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedPersistTo.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedPersistTo.java
index 627b2cc72..9b6e303f3 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedPersistTo.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedPersistTo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedReplicateTo.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedReplicateTo.java
index 8736f5e1f..e3ffff6cc 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedReplicateTo.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedReplicateTo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedTouchOnRead.java b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedTouchOnRead.java
index f22ccb143..5c66f7903 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedTouchOnRead.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserAnnotatedTouchOnRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserCol.java b/src/test/java/org/springframework/data/couchbase/domain/UserCol.java
index 8d84e5cff..6c9a22ff3 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserCol.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserCol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java
index cd5b6966d..4592e439e 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserColRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java b/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java
index d627a8cb4..1dd67cdb3 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserEncrypted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java
index 27351cba5..19f5978a0 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserEncryptedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java b/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java
index 104ff28f3..65a9068bd 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserJustLastName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserNoAlias.java b/src/test/java/org/springframework/data/couchbase/domain/UserNoAlias.java
index a08739ee3..24d0571cc 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserNoAlias.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserNoAlias.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java
index f05099c94..637e65173 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java
index 64f4aa261..877d4cbea 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java
index 2dd4b51cd..85eea52d2 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java
index 897563d71..9680902d5 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionAnnotatedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java
index a8274cf12..e5fad8db6 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionProjected.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java
index e8591254b..9134b2e3e 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java
index 084dae2df..84a610d9b 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java
index 37594223b..a89c3f27a 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/UserSubmissionUnannotatedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java b/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java
index e2eb28876..5c16324ef 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/time/AuditingDateTimeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java
index 7d1c3ab72..fc36f4f1a 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/time/CurrentDateTimeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java
index 158d02499..e1f7e9440 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/time/DateTimeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java b/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java
index fd600e9f5..0e56752c6 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/time/FixedDateTimeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java
index ba67e95d6..04c9276c1 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseAbstractRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java
index 76da448f0..4df454de6 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryAutoQueryIndexIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java
index cb9a05df0..727d69879 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryFieldLevelEncryptionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
index ff3fafc0f..9fc18f579 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryKeyValueIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
index c4d3c812c..12a81ede6 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java
index 2c2aafb2c..d5dd4f305 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryKeyValueIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java
index 1ea83af6a..cda628093 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
@@ -41,16 +41,13 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.couchbase.CouchbaseClientFactory;
-import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
 import org.springframework.data.couchbase.domain.Airport;
 import org.springframework.data.couchbase.domain.ReactiveAirportRepository;
 import org.springframework.data.couchbase.domain.ReactiveUserRepository;
 import org.springframework.data.couchbase.domain.User;
-import org.springframework.data.couchbase.repository.config.EnableReactiveCouchbaseRepositories;
 import org.springframework.data.couchbase.util.Capabilities;
 import org.springframework.data.couchbase.util.ClusterType;
 import org.springframework.data.couchbase.util.IgnoreWhen;
@@ -58,9 +55,6 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import com.couchbase.client.core.deps.io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-import com.couchbase.client.core.env.SecurityConfig;
-import com.couchbase.client.java.env.ClusterEnvironment;
 
 /**
  * template class for Reactive Couchbase operations
@@ -99,6 +93,16 @@ void shouldSaveAndFindAll() {
 		}
 	}
 
+	@Test
+	void testPrimitiveArgs() {
+		int iint = 0;
+		long llong = 0;
+		double ddouble = 0.0;
+		boolean bboolean = true;
+		List<Airport> all = reactiveAirportRepository.withScope("_default")
+				.findAllTestPrimitives(iint, llong, ddouble, bboolean).toStream().collect(Collectors.toList());
+	}
+
 	@Test
 	void testQuery() {
 		Airport vie = null;
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryCollectionQuerydslIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryCollectionQuerydslIntegrationTests.java
index eeba5536a..bc5ea6bad 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryCollectionQuerydslIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryCollectionQuerydslIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java
index 28849d27b..83b8fac85 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java
index 95d0cd912..600b0cb19 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java
index f2afe89d4..b47910b09 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/N1qlQueryCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java
index 677981a7a..c98bb4547 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/ReactiveCouchbaseRepositoryQueryCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java
index 0fd5996d4..ef7722964 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java
index c0c7ea7a3..d0935888d 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java b/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java
index aaee74ce2..9728b3d74 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/AfterTransactionAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java
index b88cd5408..6a1ddcc1f 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java
index 01cb2340e..c26502fe6 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbasePersonTransactionReactiveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -18,6 +18,7 @@
 
 import static com.couchbase.client.java.query.QueryScanConsistency.REQUEST_PLUS;
 
+import org.springframework.data.couchbase.util.Util;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -119,6 +120,7 @@ public void shouldRollbackAfterExceptionOfTxAnnotatedMethod() {
 	@Test
 	public void commitShouldPersistTxEntries() {
 
+		System.err.println("parent SecurityContext: " + System.identityHashCode(Util.getSecurityContext()));
 		personService.savePerson(WalterWhite) //
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
@@ -130,6 +132,17 @@ public void commitShouldPersistTxEntries() {
 				.verifyComplete();
 	}
 
+	@Test
+	public void commitShouldPersistTxEntriesBlocking() {
+		System.err.println("parent SecurityContext: " + System.identityHashCode(Util.getSecurityContext()));
+		Person p = personService.savePersonBlocking(WalterWhite);
+
+		operations.findByQuery(Person.class).withConsistency(REQUEST_PLUS).count() //
+				.as(StepVerifier::create) //
+				.expectNext(1L) //
+				.verifyComplete();
+	}
+
 	@Test
 	public void commitShouldPersistTxEntriesOfTxAnnotatedMethod() {
 
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java
index b8c0ca087..ddd6823f3 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseReactiveTransactionNativeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java
index 2ae74420f..2021be224 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionNativeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java
index 7a0125d35..3d5a950a6 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalNonAllowableOperationsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java
index cf719bef1..ce2ff695d 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOperatorTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java
index 271550f36..c00254eae 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalOptionsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java
index 7ef5ce19d..cbd0f536f 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalPropagationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java
index a3ade2bfa..29898d176 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java
index 3123c0ccc..32276cc02 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionDefaultScopeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionDefaultScopeIntegrationTests.java
index 9cf350e04..f3e0a0bba 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionDefaultScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionDefaultScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInTransaction;
+import static org.springframework.data.couchbase.util.Util.assertInAnnotationTransaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -483,20 +484,4 @@ public void fetchAndRemove(String id, AtomicInteger tryCount) {
 
   }
 
-  static void assertInAnnotationTransaction(boolean inTransaction) {
-    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
-    for (StackTraceElement ste : stack) {
-      if (ste.getClassName().startsWith("org.springframework.transaction.interceptor")) {
-        if (inTransaction) {
-          return;
-        }
-      }
-    }
-    if (!inTransaction) {
-      return;
-    }
-    throw new RuntimeException(
-      "in transaction = " + (!inTransaction) + " but expected in annotation transaction = " + inTransaction);
-  }
-
 }
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionIntegrationTests.java
index e0ccbd22b..67cc78630 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateCollectionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInTransaction;
+import static org.springframework.data.couchbase.util.Util.assertInAnnotationTransaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -450,10 +451,10 @@ public Person declarativeFindReplaceTwicePersonCallback(Person person, AtomicInt
     }
 
     @Transactional(timeout = 2)
-
     public Person replace(Person person, AtomicInteger tryCount) {
       assertInAnnotationTransaction(true);
       tryCount.incrementAndGet();
+		System.err.println("try: " + tryCount.get());
       return personOperations.replaceById(Person.class).inScope(scopeName).inCollection(collectionName).one(person);
     }
 
@@ -483,20 +484,4 @@ public void fetchAndRemove(String id, AtomicInteger tryCount) {
 
   }
 
-  static void assertInAnnotationTransaction(boolean inTransaction) {
-    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
-    for (StackTraceElement ste : stack) {
-      if (ste.getClassName().startsWith("org.springframework.transaction.interceptor")) {
-        if (inTransaction) {
-          return;
-        }
-      }
-    }
-    if (!inTransaction) {
-      return;
-    }
-    throw new RuntimeException(
-      "in transaction = " + (!inTransaction) + " but expected in annotation transaction = " + inTransaction);
-  }
-
 }
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java
index d65c60500..8be0c15c5 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -22,7 +22,9 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertInReactiveTransaction;
 import static org.springframework.data.couchbase.transactions.util.TransactionTestUtil.assertNotInTransaction;
+import static org.springframework.data.couchbase.util.Util.assertInAnnotationTransaction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -394,6 +396,7 @@ public Person declarativeSavePerson(Person person) {
 		@Transactional
 		public Person declarativeSavePersonWithThread(Person person, Thread thread) {
 			assertInAnnotationTransaction(true);
+			assertInReactiveTransaction();
 			long currentThreadId = Thread.currentThread().getId();
 			System.out.printf("Thread %d %s, started from %d %s%n", Thread.currentThread().getId(),
 					Thread.currentThread().getName(), thread.getId(), thread.getName());
@@ -483,20 +486,4 @@ public void fetchAndRemove(String id, AtomicInteger tryCount) {
 
 	}
 
-	static void assertInAnnotationTransaction(boolean inTransaction) {
-		StackTraceElement[] stack = Thread.currentThread().getStackTrace();
-		for (StackTraceElement ste : stack) {
-			if (ste.getClassName().startsWith("org.springframework.transaction.interceptor")) {
-				if (inTransaction) {
-					return;
-				}
-			}
-		}
-		if (!inTransaction) {
-			return;
-		}
-		throw new RuntimeException(
-				"in transaction = " + (!inTransaction) + " but expected in annotation transaction = " + inTransaction);
-	}
-
 }
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java
index 5cd83891e..5eb3fafb4 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/CouchbaseTransactionalUnsettableParametersIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java
index 59611207d..858b3c120 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/DirectPlatformTransactionManagerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java b/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java
index 5532c3df5..d006a43d0 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/ObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java b/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java
index 7e090f400..ddf2163f6 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/PersonService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java b/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java
index 87983fd5e..4b6c91916 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/PersonServiceReactive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
@@ -21,6 +21,8 @@
 
 import org.springframework.data.couchbase.core.TransactionalSupport;
 import org.springframework.data.couchbase.domain.PersonWithoutVersion;
+import org.springframework.data.couchbase.transaction.CouchbaseResourceHolder;
+import org.springframework.data.couchbase.util.Util;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -31,6 +33,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.reactive.TransactionalOperator;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+
 /**
  * reactive PersonService for tests
  *
@@ -57,8 +62,15 @@ public Mono<Person> savePersonErrors(Person person) {
 				.<Person> flatMap(it -> Mono.error(new SimulateFailureException()));
 	}
 
+	@Transactional
+	public Person savePersonBlocking(Person person) {
+		System.err.println("savePerson: "+Thread.currentThread().getName() +" "+ System.identityHashCode(Util.getSecurityContext()));
+		return personOperations.insertById(Person.class).one(person);
+	}
+
 	@Transactional
 	public Mono<Person> savePerson(Person person) {
+		System.err.println("savePerson: "+Thread.currentThread().getName() +" "+ System.identityHashCode(Util.getSecurityContext()));
 		return TransactionalSupport.checkForTransactionInThreadLocalStorage().map(stat -> {
 			assertTrue(stat.isPresent(), "Not in transaction");
 			System.err.println("In a transaction!!");
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java
index 18a9b7050..bbd19cb22 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/ReactiveTransactionalTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java b/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java
index 1dba1b69d..ddd835c4b 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/ReplaceLoopThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java b/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java
index f30705c12..1a073de78 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/SimulateFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java
index adb8db0b1..a94a90e97 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/TransactionTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java b/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java
index cf700b4c0..c571188b9 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/TransactionsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java
index d4c4caa43..978150c9d 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsNonAllowableOperationsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java
index 5cd61f878..baa35ca35 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsPersonIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java
index 5c4ca8264..6abb6acff 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKReactiveTransactionsTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java
index e39b51bdf..c8534b5ab 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonAllowableOperationsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java
index ad3ce0fd6..e64f5d8b9 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsNonBlockingThreadIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java
index c37e28c72..07105e04c 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsSaveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java
index 6e1fdd9ae..59e87b860 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/sdk/SDKTransactionsTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java b/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java
index 681e52dbc..c00f83080 100644
--- a/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java
+++ b/src/test/java/org/springframework/data/couchbase/transactions/util/TransactionTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors
+ * Copyright 2022-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/Capabilities.java b/src/test/java/org/springframework/data/couchbase/util/Capabilities.java
index 0e02bb523..83932170a 100644
--- a/src/test/java/org/springframework/data/couchbase/util/Capabilities.java
+++ b/src/test/java/org/springframework/data/couchbase/util/Capabilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java
index c21b54ad5..bf61b7867 100644
--- a/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java b/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java
index c2bbc59dd..a49db2e48 100644
--- a/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java
+++ b/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterType.java b/src/test/java/org/springframework/data/couchbase/util/ClusterType.java
index 819e873b6..da3c0be6e 100644
--- a/src/test/java/org/springframework/data/couchbase/util/ClusterType.java
+++ b/src/test/java/org/springframework/data/couchbase/util/ClusterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/CollectionAwareDefaultScopeIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/CollectionAwareDefaultScopeIntegrationTests.java
index 15d977ebd..a8347738d 100644
--- a/src/test/java/org/springframework/data/couchbase/util/CollectionAwareDefaultScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/util/CollectionAwareDefaultScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java
index c85265203..351900a75 100644
--- a/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/util/CollectionAwareIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors
+ * Copyright 2021-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java b/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java
index e01f8a05a..43911f369 100644
--- a/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java
+++ b/src/test/java/org/springframework/data/couchbase/util/IgnoreWhen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java
index fbd438302..9c3b3f25c 100644
--- a/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java b/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java
index 9e0f01be6..6d0af5a6a 100644
--- a/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java
+++ b/src/test/java/org/springframework/data/couchbase/util/MockTestCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/Services.java b/src/test/java/org/springframework/data/couchbase/util/Services.java
index 7d54368ad..fed8c751e 100644
--- a/src/test/java/org/springframework/data/couchbase/util/Services.java
+++ b/src/test/java/org/springframework/data/couchbase/util/Services.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/TestCluster.java b/src/test/java/org/springframework/data/couchbase/util/TestCluster.java
index 57ccf192c..fd3aec7b9 100644
--- a/src/test/java/org/springframework/data/couchbase/util/TestCluster.java
+++ b/src/test/java/org/springframework/data/couchbase/util/TestCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java b/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java
index 2ecd72139..9ed01e6f9 100644
--- a/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java
+++ b/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java b/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java
index 150b54089..d7a69c719 100644
--- a/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java
+++ b/src/test/java/org/springframework/data/couchbase/util/TestNodeConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java b/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java
index 328081cb5..8591fd42b 100644
--- a/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java
+++ b/src/test/java/org/springframework/data/couchbase/util/UnmanagedTestCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors
+ * Copyright 2012-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.
diff --git a/src/test/java/org/springframework/data/couchbase/util/Util.java b/src/test/java/org/springframework/data/couchbase/util/Util.java
index e54581fa9..cb1f28cc8 100644
--- a/src/test/java/org/springframework/data/couchbase/util/Util.java
+++ b/src/test/java/org/springframework/data/couchbase/util/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors
+ * Copyright 2020-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.
@@ -20,6 +20,7 @@
 import static org.awaitility.Awaitility.with;
 
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -155,7 +156,8 @@ public static <T> Pair<List<T>, List<T>> comprisesNot(Iterable<T> source, T[] al
 	public static void assertInAnnotationTransaction(boolean inTransaction) {
 		StackTraceElement[] stack = Thread.currentThread().getStackTrace();
 		for (StackTraceElement ste : stack) {
-			if (ste.getClassName().startsWith("org.springframework.transaction.interceptor")
+			if (ste.getClassName()
+					.startsWith("org.springframework.data.couchbase.transaction.CouchbaseCallbackTransactionManager")
 					|| ste.getClassName().startsWith("org.springframework.data.couchbase.transaction.interceptor")) {
 				if (inTransaction) {
 					return;
@@ -169,4 +171,26 @@ public static void assertInAnnotationTransaction(boolean inTransaction) {
 				+ " but expected in-annotation-transaction = " + inTransaction);
 	}
 
+	static public Object getSecurityContext(){
+		Object sc = null;
+		try {
+			Class<?> securityContextHolderClass = Class
+				.forName("org.springframework.security.core.context.SecurityContextHolder");
+			sc = securityContextHolderClass.getMethod("getContext").invoke(null);
+		} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
+						 | InvocationTargetException cnfe) {}
+		System.err.println(Thread.currentThread().getName() +" Util.get "+ System.identityHashCode(sc));
+		return sc;
+	}
+
+	static 	public void setSecurityContext(Object sc) {
+		System.err.println(Thread.currentThread().getName() +" Util.set "+ System.identityHashCode(sc));
+		try {
+			Class<?> securityContextHolderClass = Class
+				.forName("org.springframework.security.core.context.SecurityContextHolder");
+			sc = securityContextHolderClass.getMethod("setContext", new Class[]{securityContextHolderClass}).invoke(sc);
+		} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
+						 | InvocationTargetException cnfe) {}
+	}
+
 }