Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FMWK-265 Prepare release 4.6.0 #666

Merged
merged 12 commits into from
Dec 19, 2023
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v4 is available

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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v6 is available

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.1.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.1.6</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.1.6</springdata.commons>
<springdata.keyvalue>3.1.6</springdata.keyvalue>
<spring-boot-starter-test>3.1.6</spring-boot-starter-test>
<spring-cloud-starter-bootstrap>4.0.4</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.0</reactor-test>
<embedded-aerospike>3.0.6</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.101.Final</netty.version>
</properties>

<licenses>
Expand Down
2 changes: 1 addition & 1 deletion src/main/asciidoc/index.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= Spring Data Aerospike - Documentation
:doctype: book
:revnumber: 4.5.0
:revnumber: 4.6.0
:revdate: {localdate}
:toc:
:toc-placement!:
Expand Down
4 changes: 3 additions & 1 deletion src/main/asciidoc/reference/aerospike.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Then add the following to `pom.xml` dependencies section.
<dependency>
<groupId>com.aerospike</groupId>
<artifactId>spring-data-aerospike</artifactId>
<version>4.5.0</version>
<version>4.6.0</version>
</dependency>

</dependencies>
Expand All @@ -43,6 +43,8 @@ You can either set up Spring Boot or Spring application. Basic setup of Spring B
[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.1.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
4 changes: 2 additions & 2 deletions src/main/asciidoc/reference/getting-started.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ To use Spring Data Aerospike in your project, the first step is to add it to you
<dependency>
<groupId>com.aerospike</groupId>
<artifactId>spring-data-aerospike</artifactId>
<version>4.5.0</version>
<version>4.6.0</version>
</dependency>
----

For Gradle:

[source, text]
----
implementation group: 'com.aerospike', name: 'spring-data-aerospike', version: '4.5.0'
implementation group: 'com.aerospike', name: 'spring-data-aerospike', version: '4.6.0'
----

== Connecting to Aerospike DB
Expand Down
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
Loading