Skip to content

Commit

Permalink
FMWK-265 Prepare release 4.6.0 (#666)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people authored Dec 19, 2023
1 parent 236c665 commit 0066b89
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/asciidoctor-ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down
26 changes: 13 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -16,30 +16,30 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>3.1.2</version>
<version>3.2.1</version>
</parent>

<properties>
<java.version>17</java.version>
<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>
Expand Down
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}.
*/
Expand Down

0 comments on commit 0066b89

Please sign in to comment.