diff --git a/etc/adr/adr-003.adoc b/etc/adr/adr-003.adoc
index 08d0cd6f8..d08e0d54f 100644
--- a/etc/adr/adr-003.adoc
+++ b/etc/adr/adr-003.adoc
@@ -11,7 +11,7 @@ to be part of the public API.
 
 === Decision
 
-Those classes should be marked `@API(status = API.Status.INTERNAL, since = "1.0")` as well as made final to at least
+Those classes should be marked `@API(status = API.Status.INTERNAL, since = "6.0")` as well as made final to at least
 prevent people from inheriting from them.
 
 === Consequences
diff --git a/src/main/java/org/springframework/data/neo4j/config/AbstractNeo4jConfig.java b/src/main/java/org/springframework/data/neo4j/config/AbstractNeo4jConfig.java
index f238b5dec..2b7bd91b1 100644
--- a/src/main/java/org/springframework/data/neo4j/config/AbstractNeo4jConfig.java
+++ b/src/main/java/org/springframework/data/neo4j/config/AbstractNeo4jConfig.java
@@ -34,10 +34,10 @@ import org.springframework.transaction.PlatformTransactionManager;
  *
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 @Configuration
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 @Import(Neo4jDefaultCallbacksRegistrar.class)
 public abstract class AbstractNeo4jConfig extends Neo4jConfigurationSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/config/AbstractReactiveNeo4jConfig.java b/src/main/java/org/springframework/data/neo4j/config/AbstractReactiveNeo4jConfig.java
index 9be1900f3..aa8e4a6d6 100644
--- a/src/main/java/org/springframework/data/neo4j/config/AbstractReactiveNeo4jConfig.java
+++ b/src/main/java/org/springframework/data/neo4j/config/AbstractReactiveNeo4jConfig.java
@@ -35,10 +35,10 @@ import org.springframework.transaction.ReactiveTransactionManager;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Configuration
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 @Import(Neo4jDefaultReactiveCallbacksRegistrar.class)
 public abstract class AbstractReactiveNeo4jConfig extends Neo4jConfigurationSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jAuditing.java b/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jAuditing.java
index 55f8d853e..cd0bfc2f7 100644
--- a/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jAuditing.java
+++ b/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jAuditing.java
@@ -30,7 +30,7 @@ import org.springframework.data.domain.AuditorAware;
  * Annotation to enable auditing for SDN entities via annotation configuration.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  * @soundtrack Iron Maiden - Killers
  */
 @Inherited
diff --git a/src/main/java/org/springframework/data/neo4j/config/Neo4jAuditingRegistrar.java b/src/main/java/org/springframework/data/neo4j/config/Neo4jAuditingRegistrar.java
index 1ba3feb96..0c9f9a6ec 100644
--- a/src/main/java/org/springframework/data/neo4j/config/Neo4jAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/neo4j/config/Neo4jAuditingRegistrar.java
@@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
 /**
  * @author Michael J. Simons
  * @soundtrack Iron Maiden - Killers
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/config/Neo4jConfigurationSupport.java b/src/main/java/org/springframework/data/neo4j/config/Neo4jConfigurationSupport.java
index 89523a7fb..918e8e347 100644
--- a/src/main/java/org/springframework/data/neo4j/config/Neo4jConfigurationSupport.java
+++ b/src/main/java/org/springframework/data/neo4j/config/Neo4jConfigurationSupport.java
@@ -38,9 +38,9 @@ import org.springframework.util.StringUtils;
  *
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 abstract class Neo4jConfigurationSupport {
 
 	@Bean
diff --git a/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultCallbacksRegistrar.java b/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultCallbacksRegistrar.java
index f3b66aedd..f10e1c13b 100644
--- a/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultCallbacksRegistrar.java
+++ b/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultCallbacksRegistrar.java
@@ -33,9 +33,9 @@ import org.springframework.data.neo4j.repository.event.OptimisticLockingBeforeBi
  *
  * @author Michael J. Simons
  * @soundtrack AC/DC - High Voltage
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class Neo4jDefaultCallbacksRegistrar implements ImportBeanDefinitionRegistrar {
 
 	@Override
diff --git a/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultReactiveCallbacksRegistrar.java b/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultReactiveCallbacksRegistrar.java
index 3dd81dc08..7854fdfad 100644
--- a/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultReactiveCallbacksRegistrar.java
+++ b/src/main/java/org/springframework/data/neo4j/config/Neo4jDefaultReactiveCallbacksRegistrar.java
@@ -33,9 +33,9 @@ import org.springframework.data.neo4j.repository.event.ReactiveOptimisticLocking
  *
  * @author Michael J. Simons
  * @soundtrack AC/DC - High Voltage
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class Neo4jDefaultReactiveCallbacksRegistrar implements ImportBeanDefinitionRegistrar {
 
 	@Override
diff --git a/src/main/java/org/springframework/data/neo4j/core/DatabaseSelection.java b/src/main/java/org/springframework/data/neo4j/core/DatabaseSelection.java
index d9882a516..2528f0a94 100644
--- a/src/main/java/org/springframework/data/neo4j/core/DatabaseSelection.java
+++ b/src/main/java/org/springframework/data/neo4j/core/DatabaseSelection.java
@@ -26,9 +26,9 @@ import org.springframework.lang.Nullable;
  *
  * @author Michael J. Simons
  * @soundtrack Rage - Reign Of Fear
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class DatabaseSelection {
 
 	private final static DatabaseSelection DEFAULT_DATABASE_NAME = new DatabaseSelection(null);
diff --git a/src/main/java/org/springframework/data/neo4j/core/DatabaseSelectionProvider.java b/src/main/java/org/springframework/data/neo4j/core/DatabaseSelectionProvider.java
index bccdfb9b1..a81461cb3 100644
--- a/src/main/java/org/springframework/data/neo4j/core/DatabaseSelectionProvider.java
+++ b/src/main/java/org/springframework/data/neo4j/core/DatabaseSelectionProvider.java
@@ -33,9 +33,9 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack N.W.A. - Straight Outta Compton
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 @FunctionalInterface
 public interface DatabaseSelectionProvider {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/DefaultNeo4jClient.java b/src/main/java/org/springframework/data/neo4j/core/DefaultNeo4jClient.java
index d2d2712f3..77db9b107 100644
--- a/src/main/java/org/springframework/data/neo4j/core/DefaultNeo4jClient.java
+++ b/src/main/java/org/springframework/data/neo4j/core/DefaultNeo4jClient.java
@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class DefaultNeo4jClient implements Neo4jClient {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/DefaultReactiveNeo4jClient.java b/src/main/java/org/springframework/data/neo4j/core/DefaultReactiveNeo4jClient.java
index 0b1c17066..713624b76 100644
--- a/src/main/java/org/springframework/data/neo4j/core/DefaultReactiveNeo4jClient.java
+++ b/src/main/java/org/springframework/data/neo4j/core/DefaultReactiveNeo4jClient.java
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * @author Michael J. Simons
  * @author Gerrit Meier
  * @soundtrack Die Toten Hosen - Im Auftrag des Herrn
- * @since 1.0
+ * @since 6.0
  */
 class DefaultReactiveNeo4jClient implements ReactiveNeo4jClient {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/DelegatingMappingFunctionWithNullCheck.java b/src/main/java/org/springframework/data/neo4j/core/DelegatingMappingFunctionWithNullCheck.java
index f0326577b..59db8552c 100644
--- a/src/main/java/org/springframework/data/neo4j/core/DelegatingMappingFunctionWithNullCheck.java
+++ b/src/main/java/org/springframework/data/neo4j/core/DelegatingMappingFunctionWithNullCheck.java
@@ -30,7 +30,7 @@ import org.neo4j.driver.types.TypeSystem;
  * @author Michael J. Simons
  * @param <T> The expected type of this function
  * @soundtrack Manowar - Fighting The World
- * @since 1.0
+ * @since 6.0
  */
 class DelegatingMappingFunctionWithNullCheck<T> implements BiFunction<TypeSystem, Record, T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/NamedParameters.java b/src/main/java/org/springframework/data/neo4j/core/NamedParameters.java
index e46dc211b..e71ca8e10 100644
--- a/src/main/java/org/springframework/data/neo4j/core/NamedParameters.java
+++ b/src/main/java/org/springframework/data/neo4j/core/NamedParameters.java
@@ -27,9 +27,9 @@ import org.neo4j.cypherdsl.core.Cypher;
 /**
  * @author Michael J. Simons
  * @soundtrack Bananafishbones - Viva Conputa
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 final class NamedParameters {
 
 	private final Map<String, Object> parameters = new HashMap<>();
diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jClient.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jClient.java
index 40d250476..9489643e7 100644
--- a/src/main/java/org/springframework/data/neo4j/core/Neo4jClient.java
+++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jClient.java
@@ -37,9 +37,9 @@ import org.springframework.lang.Nullable;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface Neo4jClient {
 
 	// TODO Create examples how to use the callbacks etc. with Springs TransactionTemplate to deal with rollbacks etc.
@@ -84,7 +84,7 @@ public interface Neo4jClient {
 	 * Contract for a runnable query that can be either run returning it's result, run without results or be
 	 * parameterized.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableSpec extends RunnableSpecTightToDatabase {
 
@@ -101,7 +101,7 @@ public interface Neo4jClient {
 	/**
 	 * Contract for a runnable query inside a dedicated database.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableSpecTightToDatabase extends BindSpec<RunnableSpecTightToDatabase> {
 
@@ -134,7 +134,7 @@ public interface Neo4jClient {
 	 * Contract for binding parameters to a query.
 	 *
 	 * @param <S> This {@link BindSpec specs} own type
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface BindSpec<S extends BindSpec<S>> {
 
@@ -152,7 +152,7 @@ public interface Neo4jClient {
 	 *
 	 * @param <S> This {@link OngoingBindSpec specs} own type
 	 * @param <T> Binding value type
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface OngoingBindSpec<T, S extends BindSpec<S>> {
 
@@ -175,7 +175,7 @@ public interface Neo4jClient {
 
 	/**
 	 * @param <T> The resulting type of this mapping
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface MappingSpec<T> extends RecordFetchSpec<T> {
 
@@ -191,7 +191,7 @@ public interface Neo4jClient {
 
 	/**
 	 * @param <T> The type to which the fetched records are eventually mapped
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RecordFetchSpec<T> {
 
@@ -221,7 +221,7 @@ public interface Neo4jClient {
 	 * A contract for an ongoing delegation in the selected database.
 	 *
 	 * @param <T> The type of the returned value.
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface OngoingDelegation<T> extends RunnableDelegation<T> {
 
@@ -238,7 +238,7 @@ public interface Neo4jClient {
 	 * A runnable delegation.
 	 *
 	 * @param <T> the type that gets returned
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableDelegation<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jOperations.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jOperations.java
index 387b018ae..a7fdce8b2 100644
--- a/src/main/java/org/springframework/data/neo4j/core/Neo4jOperations.java
+++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jOperations.java
@@ -29,9 +29,9 @@ import org.springframework.data.neo4j.repository.NoResultException;
  *
  * @author Michael J. Simons
  * @soundtrack Motörhead - We Are Motörhead
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface Neo4jOperations {
 
 	/**
@@ -226,7 +226,7 @@ public interface Neo4jOperations {
 	 * An interface for controlling query execution.
 	 *
 	 * @param <T> the type that gets returned by the query
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface ExecutableQuery<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java
index 213b09a15..b25613a6a 100644
--- a/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java
+++ b/src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java
@@ -65,9 +65,9 @@ import org.springframework.util.CollectionUtils;
  * @author Michael J. Simons
  * @author Philipp Tölle
  * @soundtrack Motörhead - We Are Motörhead
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class Neo4jTemplate implements Neo4jOperations, BeanFactoryAware {
 
 	private static final LogAccessor log = new LogAccessor(LogFactory.getLog(Neo4jTemplate.class));
diff --git a/src/main/java/org/springframework/data/neo4j/core/NestedRelationshipContext.java b/src/main/java/org/springframework/data/neo4j/core/NestedRelationshipContext.java
index 6cb73d76f..b4abcfcfe 100644
--- a/src/main/java/org/springframework/data/neo4j/core/NestedRelationshipContext.java
+++ b/src/main/java/org/springframework/data/neo4j/core/NestedRelationshipContext.java
@@ -31,7 +31,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Philipp Tölle
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 final class NestedRelationshipContext {
 	private final Neo4jPersistentProperty inverse;
diff --git a/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java b/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
index 9cac1cbcb..b9994fd75 100644
--- a/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java
@@ -37,9 +37,9 @@ import org.springframework.lang.Nullable;
  * @param <T> The type of the objects returned by this query.
  * @author Michael J. Simons
  * @soundtrack Deichkind - Arbeit nervt
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class PreparedQuery<T> {
 
 	public static <CT> RequiredBuildStep<CT> queryFor(Class<CT> resultType) {
@@ -76,7 +76,7 @@ public final class PreparedQuery<T> {
 
 	/**
 	 * @param <CT> The concrete type of this build step.
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	public static class RequiredBuildStep<CT> {
 		private final Class<CT> resultType;
@@ -92,7 +92,7 @@ public final class PreparedQuery<T> {
 
 	/**
 	 * @param <CT> The concrete type of this build step.
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	public static class OptionalBuildSteps<CT> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveDatabaseSelectionProvider.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveDatabaseSelectionProvider.java
index 6122e57f8..656e06462 100644
--- a/src/main/java/org/springframework/data/neo4j/core/ReactiveDatabaseSelectionProvider.java
+++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveDatabaseSelectionProvider.java
@@ -26,9 +26,9 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack Rage - Reign Of Fear
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 @FunctionalInterface
 public interface ReactiveDatabaseSelectionProvider {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jClient.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jClient.java
index d0ad5bee8..dc2dbcccd 100644
--- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jClient.java
+++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jClient.java
@@ -39,9 +39,9 @@ import org.springframework.data.neo4j.core.Neo4jClient.BindSpec;
  *
  * @author Michael J. Simons
  * @soundtrack Die Toten Hosen - Im Auftrag des Herrn
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface ReactiveNeo4jClient {
 
 	LogAccessor cypherLog = new LogAccessor(LogFactory.getLog("org.springframework.data.neo4j.cypher"));
@@ -82,7 +82,7 @@ public interface ReactiveNeo4jClient {
 
 	/**
 	 * @param <T> The resulting type of this mapping
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface MappingSpec<T> extends RecordFetchSpec<T> {
 
@@ -98,7 +98,7 @@ public interface ReactiveNeo4jClient {
 
 	/**
 	 * @param <T> The type to which the fetched records are eventually mapped
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RecordFetchSpec<T> {
 
@@ -128,7 +128,7 @@ public interface ReactiveNeo4jClient {
 	 * Contract for a runnable query that can be either run returning it's result, run without results or be
 	 * parameterized.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableSpec extends RunnableSpecTightToDatabase {
 
@@ -144,7 +144,7 @@ public interface ReactiveNeo4jClient {
 	/**
 	 * Contract for a runnable query inside a dedicated database.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableSpecTightToDatabase extends BindSpec<RunnableSpecTightToDatabase> {
 
@@ -177,7 +177,7 @@ public interface ReactiveNeo4jClient {
 	 * A contract for an ongoing delegation in the selected database.
 	 *
 	 * @param <T> The type of the returned value.
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface OngoingDelegation<T> extends RunnableDelegation<T> {
 
@@ -194,7 +194,7 @@ public interface ReactiveNeo4jClient {
 	 * A runnable delegation.
 	 *
 	 * @param <T> the type that gets returned by the query
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface RunnableDelegation<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jOperations.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jOperations.java
index 9ada92b13..0651715da 100644
--- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jOperations.java
+++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jOperations.java
@@ -28,9 +28,9 @@ import org.springframework.dao.IncorrectResultSizeDataAccessException;
  * Specifies reactive operations one can perform on a database, based on an <em>Domain Type</em>.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface ReactiveNeo4jOperations {
 
 	/**
@@ -225,7 +225,7 @@ public interface ReactiveNeo4jOperations {
 	 * An interface for controlling query execution in a reactive fashion.
 	 *
 	 * @param <T> the type that gets returned by the query
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	interface ExecutableQuery<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java
index 22e508ed9..1384ec1c3 100644
--- a/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java
+++ b/src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java
@@ -68,9 +68,9 @@ import org.springframework.util.CollectionUtils;
  * @author Michael J. Simons
  * @author Gerrit Meier
  * @author Philipp Tölle
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class ReactiveNeo4jTemplate implements ReactiveNeo4jOperations, BeanFactoryAware {
 
 	private static final LogAccessor log = new LogAccessor(LogFactory.getLog(ReactiveNeo4jTemplate.class));
diff --git a/src/main/java/org/springframework/data/neo4j/core/RelationshipStatementHolder.java b/src/main/java/org/springframework/data/neo4j/core/RelationshipStatementHolder.java
index 07376192b..2db5554ee 100644
--- a/src/main/java/org/springframework/data/neo4j/core/RelationshipStatementHolder.java
+++ b/src/main/java/org/springframework/data/neo4j/core/RelationshipStatementHolder.java
@@ -34,7 +34,7 @@ import org.springframework.lang.NonNull;
  *
  * @author Philipp Tölle
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class RelationshipStatementHolder {
 	private final Statement relationshipCreationQuery;
diff --git a/src/main/java/org/springframework/data/neo4j/core/SingleValueMappingFunction.java b/src/main/java/org/springframework/data/neo4j/core/SingleValueMappingFunction.java
index 0f9a42d40..03952cef2 100644
--- a/src/main/java/org/springframework/data/neo4j/core/SingleValueMappingFunction.java
+++ b/src/main/java/org/springframework/data/neo4j/core/SingleValueMappingFunction.java
@@ -28,7 +28,7 @@ import org.springframework.core.convert.ConversionService;
  *
  * @author Michael J. Simons
  * @param <T> type of the domain class to map
- * @since 1.0
+ * @since 6.0
  */
 final class SingleValueMappingFunction<T> implements BiFunction<TypeSystem, Record, T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java b/src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java
index feb4ccddf..ea650a91c 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/AdditionalTypes.java
@@ -56,7 +56,7 @@ import org.springframework.util.StringUtils;
  * @author Michael J. Simons
  * @author Gerrit Meier
  * @author Dennis Crissman
- * @since 1.0
+ * @since 6.0
  */
 final class AdditionalTypes {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/CypherTypes.java b/src/main/java/org/springframework/data/neo4j/core/convert/CypherTypes.java
index 859fd5f54..d37352c1c 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/CypherTypes.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/CypherTypes.java
@@ -35,7 +35,7 @@ import org.springframework.data.convert.ConverterBuilder;
  * <a href="https://neo4j.com/docs/driver-manual/current/cypher-values/">Working with Cypher values</a>.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class CypherTypes {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConversions.java b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConversions.java
index 5497b28cf..4b332c4fe 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConversions.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConversions.java
@@ -27,9 +27,9 @@ import org.springframework.data.convert.CustomConversions;
 /**
  * @author Michael J. Simons
  * @soundtrack The Kleptones - A Night At The Hip-Hopera
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class Neo4jConversions extends CustomConversions {
 
 	private static final StoreConversions STORE_CONVERSIONS;
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConverter.java b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConverter.java
index 50f370713..036d9a0a9 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConverter.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConverter.java
@@ -30,7 +30,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Michael J. Simons
  * @soundtrack The Kleptones - A Night At The Hip-Hopera
- * @since 1.0
+ * @since 6.0
  */
 public interface Neo4jConverter extends EntityReader<Object, Record>, EntityWriter<Object, Map<String, Object>> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jSimpleTypes.java b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jSimpleTypes.java
index 42abb2cbf..77d0137f1 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jSimpleTypes.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/Neo4jSimpleTypes.java
@@ -49,9 +49,9 @@ import org.springframework.data.neo4j.types.GeographicPoint3d;
  * system</a>.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class Neo4jSimpleTypes {
 
 	private static final Set<Class<?>> NEO4J_NATIVE_TYPES;
diff --git a/src/main/java/org/springframework/data/neo4j/core/convert/SpatialTypes.java b/src/main/java/org/springframework/data/neo4j/core/convert/SpatialTypes.java
index 3d42f895a..a30cbb778 100644
--- a/src/main/java/org/springframework/data/neo4j/core/convert/SpatialTypes.java
+++ b/src/main/java/org/springframework/data/neo4j/core/convert/SpatialTypes.java
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * directly. This will be passed on as is.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class SpatialTypes {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jConverter.java b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jConverter.java
index 26a2420e7..899aa465f 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jConverter.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jConverter.java
@@ -67,7 +67,7 @@ import org.springframework.util.Assert;
  * @author Gerrit Meier
  * @author Philipp Tölle
  * @soundtrack The Kleptones - A Night At The Hip-Hopera
- * @since 1.0
+ * @since 6.0
  */
 final class DefaultNeo4jConverter implements Neo4jConverter {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jIsNewStrategy.java b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jIsNewStrategy.java
index b4747cc13..49fa35d04 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jIsNewStrategy.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jIsNewStrategy.java
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
  * </ul>
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class DefaultNeo4jIsNewStrategy implements IsNewStrategy {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntity.java b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntity.java
index 94a334848..411e5bee9 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntity.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentEntity.java
@@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
 /**
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 class DefaultNeo4jPersistentEntity<T> extends BasicPersistentEntity<T, Neo4jPersistentProperty>
 		implements Neo4jPersistentEntity<T> {
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentProperty.java b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentProperty.java
index ad555354e..81d2532ad 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentProperty.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jPersistentProperty.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class DefaultNeo4jPersistentProperty extends AnnotationBasedPersistentProperty<Neo4jPersistentProperty>
 		implements Neo4jPersistentProperty {
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultRelationshipDescription.java b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultRelationshipDescription.java
index bd8daf0cb..3ac416025 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultRelationshipDescription.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/DefaultRelationshipDescription.java
@@ -26,7 +26,7 @@ import org.springframework.lang.Nullable;
 /**
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 class DefaultRelationshipDescription extends Association<Neo4jPersistentProperty> implements RelationshipDescription {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContext.java b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContext.java
index 90cd3c30d..7474e0bcd 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContext.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jMappingContext.java
@@ -49,9 +49,9 @@ import org.springframework.lang.Nullable;
  * classes through {@link #setInitialEntitySet(Set)}.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersistentEntity<?>, Neo4jPersistentProperty>
 		implements Schema {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentEntity.java b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentEntity.java
index 6f453c490..3b3ee08de 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentEntity.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentEntity.java
@@ -31,9 +31,9 @@ import org.springframework.data.neo4j.core.schema.NodeDescription;
  *
  * @author Michael J. Simons
  * @param <T> type of the underlying class
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public interface Neo4jPersistentEntity<T>
 		extends MutablePersistentEntity<T, Neo4jPersistentProperty>, NodeDescription<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentProperty.java b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentProperty.java
index a1ad9db42..9094970bd 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentProperty.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/Neo4jPersistentProperty.java
@@ -27,9 +27,9 @@ import org.springframework.data.neo4j.core.schema.RelationshipProperties;
  *
  * @author Michael J. Simons
  * @author Philipp Tölle
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public interface Neo4jPersistentProperty extends PersistentProperty<Neo4jPersistentProperty>, GraphPropertyDescription {
 
 	/**
@@ -47,7 +47,7 @@ public interface Neo4jPersistentProperty extends PersistentProperty<Neo4jPersist
 	 * {@literal java.lang.String} and values of {@literal java.util.Collection}.
 	 *
 	 * @return True, if this association is a dynamic association with multple values per type.
-	 * @since 1.0.1
+	 * @since 6.0.1
 	 */
 	default boolean isDynamicOneToManyAssociation() {
 
@@ -56,7 +56,7 @@ public interface Neo4jPersistentProperty extends PersistentProperty<Neo4jPersist
 
 	/**
 	 * @return whether the property is an property describing dynamic labels
-	 * @since 1.1
+	 * @since 6.0
 	 */
 	default boolean isDynamicLabels() {
 		return this.isAnnotationPresent(DynamicLabels.class) && this.isCollectionLike();
diff --git a/src/main/java/org/springframework/data/neo4j/core/mapping/NodeDescriptionAndLabels.java b/src/main/java/org/springframework/data/neo4j/core/mapping/NodeDescriptionAndLabels.java
index e227d4e49..9d3b078e5 100644
--- a/src/main/java/org/springframework/data/neo4j/core/mapping/NodeDescriptionAndLabels.java
+++ b/src/main/java/org/springframework/data/neo4j/core/mapping/NodeDescriptionAndLabels.java
@@ -24,7 +24,7 @@ import org.springframework.data.neo4j.core.schema.NodeDescription;
  * of labels not statically defined in the resolved node hierarchy.
  *
  * @author Michael J. Simons
- * @since 1.1
+ * @since 6.0
  * @soundtrack The Rolling Stones - Living In A Ghost Town
  */
 final class NodeDescriptionAndLabels {
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Constants.java b/src/main/java/org/springframework/data/neo4j/core/schema/Constants.java
index 136a66fb0..bd782e77d 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Constants.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Constants.java
@@ -25,9 +25,9 @@ import org.neo4j.cypherdsl.core.SymbolicName;
  *
  * @author Michael J. Simons
  * @soundtrack Milky Chance - Sadnecessary
- * @since 1.0
+ * @since 6.0
  */
-@API(status = Status.INTERNAL, since = "1.0")
+@API(status = Status.INTERNAL, since = "6.0")
 public final class Constants {
 
 	public static final SymbolicName NAME_OF_ROOT_NODE = Cypher.name("n");
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/CypherGenerator.java b/src/main/java/org/springframework/data/neo4j/core/schema/CypherGenerator.java
index 3551302b7..c90434c48 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/CypherGenerator.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/CypherGenerator.java
@@ -60,9 +60,9 @@ import org.springframework.util.Assert;
  * @author Gerrit Meier
  * @author Philipp Tölle
  * @soundtrack Rammstein - Herzeleid
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public enum CypherGenerator {
 
 	INSTANCE;
@@ -119,7 +119,7 @@ public enum CypherGenerator {
 	 *
 	 * @param nodeDescription The node description for which the statement should be generated
 	 * @return A statement having one parameter.
-	 * @since 1.1
+	 * @since 6.0
 	 */
 	public Statement createStatementReturningDynamicLabels(NodeDescription<?> nodeDescription) {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/DynamicLabels.java b/src/main/java/org/springframework/data/neo4j/core/schema/DynamicLabels.java
index 82e8cb2d1..b17acdd97 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/DynamicLabels.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/DynamicLabels.java
@@ -34,11 +34,11 @@ import org.apiguardian.api.API;
  *
  * @author Michael J. Simons
  * @soundtrack Danger Dan - Nudeln und Klopapier
- * @since 1.1
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface DynamicLabels {
 }
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/GeneratedValue.java b/src/main/java/org/springframework/data/neo4j/core/schema/GeneratedValue.java
index f4e7b62f1..0739cf736 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/GeneratedValue.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/GeneratedValue.java
@@ -36,13 +36,13 @@ import org.springframework.core.annotation.AliasFor;
  * To use an external id generator, specify on the
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 @Inherited
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface GeneratedValue {
 
 	/**
@@ -78,7 +78,7 @@ public @interface GeneratedValue {
 	 * This generator is automatically applied when a field of type {@link java.util.UUID} is annotated with
 	 * {@link Id @Id} and {@link GeneratedValue @GeneratedValue}.
 	 *
-	 * @since 1.0.1
+	 * @since 6.0.1
 	 */
 	final class UUIDGenerator implements IdGenerator<UUID> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/GraphPropertyDescription.java b/src/main/java/org/springframework/data/neo4j/core/schema/GraphPropertyDescription.java
index 8de1821ce..5068d4670 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/GraphPropertyDescription.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/GraphPropertyDescription.java
@@ -26,9 +26,9 @@ import org.apiguardian.api.API;
  * Associations between different node types can be queried on the {@link Schema} itself.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public interface GraphPropertyDescription {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Id.java b/src/main/java/org/springframework/data/neo4j/core/schema/Id.java
index 1f3895470..8faf51f50 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Id.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Id.java
@@ -69,13 +69,13 @@ import org.apiguardian.api.API;
  * arbitrarily named via {@code @Property}.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 @Inherited
 @org.springframework.data.annotation.Id
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface Id {
 }
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/IdDescription.java b/src/main/java/org/springframework/data/neo4j/core/schema/IdDescription.java
index 3f586ec45..659619322 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/IdDescription.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/IdDescription.java
@@ -30,9 +30,9 @@ import org.springframework.util.Assert;
  * Description how to generate Ids for entities.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class IdDescription {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/IdGenerator.java b/src/main/java/org/springframework/data/neo4j/core/schema/IdGenerator.java
index 54f7bd2f1..3b4fd59c4 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/IdGenerator.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/IdGenerator.java
@@ -22,10 +22,10 @@ import org.apiguardian.api.API;
  *
  * @param <T> Type of the id to generate
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @FunctionalInterface
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface IdGenerator<T> {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Node.java b/src/main/java/org/springframework/data/neo4j/core/schema/Node.java
index 2e4ef0aff..8a81edbea 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Node.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Node.java
@@ -28,13 +28,13 @@ import org.springframework.core.annotation.AliasFor;
  * The annotation to configure the mapping from a node with a given set of labels to a class and vice versa.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Documented
 @org.springframework.data.annotation.Persistent
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface Node {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/NodeDescription.java b/src/main/java/org/springframework/data/neo4j/core/schema/NodeDescription.java
index ccae5a368..b3c93da36 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/NodeDescription.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/NodeDescription.java
@@ -30,9 +30,9 @@ import org.springframework.lang.Nullable;
  *
  * @param <T> The type of the underlying class
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public interface NodeDescription<T> {
 
 	/**
@@ -48,7 +48,7 @@ public interface NodeDescription<T> {
 	/**
 	 * @return The list of all static labels, that is the union of {@link #getPrimaryLabel()} +
 	 *         {@link #getAdditionalLabels()}. Order is guaranteed to be the primary first, than the others.
-	 * @since 1.1
+	 * @since 6.0
 	 */
 	default List<String> getStaticLabels() {
 		List<String> staticLabels = new ArrayList<>();
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Property.java b/src/main/java/org/springframework/data/neo4j/core/schema/Property.java
index 895d8d083..741456458 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Property.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Property.java
@@ -29,13 +29,13 @@ import org.springframework.core.annotation.AliasFor;
  * The annotation to configure the mapping from a property to an attribute and vice versa.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 @Inherited
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface Property {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Relationship.java b/src/main/java/org/springframework/data/neo4j/core/schema/Relationship.java
index a3b750937..9d0b1b86e 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Relationship.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Relationship.java
@@ -29,19 +29,19 @@ import org.springframework.core.annotation.AliasFor;
  * Annotation to configure mappings of relationship.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
 @Inherited
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface Relationship {
 
 	/**
 	 * Enumeration of the direction a relationship can take.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	enum Direction {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipDescription.java b/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipDescription.java
index 4bd842f3c..19d169902 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipDescription.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipDescription.java
@@ -25,9 +25,9 @@ import org.springframework.lang.Nullable;
  * {@link #getTarget}.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public interface RelationshipDescription {
 
 	String NAME_OF_RELATIONSHIP = "__relationship__";
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipProperties.java b/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipProperties.java
index fd5839612..0c4ae1a37 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipProperties.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/RelationshipProperties.java
@@ -34,6 +34,6 @@ import org.apiguardian.api.API;
 @Target(ElementType.TYPE)
 @Documented
 @Inherited
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface RelationshipProperties {
 }
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/Schema.java b/src/main/java/org/springframework/data/neo4j/core/schema/Schema.java
index 9c976b168..6c6357423 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/Schema.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/Schema.java
@@ -33,9 +33,9 @@ import org.springframework.lang.Nullable;
  * Contains the descriptions of all nodes, their properties and relationships known to SDN.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface Schema {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/schema/UnknownEntityException.java b/src/main/java/org/springframework/data/neo4j/core/schema/UnknownEntityException.java
index 04f406cec..a488c5794 100644
--- a/src/main/java/org/springframework/data/neo4j/core/schema/UnknownEntityException.java
+++ b/src/main/java/org/springframework/data/neo4j/core/schema/UnknownEntityException.java
@@ -23,9 +23,9 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * information is not available.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class UnknownEntityException extends InvalidDataAccessApiUsageException {
 
 	private final Class<?> targetClass;
diff --git a/src/main/java/org/springframework/data/neo4j/core/support/UUIDStringGenerator.java b/src/main/java/org/springframework/data/neo4j/core/support/UUIDStringGenerator.java
index 5753da45f..d486a82d0 100644
--- a/src/main/java/org/springframework/data/neo4j/core/support/UUIDStringGenerator.java
+++ b/src/main/java/org/springframework/data/neo4j/core/support/UUIDStringGenerator.java
@@ -25,9 +25,9 @@ import org.springframework.data.neo4j.core.schema.IdGenerator;
  *
  * @author Michael J. Simons
  * @soundtrack Various - Kung Fury (Original Motion Picture Soundtrack)
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class UUIDStringGenerator implements IdGenerator<String> {
 
 	@Override
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jBookmarkManager.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jBookmarkManager.java
index f69e4bd69..d1055eb5d 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jBookmarkManager.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jBookmarkManager.java
@@ -29,7 +29,7 @@ import org.neo4j.driver.Bookmark;
  *
  * @author Michael J. Simons
  * @soundtrack Metallica - Death Magnetic
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jBookmarkManager {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jSessionSynchronization.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jSessionSynchronization.java
index 98b4a9c01..90c9582ba 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jSessionSynchronization.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jSessionSynchronization.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jSessionSynchronization extends ResourceHolderSynchronization<Neo4jTransactionHolder, Object> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionContext.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionContext.java
index 585797b22..4713328a3 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionContext.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionContext.java
@@ -27,7 +27,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Michael J. Simons
  * @soundtrack Evanescence - Fallen
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jTransactionContext {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionHolder.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionHolder.java
index 77249e9bc..6bf1b6a7f 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionHolder.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionHolder.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * <strong>Note:</strong> Intended for internal usage only.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jTransactionHolder extends ResourceHolderSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionManager.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionManager.java
index 56653f34b..931da4987 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionManager.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionManager.java
@@ -39,9 +39,9 @@ import org.springframework.util.Assert;
  * transaction manager will synchronize a pair of a native Neo4j session/transaction with the transaction.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public class Neo4jTransactionManager extends AbstractPlatformTransactionManager {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionUtils.java b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionUtils.java
index b03fcbf88..2dbdcab04 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionUtils.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionUtils.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.TransactionDefinition;
 /**
  * Internal use only.
  *
- * @since 1.0
+ * @since 6.0
  */
 public final class Neo4jTransactionUtils {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jSessionSynchronization.java b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jSessionSynchronization.java
index 626ca819a..40a29bf60 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jSessionSynchronization.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jSessionSynchronization.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.reactive.TransactionSynchronizationManage
 /**
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class ReactiveNeo4jSessionSynchronization
 		extends ReactiveResourceSynchronization<ReactiveNeo4jTransactionHolder, Object> {
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionHolder.java b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionHolder.java
index 9548e39b0..dca0730ec 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionHolder.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionHolder.java
@@ -28,7 +28,7 @@ import org.springframework.transaction.support.ResourceHolderSupport;
 /**
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class ReactiveNeo4jTransactionHolder extends ResourceHolderSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionManager.java b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionManager.java
index f1889fb40..59935c695 100644
--- a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionManager.java
+++ b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveNeo4jTransactionManager.java
@@ -39,9 +39,9 @@ import org.springframework.util.Assert;
 /**
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public class ReactiveNeo4jTransactionManager extends AbstractReactiveTransactionManager {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/repository/Neo4jRepository.java b/src/main/java/org/springframework/data/neo4j/repository/Neo4jRepository.java
index c9f64974c..fce07901b 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/Neo4jRepository.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/Neo4jRepository.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
  * @author Ján Šúr
  * @param <T> type of the domain class to map
  * @param <ID> identifier type in the domain class
- * @since 1.0
+ * @since 6.0
  */
 @NoRepositoryBean
 public interface Neo4jRepository<T, ID> extends PagingAndSortingRepository<T, ID>, QueryByExampleExecutor<T> {
diff --git a/src/main/java/org/springframework/data/neo4j/repository/NoResultException.java b/src/main/java/org/springframework/data/neo4j/repository/NoResultException.java
index d959b804a..f089da545 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/NoResultException.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/NoResultException.java
@@ -23,9 +23,9 @@ import org.springframework.dao.EmptyResultDataAccessException;
  *
  * @author Michael J. Simons
  * @soundtrack Deichkind - Niveau weshalb warum
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public class NoResultException extends EmptyResultDataAccessException {
 
 	private final String query;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/ReactiveNeo4jRepository.java b/src/main/java/org/springframework/data/neo4j/repository/ReactiveNeo4jRepository.java
index 1cf109eeb..61e15988e 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/ReactiveNeo4jRepository.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/ReactiveNeo4jRepository.java
@@ -25,7 +25,7 @@ import org.springframework.data.repository.reactive.ReactiveSortingRepository;
  * @author Michael J. Simons
  * @param <T> type of the domain class to map
  * @param <ID> identifier type in the domain class
- * @since 1.0
+ * @since 6.0
  */
 @NoRepositoryBean
 public interface ReactiveNeo4jRepository<T, ID>
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/EnableNeo4jRepositories.java b/src/main/java/org/springframework/data/neo4j/repository/config/EnableNeo4jRepositories.java
index dc5852a72..04c820d63 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/EnableNeo4jRepositories.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/EnableNeo4jRepositories.java
@@ -38,7 +38,7 @@ import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
  * configuration class.
  *
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/EnableReactiveNeo4jRepositories.java b/src/main/java/org/springframework/data/neo4j/repository/config/EnableReactiveNeo4jRepositories.java
index 325901dd1..a80b4b68e 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/EnableReactiveNeo4jRepositories.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/EnableReactiveNeo4jRepositories.java
@@ -39,7 +39,7 @@ import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoriesRegistrar.java b/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoriesRegistrar.java
index 610cb7ce7..5abcde573 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoriesRegistrar.java
@@ -28,7 +28,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class Neo4jRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
index c408aa6d1..c8ab43fbf 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/Neo4jRepositoryConfigurationExtension.java
@@ -37,9 +37,9 @@ import org.springframework.data.repository.core.RepositoryMetadata;
  *
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class Neo4jRepositoryConfigurationExtension extends RepositoryConfigurationExtensionSupport {
 
 	private static final String MODULE_PREFIX = "neo4j";
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoriesRegistrar.java b/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoriesRegistrar.java
index b180f5806..e288d056a 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoriesRegistrar.java
@@ -28,7 +28,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class ReactiveNeo4jRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoryConfigurationExtension.java
index 04885a9e1..17394e81d 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/config/ReactiveNeo4jRepositoryConfigurationExtension.java
@@ -37,9 +37,9 @@ import org.springframework.data.repository.core.RepositoryMetadata;
  *
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveNeo4jRepositoryConfigurationExtension extends RepositoryConfigurationExtensionSupport {
 
 	private static final String MODULE_PREFIX = "neo4j";
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/AuditingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/AuditingBeforeBindCallback.java
index da7e5412b..e8ab37ffe 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/AuditingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/AuditingBeforeBindCallback.java
@@ -28,9 +28,9 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack Iron Maiden - Iron Maiden
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class AuditingBeforeBindCallback implements BeforeBindCallback<Object>, Ordered {
 
 	public static final int NEO4J_AUDITING_ORDER = 100;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/BeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/BeforeBindCallback.java
index 5c8e84d93..ca44193cc 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/BeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/BeforeBindCallback.java
@@ -24,11 +24,11 @@ import org.springframework.data.mapping.callback.EntityCallback;
  *
  * @author Michael J. Simons
  * @param <T> The type of the entity.
- * @since 1.0
+ * @since 6.0
  * @soundtrack Bon Jovi - Slippery When Wet
  */
 @FunctionalInterface
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface BeforeBindCallback<T> extends EntityCallback<T> {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/IdGeneratingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/IdGeneratingBeforeBindCallback.java
index ded153bfa..dc296b2dc 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/IdGeneratingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/IdGeneratingBeforeBindCallback.java
@@ -24,9 +24,9 @@ import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext;
  *
  * @author Michael J. Simons
  * @soundtrack Various - Kung Fury (Original Motion Picture Soundtrack)
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class IdGeneratingBeforeBindCallback implements BeforeBindCallback<Object>, Ordered {
 
 	private final IdPopulator idPopulator;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/OptimisticLockingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/OptimisticLockingBeforeBindCallback.java
index 41c4ba21c..1a4cddabd 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/OptimisticLockingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/OptimisticLockingBeforeBindCallback.java
@@ -26,9 +26,9 @@ import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
  * Callback to increment the value of the version property for a given entity.
  *
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class OptimisticLockingBeforeBindCallback implements BeforeBindCallback<Object>, Ordered {
 
 	private final Neo4jMappingContext neo4jMappingContext;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveAuditingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveAuditingBeforeBindCallback.java
index c0c02e4f9..8cbc746d5 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveAuditingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveAuditingBeforeBindCallback.java
@@ -32,9 +32,9 @@ import org.springframework.util.Assert;
  * @author Michael J. Simons
  * @soundtrack Iron Maiden - The Number Of The Beast
  * @see AuditingBeforeBindCallback
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveAuditingBeforeBindCallback implements ReactiveBeforeBindCallback<Object>, Ordered {
 
 	public static final int NEO4J_REACTIVE_AUDITING_ORDER = 100;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveBeforeBindCallback.java
index f5895ad5c..3a79132c1 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveBeforeBindCallback.java
@@ -28,10 +28,10 @@ import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
  * @author Michael J. Simons
  * @soundtrack Iron Maiden - Killers
  * @see ReactiveEntityCallbacks
- * @since 1.0
+ * @since 6.0
  */
 @FunctionalInterface
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface ReactiveBeforeBindCallback<T> extends EntityCallback<T> {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveIdGeneratingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveIdGeneratingBeforeBindCallback.java
index e19b05d08..49985eff8 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveIdGeneratingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveIdGeneratingBeforeBindCallback.java
@@ -27,9 +27,9 @@ import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext;
  *
  * @author Michael J. Simons
  * @soundtrack Various - Kung Fury (Original Motion Picture Soundtrack)
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveIdGeneratingBeforeBindCallback implements ReactiveBeforeBindCallback<Object>, Ordered {
 
 	private final IdPopulator idPopulator;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveOptimisticLockingBeforeBindCallback.java b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveOptimisticLockingBeforeBindCallback.java
index ece9ab04f..96bccf1cd 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveOptimisticLockingBeforeBindCallback.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/ReactiveOptimisticLockingBeforeBindCallback.java
@@ -29,9 +29,9 @@ import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
  * Callback to increment the value of the version property for a given entity.
  *
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveOptimisticLockingBeforeBindCallback implements ReactiveBeforeBindCallback<Object>, Ordered {
 
 	private final Neo4jMappingContext neo4jMappingContext;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/event/package-info.java b/src/main/java/org/springframework/data/neo4j/repository/event/package-info.java
index 66770ef85..9c202d5e3 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/event/package-info.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/event/package-info.java
@@ -8,7 +8,7 @@
  * {@link org.springframework.data.domain.DomainEvents} on an aggregate root.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  * @soundtrack Bon Jovi - Slippery When Wet
  */
 @NonNullApi
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/AbstractNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/AbstractNeo4jQuery.java
index f698507be..aa7376fc3 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/AbstractNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/AbstractNeo4jQuery.java
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 abstract class AbstractNeo4jQuery extends Neo4jQuerySupport implements RepositoryQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/AbstractReactiveNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/AbstractReactiveNeo4jQuery.java
index 28e343f78..65a7ab676 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/AbstractReactiveNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/AbstractReactiveNeo4jQuery.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 abstract class AbstractReactiveNeo4jQuery extends Neo4jQuerySupport implements RepositoryQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/BoundingBox.java b/src/main/java/org/springframework/data/neo4j/repository/query/BoundingBox.java
index c504de322..fcb6bf461 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/BoundingBox.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/BoundingBox.java
@@ -27,7 +27,7 @@ import org.springframework.data.geo.Polygon;
  * upper right point.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 public final class BoundingBox {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CountQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/CountQuery.java
index 31fb5e8ef..73932f311 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/CountQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/CountQuery.java
@@ -27,12 +27,12 @@ import org.apiguardian.api.API;
  * Specialized version of {@link Query} whose values is always used as count projection.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @Query(count = true)
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface CountQuery {
 }
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CypherAdapterUtils.java b/src/main/java/org/springframework/data/neo4j/repository/query/CypherAdapterUtils.java
index a0c9e4a0b..31cdafbe6 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/CypherAdapterUtils.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/CypherAdapterUtils.java
@@ -35,7 +35,7 @@ import org.springframework.data.neo4j.core.schema.NodeDescription;
  * @author Michael J. Simons
  * @author Gerrit Meier
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class CypherAdapterUtils {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java b/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
index ee9282e5a..dbd5ed585 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/CypherQueryCreator.java
@@ -78,7 +78,7 @@ import org.springframework.lang.Nullable;
  * This class is not thread safe and not reusable.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class CypherQueryCreator extends AbstractQueryCreator<QueryAndParameters, Condition> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ExistsQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/ExistsQuery.java
index dcc0ac280..67503621a 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/ExistsQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/ExistsQuery.java
@@ -27,12 +27,12 @@ import org.apiguardian.api.API;
  * Specialized version of {@link Query} whose values is always used as exists projection.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @Query(exists = true)
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface ExistsQuery {
 }
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryExecution.java b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryExecution.java
index 0ae664404..7940f05a2 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryExecution.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryExecution.java
@@ -28,7 +28,7 @@ import org.springframework.data.neo4j.core.ReactiveNeo4jOperations;
  *
  * @author Michael J. Simons
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 @FunctionalInterface
 interface Neo4jQueryExecution {
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryLookupStrategy.java b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryLookupStrategy.java
index 089baf5d9..06ed94ba3 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryLookupStrategy.java
@@ -32,9 +32,9 @@ import org.springframework.data.repository.query.RepositoryQuery;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class Neo4jQueryLookupStrategy implements QueryLookupStrategy {
 
 	private final Neo4jMappingContext mappingContext;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java
index 28171306a..c736d12e0 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQueryMethod.java
@@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class Neo4jQueryMethod extends QueryMethod {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQuerySupport.java b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQuerySupport.java
index 8c89d283a..593f7208c 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQuerySupport.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/Neo4jQuerySupport.java
@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 abstract class Neo4jQuerySupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/PartTreeNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/PartTreeNeo4jQuery.java
index 6be7b26cd..8d2516a25 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/PartTreeNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/PartTreeNeo4jQuery.java
@@ -45,7 +45,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class PartTreeNeo4jQuery extends AbstractNeo4jQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java b/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
index 7c6c859c7..166db86c1 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/PartValidator.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack Antilopen Gang - Abwasser
- * @since 1.0
+ * @since 6.0
  */
 class PartValidator {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/Query.java b/src/main/java/org/springframework/data/neo4j/repository/query/Query.java
index 5b435f3b5..177da07eb 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/Query.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/Query.java
@@ -31,13 +31,13 @@ import org.springframework.data.annotation.QueryAnnotation;
  * Driver</a>. Those parameters will get bound to the arguments of the annotated method.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @QueryAnnotation
 @Documented
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public @interface Query {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryLookupStrategy.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryLookupStrategy.java
index a6f8e1749..a4b8d6443 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryLookupStrategy.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryLookupStrategy.java
@@ -32,9 +32,9 @@ import org.springframework.data.repository.query.RepositoryQuery;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveNeo4jQueryLookupStrategy implements QueryLookupStrategy {
 
 	private final ReactiveNeo4jOperations neo4jOperations;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryMethod.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryMethod.java
index 28e0936ad..6c3fa55db 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryMethod.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveNeo4jQueryMethod.java
@@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils;
  * would only contain duplications of several classes.
  *
  * @author Gerrit Meier
- * @since 1.0
+ * @since 6.0
  */
 final class ReactiveNeo4jQueryMethod extends Neo4jQueryMethod {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactivePartTreeNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactivePartTreeNeo4jQuery.java
index 887218622..921aef248 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactivePartTreeNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactivePartTreeNeo4jQuery.java
@@ -34,7 +34,7 @@ import org.springframework.lang.Nullable;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class ReactivePartTreeNeo4jQuery extends AbstractReactiveNeo4jQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveStringBasedNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveStringBasedNeo4jQuery.java
index 26f822ab0..b71b6efe4 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveStringBasedNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/ReactiveStringBasedNeo4jQuery.java
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class ReactiveStringBasedNeo4jQuery extends AbstractReactiveNeo4jQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/query/StringBasedNeo4jQuery.java b/src/main/java/org/springframework/data/neo4j/repository/query/StringBasedNeo4jQuery.java
index d87468ff1..66e5cad1a 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/query/StringBasedNeo4jQuery.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/query/StringBasedNeo4jQuery.java
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class StringBasedNeo4jQuery extends AbstractNeo4jQuery {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/DefaultNeo4jEntityInformation.java b/src/main/java/org/springframework/data/neo4j/repository/support/DefaultNeo4jEntityInformation.java
index 555cec856..88000436e 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/DefaultNeo4jEntityInformation.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/DefaultNeo4jEntityInformation.java
@@ -23,7 +23,7 @@ import org.springframework.data.repository.core.support.PersistentEntityInformat
  *
  * @author Michael J. Simons
  * @soundtrack Bear McCreary - Battlestar Galactica Season 1
- * @since 1.0
+ * @since 6.0
  */
 final class DefaultNeo4jEntityInformation<T, ID> extends PersistentEntityInformation<T, ID>
 		implements Neo4jEntityInformation<T, ID> {
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jEntityInformation.java b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jEntityInformation.java
index 1bd6a6a19..4f52744f8 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jEntityInformation.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jEntityInformation.java
@@ -25,7 +25,7 @@ import org.springframework.data.repository.core.EntityInformation;
  * @param <T> The type of the entity
  * @param <ID> The type of the id
  * @soundtrack Bear McCreary - Battlestar Galactica Season 1
- * @since 1.0
+ * @since 6.0
  */
 public interface Neo4jEntityInformation<T, ID> extends EntityInformation<T, ID> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jPersistenceExceptionTranslator.java b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jPersistenceExceptionTranslator.java
index d05a6d81c..7c9298cdd 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jPersistenceExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jPersistenceExceptionTranslator.java
@@ -52,9 +52,9 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
  *
  * @author Michael J. Simons
  * @soundtrack Kummer - KIOX
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class Neo4jPersistenceExceptionTranslator implements PersistenceExceptionTranslator {
 
 	private static final LogAccessor log = new LogAccessor(LogFactory.getLog(Neo4jPersistenceExceptionTranslator.class));
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java
index 7ddb80c4a..47110e7fe 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactory.java
@@ -36,7 +36,7 @@ import org.springframework.data.repository.query.QueryMethodEvaluationContextPro
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class Neo4jRepositoryFactory extends RepositoryFactorySupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryBean.java b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryBean.java
index 22bc3cacb..5dc40682f 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryBean.java
@@ -33,9 +33,9 @@ import org.springframework.data.repository.core.support.TransactionalRepositoryF
  * @param <T> the type of the repository
  * @param <S> type of the domain class to map
  * @param <ID> identifier type in the domain class
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class Neo4jRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 		extends TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/Predicate.java b/src/main/java/org/springframework/data/neo4j/repository/support/Predicate.java
index 75407752b..9caee3cfe 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/Predicate.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/Predicate.java
@@ -52,7 +52,7 @@ import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper;
  * parameters inside the condition.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class Predicate {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactory.java b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactory.java
index a246fc51c..5b9b9fa0d 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactory.java
@@ -39,7 +39,7 @@ import org.springframework.data.repository.query.QueryMethodEvaluationContextPro
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 final class ReactiveNeo4jRepositoryFactory extends ReactiveRepositoryFactorySupport {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java
index 4d5d7d4db..6a63c4f6e 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryBean.java
@@ -35,9 +35,9 @@ import org.springframework.lang.Nullable;
  * @param <T> the type of the repository
  * @param <S> type of the domain class to map
  * @param <ID> identifier type in the domain class
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.INTERNAL, since = "1.0")
+@API(status = API.Status.INTERNAL, since = "6.0")
 public final class ReactiveNeo4jRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 		extends TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationInterceptor.java b/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationInterceptor.java
index 3879583ac..4143ec21e 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationInterceptor.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationInterceptor.java
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack Fatoni - Andorra
- * @since 1.0
+ * @since 6.0
  */
 final class ReactivePersistenceExceptionTranslationInterceptor implements MethodInterceptor {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationPostProcessor.java b/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationPostProcessor.java
index 1d561306f..4c216401b 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationPostProcessor.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/ReactivePersistenceExceptionTranslationPostProcessor.java
@@ -51,9 +51,9 @@ import org.springframework.util.Assert;
  *
  * @author Michael J. Simons
  * @soundtrack Fatoni - Andorra
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class ReactivePersistenceExceptionTranslationPostProcessor
 		extends AbstractBeanFactoryAwareAdvisingPostProcessor {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleNeo4jRepository.java b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleNeo4jRepository.java
index 1fa7a5cc5..78b7f3f66 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleNeo4jRepository.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleNeo4jRepository.java
@@ -43,13 +43,13 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Gerrit Meier
  * @author Michael J. Simons
  * @author Ján Šúr
- * @since 1.0
+ * @since 6.0
  * @param <T> the type of the domain class managed by this repository
  * @param <ID> the type of the unique identifier of the domain class
  */
 @Repository
 @Transactional(readOnly = true)
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public class SimpleNeo4jRepository<T, ID> implements PagingAndSortingRepository<T, ID> {
 
 	private final Neo4jOperations neo4jOperations;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleQueryByExampleExecutor.java b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleQueryByExampleExecutor.java
index 9f8b4bb29..174f4ecb2 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleQueryByExampleExecutor.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleQueryByExampleExecutor.java
@@ -42,7 +42,7 @@ import org.springframework.data.repository.support.PageableExecutionUtils;
  * @author Michael J. Simons
  * @author Ján Šúr
  * @param <T> type of the domain class
- * @since 1.0
+ * @since 6.0
  */
 class SimpleQueryByExampleExecutor<T> implements QueryByExampleExecutor<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveNeo4jRepository.java b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveNeo4jRepository.java
index 30d3a08e0..749e2c376 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveNeo4jRepository.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveNeo4jRepository.java
@@ -40,13 +40,13 @@ import org.springframework.util.Assert;
  *
  * @author Gerrit Meier
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  * @param <T> the type of the domain class managed by this repository
  * @param <ID> the type of the unique identifier of the domain class
  */
 @Repository
 @Transactional(readOnly = true)
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public class SimpleReactiveNeo4jRepository<T, ID> implements ReactiveSortingRepository<T, ID> {
 
 	private final ReactiveNeo4jOperations neo4jOperations;
diff --git a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveQueryByExampleExecutor.java b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveQueryByExampleExecutor.java
index ea3d14406..fc837a6e7 100644
--- a/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveQueryByExampleExecutor.java
+++ b/src/main/java/org/springframework/data/neo4j/repository/support/SimpleReactiveQueryByExampleExecutor.java
@@ -36,7 +36,7 @@ import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
  * @author Gerrit Meier
  * @author Michael J. Simons
  * @param <T> type of the domain class
- * @since 1.0
+ * @since 6.0
  */
 class SimpleReactiveQueryByExampleExecutor<T> implements ReactiveQueryByExampleExecutor<T> {
 
diff --git a/src/main/java/org/springframework/data/neo4j/types/CartesianPoint2d.java b/src/main/java/org/springframework/data/neo4j/types/CartesianPoint2d.java
index 120426e9e..3cafa70cf 100644
--- a/src/main/java/org/springframework/data/neo4j/types/CartesianPoint2d.java
+++ b/src/main/java/org/springframework/data/neo4j/types/CartesianPoint2d.java
@@ -19,9 +19,9 @@ import org.apiguardian.api.API;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class CartesianPoint2d extends AbstractPoint {
 
 	static final int SRID = 7203;
diff --git a/src/main/java/org/springframework/data/neo4j/types/CartesianPoint3d.java b/src/main/java/org/springframework/data/neo4j/types/CartesianPoint3d.java
index 458e9ab10..13ef8de73 100644
--- a/src/main/java/org/springframework/data/neo4j/types/CartesianPoint3d.java
+++ b/src/main/java/org/springframework/data/neo4j/types/CartesianPoint3d.java
@@ -19,9 +19,9 @@ import org.apiguardian.api.API;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class CartesianPoint3d extends AbstractPoint {
 
 	static final int SRID = 9157;
diff --git a/src/main/java/org/springframework/data/neo4j/types/GeographicPoint2d.java b/src/main/java/org/springframework/data/neo4j/types/GeographicPoint2d.java
index 251655850..eea9a8249 100644
--- a/src/main/java/org/springframework/data/neo4j/types/GeographicPoint2d.java
+++ b/src/main/java/org/springframework/data/neo4j/types/GeographicPoint2d.java
@@ -19,9 +19,9 @@ import org.apiguardian.api.API;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class GeographicPoint2d extends AbstractPoint {
 
 	GeographicPoint2d(Coordinate coordinate, Integer srid) {
diff --git a/src/main/java/org/springframework/data/neo4j/types/GeographicPoint3d.java b/src/main/java/org/springframework/data/neo4j/types/GeographicPoint3d.java
index a5c456cf8..8c53e187f 100644
--- a/src/main/java/org/springframework/data/neo4j/types/GeographicPoint3d.java
+++ b/src/main/java/org/springframework/data/neo4j/types/GeographicPoint3d.java
@@ -19,9 +19,9 @@ import org.apiguardian.api.API;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class GeographicPoint3d extends AbstractPoint {
 
 	GeographicPoint3d(Coordinate coordinate, Integer srid) {
diff --git a/src/main/java/org/springframework/data/neo4j/types/Neo4jPoint.java b/src/main/java/org/springframework/data/neo4j/types/Neo4jPoint.java
index 14a7c4f8e..552f6440c 100644
--- a/src/main/java/org/springframework/data/neo4j/types/Neo4jPoint.java
+++ b/src/main/java/org/springframework/data/neo4j/types/Neo4jPoint.java
@@ -24,9 +24,9 @@ import org.apiguardian.api.API;
  * <a href="https://neo4j.com/docs/cypher-manual/current/syntax/spatial/#cypher-spatial">Spatial values</a>.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public interface Neo4jPoint {
 
 	/**
diff --git a/src/main/java/org/springframework/data/neo4j/types/PointBuilder.java b/src/main/java/org/springframework/data/neo4j/types/PointBuilder.java
index bc20e0be4..37f00cc7e 100644
--- a/src/main/java/org/springframework/data/neo4j/types/PointBuilder.java
+++ b/src/main/java/org/springframework/data/neo4j/types/PointBuilder.java
@@ -19,9 +19,9 @@ import org.apiguardian.api.API;
 
 /**
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
-@API(status = API.Status.STABLE, since = "1.0")
+@API(status = API.Status.STABLE, since = "6.0")
 public final class PointBuilder {
 
 	private final int srid;
diff --git a/src/main/kotlin/org/springframework/data/neo4j/core/Neo4jClientExtensions.kt b/src/main/kotlin/org/springframework/data/neo4j/core/Neo4jClientExtensions.kt
index 0e08f7466..bdc33b71d 100644
--- a/src/main/kotlin/org/springframework/data/neo4j/core/Neo4jClientExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/neo4j/core/Neo4jClientExtensions.kt
@@ -23,7 +23,7 @@ import java.util.function.BiFunction
  * Extension for [Neo4jClient.RunnableSpec. in] providing an `inDatabase` alias since `in` is a reserved keyword in Kotlin.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 fun Neo4jClient.RunnableSpec.inDatabase(targetDatabase: String): Neo4jClient.RunnableSpecTightToDatabase =
         `in`(targetDatabase)
@@ -32,7 +32,7 @@ fun Neo4jClient.RunnableSpec.inDatabase(targetDatabase: String): Neo4jClient.Run
  * Extension for [Neo4jClient.OngoingDelegation. in] providing an `inDatabase` alias since `in` is a reserved keyword in Kotlin.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 fun <T : Any?> Neo4jClient.OngoingDelegation<T>.inDatabase(targetDatabase: String): Neo4jClient.RunnableDelegation<T> =
         `in`(targetDatabase)
@@ -67,7 +67,7 @@ class KMappingSpec<T : Any>(private val delegate: Neo4jClient.MappingSpec<T>) {
 /**
  * Extension for [Neo4jClient.RunnableSpecTightToDatabase.fetchAs] leveraging reified type parameters.
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> Neo4jClient.RunnableSpecTightToDatabase.fetchAs(): KMappingSpec<T> =
         KMappingSpec(fetchAs(T::class.java))
@@ -76,7 +76,7 @@ inline fun <reified T : Any> Neo4jClient.RunnableSpecTightToDatabase.fetchAs():
  * Extension for [Neo4jClient.RunnableSpecTightToDatabase.mappedBy] leveraging reified type parameters and removing
  * the need for an explicit `fetchAs`.
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> Neo4jClient.RunnableSpecTightToDatabase.mappedBy(
         noinline mappingFunction: (TypeSystem, Record) -> T
diff --git a/src/main/kotlin/org/springframework/data/neo4j/core/PreparedQueryFactory.kt b/src/main/kotlin/org/springframework/data/neo4j/core/PreparedQueryFactory.kt
index 458349c6e..6362c6b59 100644
--- a/src/main/kotlin/org/springframework/data/neo4j/core/PreparedQueryFactory.kt
+++ b/src/main/kotlin/org/springframework/data/neo4j/core/PreparedQueryFactory.kt
@@ -21,7 +21,7 @@ import kotlin.reflect.KClass
  * Helper class for [PreparedQuery.queryFor] that removes the need of adding `::class.java` manually.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 class PreparedQueryFactory<T : Any>(val c: KClass<T>) {
     fun withCypherQuery(cypherQuery: String): PreparedQuery.OptionalBuildSteps<T> =
diff --git a/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jClientExtensions.kt b/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jClientExtensions.kt
index a8adedeab..53a4ca2be 100644
--- a/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jClientExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jClientExtensions.kt
@@ -27,7 +27,7 @@ import org.neo4j.driver.types.TypeSystem
  * Extension for [ReactiveNeo4jClient.RunnableSpec. in] providing an `inDatabase` alias since `in` is a reserved keyword in Kotlin.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 fun ReactiveNeo4jClient.RunnableSpec.inDatabase(targetDatabase: String):
         ReactiveNeo4jClient.RunnableSpecTightToDatabase = `in`(targetDatabase)
@@ -36,7 +36,7 @@ fun ReactiveNeo4jClient.RunnableSpec.inDatabase(targetDatabase: String):
  * Extension for [ReactiveNeo4jClient.OngoingDelegation. in] providing an `inDatabase` alias since `in` is a reserved keyword in Kotlin.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 fun <T : Any?> ReactiveNeo4jClient.OngoingDelegation<T>.inDatabase(targetDatabase: String):
         ReactiveNeo4jClient.RunnableDelegation<T> = `in`(targetDatabase)
@@ -44,7 +44,7 @@ fun <T : Any?> ReactiveNeo4jClient.OngoingDelegation<T>.inDatabase(targetDatabas
 /**
  * Extension for [ReactiveNeo4jClient.RunnableSpecTightToDatabase.fetchAs] leveraging reified type parameters.
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> ReactiveNeo4jClient.RunnableSpecTightToDatabase.fetchAs():
         ReactiveNeo4jClient.MappingSpec<T> = fetchAs(T::class.java)
@@ -53,7 +53,7 @@ inline fun <reified T : Any> ReactiveNeo4jClient.RunnableSpecTightToDatabase.fet
  * Extension for [ReactiveNeo4jClient.RunnableSpecTightToDatabase.mappedBy] leveraging reified type parameters and removing
  * the need for an explicit `fetchAs`.
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> ReactiveNeo4jClient.RunnableSpecTightToDatabase.mappedBy(
         noinline mappingFunction: (TypeSystem, Record) -> T
@@ -64,7 +64,7 @@ inline fun <reified T : Any> ReactiveNeo4jClient.RunnableSpecTightToDatabase.map
  * Non-nullable Coroutines variant of [ReactiveNeo4jClient.RunnableSpecTightToDatabase.run].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 suspend inline fun ReactiveNeo4jClient.RunnableSpecTightToDatabase.await(): ResultSummary =
         run().awaitSingle()
@@ -73,7 +73,7 @@ suspend inline fun ReactiveNeo4jClient.RunnableSpecTightToDatabase.await(): Resu
  * Nullable Coroutines variant of [ReactiveNeo4jClient.RecordFetchSpec.one].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 suspend inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.awaitOneOrNull(): T? =
         one().awaitFirstOrNull()
@@ -82,7 +82,7 @@ suspend inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.awai
  * Nullable Coroutines variant of [ReactiveNeo4jClient.RecordFetchSpec.first].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 suspend inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.awaitFirstOrNull(): T? =
         first().awaitFirstOrNull()
@@ -91,7 +91,7 @@ suspend inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.awai
  * Coroutines [Flow] variant of [ReactiveNeo4jClient.RecordFetchSpec.all].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.fetchAll(): Flow<T> =
         all().asFlow()
@@ -100,7 +100,7 @@ inline fun <reified T : Any> ReactiveNeo4jClient.RecordFetchSpec<T>.fetchAll():
  * Nullable Coroutines variant of [ReactiveNeo4jClient.RunnableDelegation.run].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 suspend inline fun <reified T : Any> ReactiveNeo4jClient.RunnableDelegation<T>.awaitFirstOrNull(): T? =
         run().awaitFirstOrNull()
diff --git a/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jOperationsExtensions.kt b/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jOperationsExtensions.kt
index 54cb362d0..eeea5cb5e 100644
--- a/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jOperationsExtensions.kt
+++ b/src/main/kotlin/org/springframework/data/neo4j/core/ReactiveNeo4jOperationsExtensions.kt
@@ -23,7 +23,7 @@ import kotlinx.coroutines.reactive.awaitFirstOrNull
  * Coroutines [Flow] variant of [ReactiveNeo4jOperations.ExecutableQuery.getResults].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun <reified T : Any> ReactiveNeo4jOperations.ExecutableQuery<T>.fetchAllResults(): Flow<T> =
         results.asFlow()
@@ -32,7 +32,7 @@ inline fun <reified T : Any> ReactiveNeo4jOperations.ExecutableQuery<T>.fetchAll
  * Nullable Coroutines variant of [ReactiveNeo4jOperations.ExecutableQuery.getSingleResult].
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 suspend inline fun <reified T : Any> ReactiveNeo4jOperations.ExecutableQuery<T>.awaitSingleResultOrNull(): T? =
         singleResult.awaitFirstOrNull()
diff --git a/src/main/kotlin/org/springframework/data/neo4j/core/cypher/Parameters.kt b/src/main/kotlin/org/springframework/data/neo4j/core/cypher/Parameters.kt
index 7cf7d0a8c..4f57bad68 100644
--- a/src/main/kotlin/org/springframework/data/neo4j/core/cypher/Parameters.kt
+++ b/src/main/kotlin/org/springframework/data/neo4j/core/cypher/Parameters.kt
@@ -22,7 +22,7 @@ package org.springframework.data.neo4j.core.cypher
  * Extension on [String] returning the string itself prefixed with an escaped `$`.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 inline fun String.asParam() = "\$" + this
 
@@ -30,6 +30,6 @@ inline fun String.asParam() = "\$" + this
  * Extension on [String]'s companion object returning the string passed to it prefixed with an escaped `$`.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 infix fun String.Companion.asParam(s: String) = "\$" + s
diff --git a/src/test/java/org/springframework/data/neo4j/test/CausalClusterIntegrationTest.java b/src/test/java/org/springframework/data/neo4j/test/CausalClusterIntegrationTest.java
index 904090de9..59c4371ac 100644
--- a/src/test/java/org/springframework/data/neo4j/test/CausalClusterIntegrationTest.java
+++ b/src/test/java/org/springframework/data/neo4j/test/CausalClusterIntegrationTest.java
@@ -34,7 +34,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
  *
  * @author Michael J. Simons
  * @soundtrack Command & Conquer - Alarmstufe Rot
- * @since 1.0
+ * @since 6.0
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/test/java/org/springframework/data/neo4j/test/DriverMocks.java b/src/test/java/org/springframework/data/neo4j/test/DriverMocks.java
index dcb359f36..eaedc4b58 100644
--- a/src/test/java/org/springframework/data/neo4j/test/DriverMocks.java
+++ b/src/test/java/org/springframework/data/neo4j/test/DriverMocks.java
@@ -35,7 +35,7 @@ import org.neo4j.driver.reactive.RxTransaction;
  *
  * @author Michael J. Simons
  * @soundtrack Elton John - Greatest Hits 1970-2002
- * @since 1.0
+ * @since 6.0
  */
 public final class DriverMocks {
 
diff --git a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
index 33a71f5a0..9ba8dc964 100644
--- a/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
+++ b/src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java
@@ -54,7 +54,7 @@ import org.testcontainers.containers.Neo4jContainer;
  * otherwise it will start a test container and use that connection.
  *
  * @author Michael J. Simons
- * @since 1.0
+ * @since 6.0
  */
 @CommonsLog
 public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
@@ -148,7 +148,7 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback {
 	/**
 	 * Support class that holds the connection information and opens a new connection on demand.
 	 *
-	 * @since 1.0
+	 * @since 6.0
 	 */
 	public static class Neo4jConnectionSupport implements ExtensionContext.Store.CloseableResource {