From 0066b899a10c156492b007775bb48ea1da9fcd6f Mon Sep 17 00:00:00 2001
From: Andrey G <agrgr@users.noreply.github.com>
Date: Tue, 19 Dec 2023 15:55:12 +0200
Subject: [PATCH] FMWK-265 Prepare release 4.6.0 (#666)

* update dependencies, prepare release 4.6.0

* update actions-checkout version

* update SpringBoot to 3.1.6

* update dependencies

* Bump dependencies, Bump Spring Boot to 3.2

* bump setup-java from v3 to v4.

---------

Co-authored-by: Roi Menashe <33356310+roimenashe@users.noreply.github.com>
Co-authored-by: roimenashe <roimenashe5@gmail.com>
---
 .github/workflows/asciidoctor-ghpages.yml     |  2 +-
 .github/workflows/build.yml                   |  4 +--
 .github/workflows/release.yml                 |  2 +-
 .github/workflows/snyk-scan.yml               |  2 +-
 README.adoc                                   |  2 ++
 pom.xml                                       | 26 +++++++++----------
 src/main/asciidoc/reference/aerospike.adoc    |  0
 .../asciidoc/reference/getting-started.adoc   |  0
 .../aerospike/repository/query/Query.java     |  3 +--
 9 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 src/main/asciidoc/reference/aerospike.adoc
 create mode 100644 src/main/asciidoc/reference/getting-started.adoc

diff --git a/.github/workflows/asciidoctor-ghpages.yml b/.github/workflows/asciidoctor-ghpages.yml
index c32fd66fe..4369282d2 100644
--- a/.github/workflows/asciidoctor-ghpages.yml
+++ b/.github/workflows/asciidoctor-ghpages.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: asciidoctor-ghpages
         uses: manoelcampos/asciidoctor-ghpages-action@v2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index abc7ae078..dca674da3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
       # Checkout repo using https://github.com/marketplace/actions/checkout
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 92fcae628..597f8819c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
         with:
diff --git a/.github/workflows/snyk-scan.yml b/.github/workflows/snyk-scan.yml
index c95730f2d..e3e88d3a0 100644
--- a/.github/workflows/snyk-scan.yml
+++ b/.github/workflows/snyk-scan.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run Snyk to check for vulnerabilities
         uses: snyk/actions/maven@master
diff --git a/README.adoc b/README.adoc
index 95ed04f6a..9b6e8cb76 100644
--- a/README.adoc
+++ b/README.adoc
@@ -56,6 +56,8 @@ Data Aerospike - Projections]
 [width="100%",cols="<24%,<14%,<18%,<26%,<18%",options="header",]
 |===
 |Spring Data Aerospike |Spring Boot |Aerospike Client |Aerospike Reactor Client |Aerospike Server
+|4.6.x  |3.2.x |7.2.x |7.1.x |5.2.x.x +
+
 |4.5.x  |3.1.x |7.1.x |7.0.x |5.2.x.x +
 
 |4.4.x  |3.1.x |7.0.x |7.0.x |5.2.x.x +
diff --git a/pom.xml b/pom.xml
index 10c44c1c3..9f5a425f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.aerospike</groupId>
     <artifactId>spring-data-aerospike</artifactId>
-    <version>4.5.0</version>
+    <version>4.6.0</version>
     <name>Spring Data Aerospike</name>
     <organization>
         <name>Aerospike Inc.</name>
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>3.1.2</version>
+        <version>3.2.1</version>
     </parent>
 
     <properties>
@@ -24,22 +24,22 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <springdata.commons>3.1.2</springdata.commons>
-        <springdata.keyvalue>3.1.2</springdata.keyvalue>
-        <spring-cloud-starter-bootstrap>4.0.3</spring-cloud-starter-bootstrap>
-        <spring-boot-starter-test>3.1.0</spring-boot-starter-test>
+        <springdata.commons>3.2.1</springdata.commons>
+        <springdata.keyvalue>3.2.1</springdata.keyvalue>
+        <spring-boot-starter-test>3.2.0</spring-boot-starter-test>
+        <spring-cloud-starter-bootstrap>4.1.0</spring-cloud-starter-bootstrap>
         <maven.javadoc.plugin>3.3.0</maven.javadoc.plugin>
         <maven.gpg.plugin>1.6</maven.gpg.plugin>
-        <aerospike-client>7.1.0</aerospike-client>
-        <aerospike-reactor-client>7.0.0</aerospike-reactor-client>
-        <reactor-test>3.5.7</reactor-test>
-        <embedded-aerospike>3.0.0</embedded-aerospike>
+        <aerospike-client>7.2.0</aerospike-client>
+        <aerospike-reactor-client>7.1.0</aerospike-reactor-client>
+        <reactor-test>3.6.1</reactor-test>
+        <embedded-aerospike>3.1.1</embedded-aerospike>
         <jodatime>2.12.5</jodatime>
-        <lombok>1.18.28</lombok>
+        <lombok>1.18.30</lombok>
         <awaitility>4.2.0</awaitility>
-        <logback.test>1.4.11</logback.test>
+        <logback.test>1.4.14</logback.test>
         <hibernate.validator>8.0.1.Final</hibernate.validator>
-        <netty.version>4.1.100.Final</netty.version>
+        <netty.version>4.1.104.Final</netty.version>
     </properties>
 
     <licenses>
diff --git a/src/main/asciidoc/reference/aerospike.adoc b/src/main/asciidoc/reference/aerospike.adoc
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/asciidoc/reference/getting-started.adoc b/src/main/asciidoc/reference/getting-started.adoc
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/java/org/springframework/data/aerospike/repository/query/Query.java b/src/main/java/org/springframework/data/aerospike/repository/query/Query.java
index 485a98735..41e37f33d 100644
--- a/src/main/java/org/springframework/data/aerospike/repository/query/Query.java
+++ b/src/main/java/org/springframework/data/aerospike/repository/query/Query.java
@@ -20,7 +20,6 @@
 import org.springframework.data.aerospike.query.Qualifier;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.keyvalue.core.query.KeyValueQuery;
 
 /**
  * @author Peter Milne
@@ -39,7 +38,7 @@ public class Query {
     private boolean isDistinct;
 
     /**
-     * Creates new instance of {@link KeyValueQuery} with given criteria.
+     * Creates new instance of {@link Query} with given criteria.
      *
      * @param criteria can be {@literal null}.
      */