Skip to content

Commit eff834c

Browse files
authored
Dependencies upgrade (#44)
* Upgrade dependencies: - Spring framework: 5.3.27 to 6.0.11 - Spring Data: 2.7.0 to 3.1.2 - Apache commons-lang3: 3.12.0 to 3.13.0 - Reactor core: 3.4.19 to 3.5.8 - Spring boot starter: 2.7.0 to 3.1.2 - Slf4j: 1.7.36 to 2.0.7 - maven-compiler-plugin: 2.3.2 to 3.11.0 - maven-javadoc-plugin: 3.4.0 to 3.5.0 - maven-source-plugin: 3.2.1 to 3.3.0 - maven-checkstyle-plugin: 2.17 to 3.0.0 - maven-help-plugin: 3.1.0 to 3.4.0 - maven-jar-plugin: 3.2.0 to 3.3.0 - exec-maven-plugin: 3.0.0 to 3.1.0 - maven-surefire-plugin: 3.0.0-M5 to 3.1.2 * fixed last release version
1 parent 935f841 commit eff834c

File tree

5 files changed

+42
-22
lines changed

5 files changed

+42
-22
lines changed

CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,24 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](http://keepachangelog.com/).
55

6-
## [1.7.0]
6+
## [2.0.0]
7+
- Upgrade dependencies:
8+
- Spring framework: 5.3.27 to 6.0.11
9+
- Spring Data: 2.7.0 to 3.1.2
10+
- Apache commons-lang3: 3.12.0 to 3.13.0
11+
- Reactor core: 3.4.19 to 3.5.8
12+
- Spring boot starter: 2.7.0 to 3.1.2
13+
- Slf4j: 1.7.36 to 2.0.7
14+
- maven-compiler-plugin: 2.3.2 to 3.11.0
15+
- maven-javadoc-plugin: 3.4.0 to 3.5.0
16+
- maven-source-plugin: 3.2.1 to 3.3.0
17+
- maven-checkstyle-plugin: 2.17 to 3.0.0
18+
- maven-help-plugin: 3.1.0 to 3.4.0
19+
- maven-jar-plugin: 3.2.0 to 3.3.0
20+
- exec-maven-plugin: 3.0.0 to 3.1.0
21+
- maven-surefire-plugin: 3.0.0-M5 to 3.1.2
22+
23+
## [1.7.1]
724
### Added
825
- Added the checks to verify entity definition matches with corresponding
926
table in the database during table creation.

config/checkstyle.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
160160
-->
161161

162162
<property name="ignorePattern"
163-
value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
164-
default="^(package .*;\s*)|(import .*;\s*)|(.*https?://.*)$"/>
163+
value="^(package .*;\s*)|(import .*;\s*)|(.*https?://.*)$"/>
165164
</module>
166165

167166
<module name="RightCurly">

pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.oracle.nosql.sdk</groupId>
88
<artifactId>spring-data-oracle-nosql</artifactId>
9-
<version>1.7.1</version>
9+
<version>2.0.0</version>
1010

1111
<name>Oracle NoSQL Database SDK for Spring Data</name>
1212
<description>Oracle NoSQL Database SDK for Spring Data</description>
@@ -47,15 +47,15 @@
4747

4848
<nosqldriver.version>5.4.11</nosqldriver.version>
4949

50-
<spring.springframework.version>5.3.27</spring.springframework.version>
51-
<spring.data.version>2.7.0</spring.data.version>
52-
<org.apache.commons.commons-lang3.version>3.12.0</org.apache.commons.commons-lang3.version>
53-
<reactor.core.version>3.4.19</reactor.core.version>
50+
<spring.springframework.version>6.0.11</spring.springframework.version>
51+
<spring.data.version>3.1.2</spring.data.version>
52+
<org.apache.commons.commons-lang3.version>3.13.0</org.apache.commons.commons-lang3.version>
53+
<reactor.core.version>3.5.8</reactor.core.version>
5454

55-
<spring.boot.starter.test.version>2.7.0</spring.boot.starter.test.version>
55+
<spring.boot.starter.test.version>3.1.2</spring.boot.starter.test.version>
5656
<junit.junit.version>4.13.2</junit.junit.version>
57-
<project.reactor.test.version>3.4.19</project.reactor.test.version>
58-
<slf4j.version>1.7.36</slf4j.version>
57+
<project.reactor.test.version>3.5.8</project.reactor.test.version>
58+
<slf4j.version>2.0.7</slf4j.version>
5959
</properties>
6060

6161
<dependencies>
@@ -242,7 +242,7 @@
242242
<plugin>
243243
<groupId>org.apache.maven.plugins</groupId>
244244
<artifactId>maven-compiler-plugin</artifactId>
245-
<version>2.3.2</version>
245+
<version>3.11.0</version>
246246
<configuration>
247247
<compilerArgument>-Xlint</compilerArgument>
248248
</configuration>
@@ -251,7 +251,7 @@
251251
<plugin>
252252
<groupId>org.apache.maven.plugins</groupId>
253253
<artifactId>maven-javadoc-plugin</artifactId>
254-
<version>3.4.0</version>
254+
<version>3.5.0</version>
255255
<configuration>
256256
<show>protected</show>
257257
<failOnError>false</failOnError>
@@ -276,7 +276,7 @@
276276
<plugin>
277277
<groupId>org.apache.maven.plugins</groupId>
278278
<artifactId>maven-source-plugin</artifactId>
279-
<version>2.2.1</version>
279+
<version>3.3.0</version>
280280
<executions>
281281
<execution>
282282
<id>attach-sources</id>
@@ -291,7 +291,7 @@
291291
<plugin>
292292
<groupId>org.apache.maven.plugins</groupId>
293293
<artifactId>maven-checkstyle-plugin</artifactId>
294-
<version>2.17</version>
294+
<version>3.0.0</version>
295295
<executions>
296296
<execution>
297297
<id>validate</id>
@@ -319,7 +319,7 @@
319319
<plugin>
320320
<groupId>org.apache.maven.plugins</groupId>
321321
<artifactId>maven-help-plugin</artifactId>
322-
<version>3.1.0</version>
322+
<version>3.4.0</version>
323323
<executions>
324324
<execution>
325325
<id>show-profiles</id>
@@ -334,7 +334,7 @@
334334
<!-- include info in MANIFEST.MF file -->
335335
<plugin>
336336
<artifactId>maven-jar-plugin</artifactId>
337-
<version>3.2.0</version>
337+
<version>3.3.0</version>
338338
<configuration>
339339
<archive>
340340
<manifest>
@@ -382,7 +382,7 @@
382382
<plugin>
383383
<groupId>org.codehaus.mojo</groupId>
384384
<artifactId>exec-maven-plugin</artifactId>
385-
<version>3.0.0</version>
385+
<version>3.1.0</version>
386386
<executions>
387387
<execution>
388388
<id>add license files to runtime jar</id>
@@ -439,7 +439,7 @@
439439
<plugin>
440440
<!-- test plugin -->
441441
<artifactId>maven-surefire-plugin</artifactId>
442-
<version>3.0.0-M5</version>
442+
<version>3.1.2</version>
443443
<configuration>
444444
<!-- uncomment below to write stdout to files
445445
in target/surefire-reports -->

src/main/java/com/oracle/nosql/spring/data/repository/NosqlRepository.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
import org.springframework.data.domain.Page;
1818
import org.springframework.data.domain.Pageable;
1919
import org.springframework.data.domain.Sort;
20+
import org.springframework.data.repository.CrudRepository;
2021
import org.springframework.data.repository.NoRepositoryBean;
2122
import org.springframework.data.repository.PagingAndSortingRepository;
2223

2324
@NoRepositoryBean
2425
public interface NosqlRepository<T, ID extends Serializable> extends
25-
PagingAndSortingRepository<T, ID> {
26+
PagingAndSortingRepository<T, ID>,
27+
CrudRepository<T, ID> {
2628

2729
/*
2830
* (non-Javadoc)

src/main/java/com/oracle/nosql/spring/data/repository/ReactiveNosqlRepository.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
import com.oracle.nosql.spring.data.core.mapping.NosqlTable;
1313

1414
import org.springframework.data.repository.NoRepositoryBean;
15+
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
1516
import org.springframework.data.repository.reactive.ReactiveSortingRepository;
1617

1718
@NoRepositoryBean
18-
public interface ReactiveNosqlRepository <T, K>
19-
extends ReactiveSortingRepository<T, K> {
19+
public interface ReactiveNosqlRepository <T, K> extends
20+
ReactiveSortingRepository<T, K>,
21+
ReactiveCrudRepository<T, K> {
2022

2123
/**
2224
* Returns the configured request timeout value, in milliseconds, or 0 if

0 commit comments

Comments
 (0)