From c668f6fe84a874bc7b84b801f66c7ffd6e7f3647 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 29 Jun 2023 17:16:09 +0300 Subject: [PATCH] FMWK-198 Update dependencies versions (#596) --- README.adoc | 38 ++++++++----------- pom.xml | 18 ++++----- src/main/asciidoc/index.adoc | 2 +- src/main/asciidoc/preface.adoc | 6 +-- src/main/asciidoc/reference/aerospike.adoc | 4 +- .../asciidoc/reference/getting-started.adoc | 4 +- .../query/StubParameterAccessor.java | 6 +++ 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/README.adoc b/README.adoc index fdad56450..3d1af731a 100644 --- a/README.adoc +++ b/README.adoc @@ -11,23 +11,19 @@ {ci-url}[image:{ci-image}[ci]] {javadoc-url}[image:{javadoc-image}[javadoc]] -The primary goal of the https://projects.spring.io/spring-data[Spring -Data] project is to make it easier to build Spring-powered applications -that use new data access technologies such as non-relational databases, -map-reduce frameworks, and cloud based data services. - -The Spring Data Aerospike project aims to provide a familiar and -consistent Spring-based programming model for new data stores while -retaining store-specific features and capabilities. The Spring Data -Aerospike project provides integration with the Aerospike document -database. Key functional areas of Spring Data Aerospike are a POJO -centric model for interacting with an Aerospike DBCollection and easily +The Spring Data Aerospike project aims to provide a familiar and consistent Spring-based programming model for new data +stores while retaining store-specific features and capabilities. It provides integration with the Aerospike database. +Key functional areas of Spring Data Aerospike are a POJO centric model for interacting with Aerospike DB and easily writing a repository style data access layer. == Documentation -The documentation for this project can be found on -https://www.javadoc.io/doc/com.aerospike/spring-data-aerospike[javadoc.io]. +* The https://aerospike.github.io/spring-data-aerospike[User Guide] +* Java code documentation on https://www.javadoc.io/doc/com.aerospike/spring-data-aerospike[javadoc.io] +* https://docs.aerospike.com/[Aerospike documentation] + +If you are new to Spring as well as to Spring Data, look for information +about https://projects.spring.io/[Spring projects]. == Demo Projects @@ -60,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.3.x |3.1.x |6.1.x |6.1.x |5.2.x.x + + |4.2.x |3.0.x |6.1.x |6.1.x |5.2.x.x + |4.1.x |3.0.x |6.1.x |6.1.x |5.2.x.x + @@ -96,7 +94,7 @@ Add the Maven dependency: com.aerospike spring-data-aerospike - 4.2.0 + 4.3.0 ---- @@ -209,21 +207,15 @@ public class MyService { == Getting Help -For a comprehensive treatment of all the Spring Data Aerospike features, -please refer to: +See <>. -* the -https://aerospike.github.io/spring-data-aerospike[User Guide] -* for more detailed questions, use +For more detailed questions you can use https://stackoverflow.com/questions/tagged/spring-data-aerospike[Spring Data Aerospike on Stackoverflow]. -If you are new to Spring as well as to Spring Data, look for information -about https://projects.spring.io/[Spring projects]. - == Contributing to Spring Data -Here are some ways for you to get involved in the community: +Here are some ways you can get involved: * Get involved with the Spring community on Stackoverflow and help out on the diff --git a/pom.xml b/pom.xml index 4d6829d67..e2d3e2b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.aerospike spring-data-aerospike - 4.2.0 + 4.3.0 Spring Data Aerospike Aerospike Inc. @@ -16,25 +16,25 @@ org.springframework.data.build spring-data-parent - 3.0.4 + 3.1.1 17 17 UTF-8 - 3.0.4 - 3.0.4 - 4.0.1 - 3.0.5 + 3.1.1 + 3.1.1 + 4.0.3 + 3.1.0 3.3.0 1.6 - 6.1.10 + 6.1.11 6.1.2 - 3.5.4 + 3.5.7 2.3.2 2.12.5 - 1.18.26 + 1.18.28 4.2.0 1.4.6 8.0.0.Final diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index 4429558ca..80742da2c 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -1,5 +1,5 @@ = Spring Data Aerospike - Reference Documentation -:revnumber: 4.2.0 +:revnumber: 4.3.0 :revdate: {localdate} :toc: :toc-placement!: diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index a76831cf7..a9a92aad6 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -20,19 +20,19 @@ NoSQL stores have taken the storage world by storm. It is a vast domain with a p The jumping off ground for learning about Aerospike is https://www.aerospike.com/[www.aerospike.com]. Here is a list of other useful resources: * The https://www.aerospike.com/docs/[technical documentation] introduces Aerospike and contains links to getting started guides, reference documentation and tutorials. -* The https://www.aerospike.com/docs/client/java/[java client documentation] provides a convenient way to interact with a Aerospike instance in combination with the online https://www.aerospike.com:443/docs/client/java/start/index.html/[Getting started] +* The https://www.aerospike.com/docs/client/java/[java client documentation] provides a convenient way to interact with an Aerospike instance in combination with the online https://www.aerospike.com:443/docs/client/java/start/index.html/[Getting started] * https://www.aerospike.com/community/[Aerospike Community] [[requirements]] == Requirements -Spring Data Aerospike 4.2.x binaries require JDK level 17.0 and above, and https://spring.io/docs[Spring Framework] 5.3.x and above. +Spring Data Aerospike binaries require JDK level 17.0 and above, and https://spring.io/docs[Spring Framework] 5.3.x and above. In terms of server, https://www.aerospike.com/download/server/[Aerospike] version at least 5.2 == Additional Help Resources -Learning a new framework is not always straightforward. In this section, we try to provide what we think is an easy to follow guide for starting with Spring Data Aerospike module. However, if you encounter issues or you are just looking for advice, feel free to use one of the links below: +Learning a new framework is not always straightforward. In this section, we try to provide what we think is an easy-to-follow guide for starting with Spring Data Aerospike module. However, if you encounter issues, or you are just looking for advice, feel free to use one of the links below: [[get-started:help]] === Support diff --git a/src/main/asciidoc/reference/aerospike.adoc b/src/main/asciidoc/reference/aerospike.adoc index 2041aff49..3e615f6b3 100644 --- a/src/main/asciidoc/reference/aerospike.adoc +++ b/src/main/asciidoc/reference/aerospike.adoc @@ -31,7 +31,7 @@ Then add the following to `pom.xml` dependencies section. com.aerospike spring-data-aerospike - 4.2.0 + 4.3.0 @@ -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.3.x |3.1.x |6.1.x |6.1.x |5.2.x.x + + |4.2.x |3.0.x |6.1.x |6.1.x |5.2.x.x + |4.1.x |3.0.x |6.1.x |6.1.x |5.2.x.x + diff --git a/src/main/asciidoc/reference/getting-started.adoc b/src/main/asciidoc/reference/getting-started.adoc index 4d49b038b..9dc4ce6bb 100644 --- a/src/main/asciidoc/reference/getting-started.adoc +++ b/src/main/asciidoc/reference/getting-started.adoc @@ -9,7 +9,7 @@ To use Spring Data Aerospike in your project, the first step is to add it to you com.aerospike spring-data-aerospike - 4.2.0 + 4.3.0 ---- @@ -17,7 +17,7 @@ For Gradle: [source, text] ---- -implementation group: 'com.aerospike', name: 'spring-data-aerospike', version: '4.2.0' +implementation group: 'com.aerospike', name: 'spring-data-aerospike', version: '4.3.0' ---- == Connecting to Aerospike DB diff --git a/src/test/java/org/springframework/data/aerospike/repository/query/StubParameterAccessor.java b/src/test/java/org/springframework/data/aerospike/repository/query/StubParameterAccessor.java index 755884cc3..5cb21d56b 100644 --- a/src/test/java/org/springframework/data/aerospike/repository/query/StubParameterAccessor.java +++ b/src/test/java/org/springframework/data/aerospike/repository/query/StubParameterAccessor.java @@ -16,6 +16,7 @@ package org.springframework.data.aerospike.repository.query; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.ScrollPosition; import org.springframework.data.domain.Sort; import java.util.Arrays; @@ -33,6 +34,11 @@ public StubParameterAccessor(Object... values) { this.values = values; } + @Override + public ScrollPosition getScrollPosition() { + return null; + } + @Override public Pageable getPageable() { return null;