Skip to content

Commit b1d369d

Browse files
agrgragrgr
authored
CLIENT-4429 Update dependencies, set version to 2.7.0 (#208)
1 parent 578ee78 commit b1d369d

19 files changed

Lines changed: 67 additions & 61 deletions

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
name: Build project
2+
3+
permissions:
4+
id-token: write
5+
contents: read
6+
27
on:
38
push:
49
branches:
@@ -22,11 +27,11 @@ jobs:
2227
distribution: 'temurin'
2328
java-version: 8
2429

25-
# Aerospike cluster for integration tests (https://github.com/reugn/github-action-aerospike)
2630
- name: Set up Aerospike Database
27-
uses: reugn/github-action-aerospike@v1
31+
uses: aerospike/shared-workflows/.github/actions/setup-aerospike-server@334ad55b790658d549747b0d154407dfc730acca
2832
with:
29-
server-version: 7.2.0.6
33+
oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
34+
oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
3035

3136
# See: https://github.com/actions/cache/blob/master/examples.md#java---maven
3237
- name: Cache local Maven repository

‎.github/workflows/promote.yml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -282,35 +282,36 @@ jobs:
282282
build-path: ${{ needs.promote.outputs.build-name-number }}
283283
variables: '{"SONATYPE_STAGING_BUILD_ID":"${{ steps.publish-to-sonatype.outputs.maven-central-release-id }}"}'
284284

285-
publish-release-github:
286-
runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
287-
needs: [ promote, publish-release-sonatype ]
288-
steps:
289-
- name: Harden the runner (Audit all outbound calls)
290-
uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
291-
with:
292-
egress-policy: audit
293-
294-
- name: Checkout
295-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
296-
with:
297-
ref: ${{ inputs.target-branch }}
298-
token: ${{ secrets.CLIENT_BOT_PAT }}
299-
300-
- uses: ./.github/actions/stage-release-artifacts
301-
with:
302-
oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
303-
oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
304-
target-repository: ${{ inputs.target-repository }}
305-
build-name-number: ${{ needs.promote.outputs.build-name-number }}
306-
artifact-version: ${{ needs.promote.outputs.artifact-version }}
307-
staging-folder: '["staging","github"]'
285+
# Not used at the moment
286+
# publish-release-github:
287+
# runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }}
288+
# needs: [ promote, publish-release-sonatype ]
289+
# steps:
290+
# - name: Harden the runner (Audit all outbound calls)
291+
# uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
292+
# with:
293+
# egress-policy: audit
294+
#
295+
# - name: Checkout
296+
# uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
297+
# with:
298+
# ref: ${{ inputs.target-branch }}
299+
# token: ${{ secrets.CLIENT_BOT_PAT }}
300+
#
301+
# - uses: ./.github/actions/stage-release-artifacts
302+
# with:
303+
# oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }}
304+
# oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
305+
# target-repository: ${{ inputs.target-repository }}
306+
# build-name-number: ${{ needs.promote.outputs.build-name-number }}
307+
# artifact-version: ${{ needs.promote.outputs.artifact-version }}
308+
# staging-folder: '["staging","github"]'
308309

309310
# Publishing release to GitHub
310311
# Note: this action knows how to process json internally. It expects inputs to be in json format
311-
- uses: ./.github/actions/publish-to-github
312-
with:
313-
release-notes: ${{ needs.promote.outputs.release-notes }}
314-
github-token: ${{ secrets.CLIENT_BOT_PAT }}
315-
build-name-number: ${{ needs.promote.outputs.build-name-numbers }}
316-
artifact-version: ${{ needs.promote.outputs.artifact-version }}
312+
# - uses: ./.github/actions/publish-to-github
313+
# with:
314+
# release-notes: ${{ needs.promote.outputs.release-notes }}
315+
# github-token: ${{ secrets.CLIENT_BOT_PAT }}
316+
# build-name-number: ${{ needs.promote.outputs.build-name-numbers }}
317+
# artifact-version: ${{ needs.promote.outputs.artifact-version }}

‎pom.xml‎

Lines changed: 13 additions & 13 deletions
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.6.0</version>
8+
<version>2.7.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>Aerospike Object Mapper</name>
@@ -27,16 +27,16 @@
2727
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
2828
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
2929
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
30-
<maven-central-publishing-plugin.version>0.8.0</maven-central-publishing-plugin.version>
31-
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
32-
<aerospike-client-jdk8.version>9.0.5</aerospike-client-jdk8.version>
33-
<aerospike-reactor.version>9.0.5</aerospike-reactor.version>
34-
<commons-lang3.version>3.18.0</commons-lang3.version>
30+
<maven-central-publishing-plugin.version>0.10.0</maven-central-publishing-plugin.version>
31+
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
32+
<aerospike-client-jdk8.version>10.0.0</aerospike-client-jdk8.version>
33+
<aerospike-reactor.version>10.0.0</aerospike-reactor.version>
34+
<commons-lang3.version>3.20.0</commons-lang3.version>
3535
<snakeyaml.version>2.6</snakeyaml.version>
3636
<jackson-databind.version>2.21.2</jackson-databind.version>
37-
<lombok.version>1.18.38</lombok.version>
38-
<reactor-test.version>3.7.7</reactor-test.version>
39-
<junit-jupiter.version>5.11.4</junit-jupiter.version>
37+
<lombok.version>1.18.44</lombok.version>
38+
<reactor-test.version>3.8.4</reactor-test.version>
39+
<junit-jupiter.version>5.12.2</junit-jupiter.version>
4040
</properties>
4141

4242
<licenses>
@@ -75,11 +75,11 @@
7575
</distributionManagement>
7676

7777
<dependencies>
78-
<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
78+
<!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
7979
<dependency>
80-
<groupId>javax.validation</groupId>
81-
<artifactId>validation-api</artifactId>
82-
<version>${javax.validation-api.version}</version>
80+
<groupId>jakarta.validation</groupId>
81+
<artifactId>jakarta.validation-api</artifactId>
82+
<version>${jakarta.validation-api.version}</version>
8383
</dependency>
8484

8585
<!-- https://mvnrepository.com/artifact/com.aerospike/aerospike-client -->

‎src/main/java/com/aerospike/mapper/tools/AbstractBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Set;
1313
import java.util.stream.Collectors;
1414

15-
import javax.validation.constraints.NotNull;
15+
import jakarta.validation.constraints.NotNull;
1616

1717
import org.apache.commons.lang3.StringUtils;
1818

‎src/main/java/com/aerospike/mapper/tools/AeroMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.aerospike.mapper.tools.utils.MapperUtils;
2424
import com.aerospike.mapper.tools.virtuallist.VirtualList;
2525

26-
import javax.validation.constraints.NotNull;
26+
import jakarta.validation.constraints.NotNull;
2727
import java.lang.reflect.Array;
2828
import java.util.ArrayList;
2929
import java.util.List;

‎src/main/java/com/aerospike/mapper/tools/ClassCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.aerospike.mapper.tools.configuration.Configuration;
1414
import com.aerospike.mapper.tools.utils.TypeUtils;
1515

16-
import javax.validation.constraints.NotNull;
16+
import jakarta.validation.constraints.NotNull;
1717
import java.util.HashMap;
1818
import java.util.Map;
1919

‎src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Set;
1616
import java.util.TreeMap;
1717

18-
import javax.validation.constraints.NotNull;
18+
import jakarta.validation.constraints.NotNull;
1919

2020
import org.apache.commons.lang3.StringUtils;
2121

‎src/main/java/com/aerospike/mapper/tools/IAeroMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.List;
44
import java.util.function.Function;
55

6-
import javax.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.NotNull;
77

88
import com.aerospike.client.AerospikeException;
99
import com.aerospike.client.IAerospikeClient;

‎src/main/java/com/aerospike/mapper/tools/IReactiveAeroMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.function.Function;
44

5-
import javax.validation.constraints.NotNull;
5+
import jakarta.validation.constraints.NotNull;
66

77
import com.aerospike.client.AerospikeException;
88
import com.aerospike.client.Key;

‎src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import reactor.core.publisher.Flux;
2323
import reactor.core.publisher.Mono;
2424

25-
import javax.validation.constraints.NotNull;
25+
import jakarta.validation.constraints.NotNull;
2626
import java.util.Arrays;
2727
import java.util.Objects;
2828
import java.util.function.Function;

0 commit comments

Comments
 (0)