Skip to content

Commit b21833f

Browse files
authored
Bump dependencies and set version to 2.4.0 (#156)
* Bump dependencies and set version to 2.4.0 * Upgrade GitHub actions * Add replace for security-severity "undefined" for license violation * Use string "0" instead of integer 0 as security-severity
1 parent 80d0d1c commit b21833f

File tree

4 files changed

+31
-26
lines changed

4 files changed

+31
-26
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
steps:
1212
# Checkout repo using https://github.com/marketplace/actions/checkout
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Set up JDK 1.8
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
2020
java-version: 8
@@ -25,7 +25,7 @@ jobs:
2525

2626
# See: https://github.com/actions/cache/blob/master/examples.md#java---maven
2727
- name: Cache local Maven repository
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
path: ~/.m2/repository
3131
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/snyk-scan.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: Run Snyk to check for vulnerabilities
1818
uses: snyk/actions/maven@master
@@ -22,6 +22,10 @@ jobs:
2222
with:
2323
args: --all-projects --sarif-file-output=snyk.sarif
2424

25+
- name: Replace "security-severity" "undefined" for license-related findings
26+
run: |
27+
sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk.sarif
28+
2529
- name: Check output file
2630
id: out-file
2731
run: |
@@ -32,6 +36,6 @@ jobs:
3236
3337
- name: Upload result to GitHub Code Scanning
3438
if: steps.out-file.outputs.exists == 'true'
35-
uses: github/codeql-action/upload-sarif@v2
39+
uses: github/codeql-action/upload-sarif@v3
3640
with:
3741
sarif_file: snyk.sarif

README.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.aerospike/java-object-mapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.aerospike/java-object-mapper/)
44
[![javadoc](https://javadoc.io/badge2/com.aerospike/java-object-mapper/javadoc.svg)](https://javadoc.io/doc/com.aerospike/java-object-mapper)
55

6-
[Aerospike](https://www.aerospike.com) is one of, if not the fastest, NoSQL database in the world. It presents a Java API which is comprehensive and powerful, but requires a measure of boiler plate code to map the data from Java POJOs to the database. The aim of this repository is to lower the amount of code required when mapping POJOs to Aerospike and back as well as reducing some of the brittleness of the code.
6+
[Aerospike](https://www.aerospike.com) is one of, if not the fastest, NoSQL database in the world. It presents a Java API which is comprehensive and powerful, but requires a measure of boilerplate code to map the data from Java POJOs to the database. The aim of this repository is to lower the amount of code required when mapping POJOs to Aerospike and back as well as reducing some of the brittleness of the code.
77

88
## Documentation
99

@@ -45,11 +45,12 @@ The documentation for this project can be found on [javadoc.io](https://www.java
4545
# Compatibility with Aerospike Clients
4646

4747
| Java Object Mapper Version | Aerospike Client | Aerospike Reactor Client
48-
|:---------------------------| :----------- | :-----------
49-
| 2.1.x, 2.2.x, 2.3.x | 6.1.x | 6.1.x
50-
| 2.0.x | 5.1.x | 5.1.x
51-
| 1.2.x, 1.3.x, 1.4.x | 5.1.x | 5.0.x
52-
| 1.1.x | 5.0.x |
48+
|:---------------------------|:-----------------| :-----------
49+
| 2.4.x | 8.1.x (jdk8) | 7.1.x
50+
| 2.1.x, 2.2.x, 2.3.x | 6.1.x | 6.1.x
51+
| 2.0.x | 5.1.x | 5.1.x
52+
| 1.2.x, 1.3.x, 1.4.x | 5.1.x | 5.0.x
53+
| 1.1.x | 5.0.x |
5354

5455
# Installing the Mapper
5556
The easiest way to use the mapper is through Maven or Gradle. For Maven, pull it in from Maven Central:
@@ -58,13 +59,13 @@ The easiest way to use the mapper is through Maven or Gradle. For Maven, pull it
5859
<dependency>
5960
<groupId>com.aerospike</groupId>
6061
<artifactId>java-object-mapper</artifactId>
61-
<version>2.3.2</version>
62+
<version>2.4.0</version>
6263
</dependency>
6364
```
6465
For Gradle, you can use
6566
```
6667
// https://mvnrepository.com/artifact/com.aerospike/java-object-mapper
67-
implementation group: 'com.aerospike', name: 'java-object-mapper', version: '2.3.2'
68+
implementation group: 'com.aerospike', name: 'java-object-mapper', version: '2.4.0'
6869
```
6970

7071
# Motivation and a simple example

pom.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.aerospike</groupId>
77
<artifactId>java-object-mapper</artifactId>
8-
<version>2.3.2</version>
8+
<version>2.4.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>Aerospike Object Mapper</name>
@@ -22,19 +22,19 @@
2222
<java.version>1.8</java.version>
2323
<maven.compiler.target>1.8</maven.compiler.target>
2424
<maven.compiler.source>1.8</maven.compiler.source>
25-
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
25+
<maven.source.plugin.version>3.3.1</maven.source.plugin.version>
2626
<maven.javadoc.plugin.version>3.3.0</maven.javadoc.plugin.version>
2727
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
28-
<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
29-
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
28+
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
29+
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
3030
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
31-
<aerospike-client.version>7.1.0</aerospike-client.version>
32-
<aerospike-reactor.version>7.0.0</aerospike-reactor.version>
33-
<commons-lang3.version>3.12.0</commons-lang3.version>
34-
<jackson-dataformat-yaml.version>2.15.2</jackson-dataformat-yaml.version>
35-
<lombok.version>1.18.28</lombok.version>
36-
<reactor-test.version>3.5.8</reactor-test.version>
37-
<junit-jupiter.version>5.9.3</junit-jupiter.version>
31+
<aerospike-client-jdk8.version>8.1.0</aerospike-client-jdk8.version>
32+
<aerospike-reactor.version>7.1.0</aerospike-reactor.version>
33+
<commons-lang3.version>3.14.0</commons-lang3.version>
34+
<jackson-dataformat-yaml.version>2.17.0</jackson-dataformat-yaml.version>
35+
<lombok.version>1.18.32</lombok.version>
36+
<reactor-test.version>3.6.5</reactor-test.version>
37+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
3838
</properties>
3939

4040
<licenses>
@@ -83,8 +83,8 @@
8383
<!-- https://mvnrepository.com/artifact/com.aerospike/aerospike-client -->
8484
<dependency>
8585
<groupId>com.aerospike</groupId>
86-
<artifactId>aerospike-client</artifactId>
87-
<version>${aerospike-client.version}</version>
86+
<artifactId>aerospike-client-jdk8</artifactId>
87+
<version>${aerospike-client-jdk8.version}</version>
8888
</dependency>
8989

9090
<dependency>

0 commit comments

Comments
 (0)