From e902a4754b37257a9355d3fc45209f59cd8e6596 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 2 Apr 2026 17:41:54 +0200 Subject: [PATCH 1/5] Update dependencies, set version to 2.7.0 --- .github/workflows/promote.yml | 59 ++++++++++--------- pom.xml | 26 ++++---- .../mapper/tools/AbstractBuilder.java | 2 +- .../aerospike/mapper/tools/AeroMapper.java | 2 +- .../aerospike/mapper/tools/ClassCache.java | 2 +- .../mapper/tools/ClassCacheEntry.java | 2 +- .../aerospike/mapper/tools/IAeroMapper.java | 2 +- .../mapper/tools/IReactiveAeroMapper.java | 2 +- .../mapper/tools/ReactiveAeroMapper.java | 2 +- .../com/aerospike/mapper/tools/ValueType.java | 2 +- .../tools/configuration/ClassConfig.java | 2 +- .../tools/converters/MappingConverter.java | 2 +- .../tools/virtuallist/BaseVirtualList.java | 2 +- .../mapper/tools/virtuallist/Interactor.java | 2 +- .../tools/virtuallist/MultiOperation.java | 2 +- .../virtuallist/ReactiveMultiOperation.java | 2 +- .../virtuallist/ReactiveVirtualList.java | 2 +- .../mapper/tools/virtuallist/VirtualList.java | 2 +- 18 files changed, 59 insertions(+), 58 deletions(-) diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index f427780..6d6e0ce 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -282,35 +282,36 @@ jobs: build-path: ${{ needs.promote.outputs.build-name-number }} variables: '{"SONATYPE_STAGING_BUILD_ID":"${{ steps.publish-to-sonatype.outputs.maven-central-release-id }}"}' - publish-release-github: - runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }} - needs: [ promote, publish-release-sonatype ] - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0 - with: - egress-policy: audit - - - name: Checkout - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - with: - ref: ${{ inputs.target-branch }} - token: ${{ secrets.CLIENT_BOT_PAT }} - - - uses: ./.github/actions/stage-release-artifacts - with: - oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }} - oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }} - target-repository: ${{ inputs.target-repository }} - build-name-number: ${{ needs.promote.outputs.build-name-number }} - artifact-version: ${{ needs.promote.outputs.artifact-version }} - staging-folder: '["staging","github"]' + # Not used at the moment + # publish-release-github: + # runs-on: ${{ vars.BUILD_CONTAINER_DISTRO_VERSION }} + # needs: [ promote, publish-release-sonatype ] + # steps: + # - name: Harden the runner (Audit all outbound calls) + # uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0 + # with: + # egress-policy: audit + # + # - name: Checkout + # uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + # with: + # ref: ${{ inputs.target-branch }} + # token: ${{ secrets.CLIENT_BOT_PAT }} + # + # - uses: ./.github/actions/stage-release-artifacts + # with: + # oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }} + # oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }} + # target-repository: ${{ inputs.target-repository }} + # build-name-number: ${{ needs.promote.outputs.build-name-number }} + # artifact-version: ${{ needs.promote.outputs.artifact-version }} + # staging-folder: '["staging","github"]' # Publishing release to GitHub # Note: this action knows how to process json internally. It expects inputs to be in json format - - uses: ./.github/actions/publish-to-github - with: - release-notes: ${{ needs.promote.outputs.release-notes }} - github-token: ${{ secrets.CLIENT_BOT_PAT }} - build-name-number: ${{ needs.promote.outputs.build-name-numbers }} - artifact-version: ${{ needs.promote.outputs.artifact-version }} +# - uses: ./.github/actions/publish-to-github +# with: +# release-notes: ${{ needs.promote.outputs.release-notes }} +# github-token: ${{ secrets.CLIENT_BOT_PAT }} +# build-name-number: ${{ needs.promote.outputs.build-name-numbers }} +# artifact-version: ${{ needs.promote.outputs.artifact-version }} diff --git a/pom.xml b/pom.xml index 5817114..f012d37 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.aerospike java-object-mapper - 2.6.0 + 2.7.0 jar Aerospike Object Mapper @@ -27,16 +27,16 @@ 1.6 3.13.0 3.3.0 - 0.8.0 - 2.0.1.Final - 9.0.5 - 9.0.5 - 3.18.0 + 0.10.0 + 3.1.1 + 10.0.0 + 10.0.0 + 3.20.0 2.6 2.21.2 - 1.18.38 - 3.7.7 - 5.11.4 + 1.18.44 + 3.8.4 + 6.0.3 @@ -75,11 +75,11 @@ - + - javax.validation - validation-api - ${javax.validation-api.version} + jakarta.validation + jakarta.validation-api + ${jakarta.validation-api.version} diff --git a/src/main/java/com/aerospike/mapper/tools/AbstractBuilder.java b/src/main/java/com/aerospike/mapper/tools/AbstractBuilder.java index 1e30d70..21dc930 100644 --- a/src/main/java/com/aerospike/mapper/tools/AbstractBuilder.java +++ b/src/main/java/com/aerospike/mapper/tools/AbstractBuilder.java @@ -12,7 +12,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/aerospike/mapper/tools/AeroMapper.java b/src/main/java/com/aerospike/mapper/tools/AeroMapper.java index d7d27bf..4022466 100644 --- a/src/main/java/com/aerospike/mapper/tools/AeroMapper.java +++ b/src/main/java/com/aerospike/mapper/tools/AeroMapper.java @@ -23,7 +23,7 @@ import com.aerospike.mapper.tools.utils.MapperUtils; import com.aerospike.mapper.tools.virtuallist.VirtualList; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/aerospike/mapper/tools/ClassCache.java b/src/main/java/com/aerospike/mapper/tools/ClassCache.java index 19cd0ff..aa27821 100644 --- a/src/main/java/com/aerospike/mapper/tools/ClassCache.java +++ b/src/main/java/com/aerospike/mapper/tools/ClassCache.java @@ -13,7 +13,7 @@ import com.aerospike.mapper.tools.configuration.Configuration; import com.aerospike.mapper.tools.utils.TypeUtils; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java b/src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java index b8ca94a..f1badb5 100644 --- a/src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java +++ b/src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java @@ -15,7 +15,7 @@ import java.util.Set; import java.util.TreeMap; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/aerospike/mapper/tools/IAeroMapper.java b/src/main/java/com/aerospike/mapper/tools/IAeroMapper.java index 4c6ff52..05c446e 100644 --- a/src/main/java/com/aerospike/mapper/tools/IAeroMapper.java +++ b/src/main/java/com/aerospike/mapper/tools/IAeroMapper.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.function.Function; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.aerospike.client.AerospikeException; import com.aerospike.client.IAerospikeClient; diff --git a/src/main/java/com/aerospike/mapper/tools/IReactiveAeroMapper.java b/src/main/java/com/aerospike/mapper/tools/IReactiveAeroMapper.java index 36bcd7a..daf8c19 100644 --- a/src/main/java/com/aerospike/mapper/tools/IReactiveAeroMapper.java +++ b/src/main/java/com/aerospike/mapper/tools/IReactiveAeroMapper.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.aerospike.client.AerospikeException; import com.aerospike.client.Key; diff --git a/src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java b/src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java index f18bebd..f19a0fd 100644 --- a/src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java +++ b/src/main/java/com/aerospike/mapper/tools/ReactiveAeroMapper.java @@ -22,7 +22,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Arrays; import java.util.Objects; import java.util.function.Function; diff --git a/src/main/java/com/aerospike/mapper/tools/ValueType.java b/src/main/java/com/aerospike/mapper/tools/ValueType.java index 6331f69..619348d 100644 --- a/src/main/java/com/aerospike/mapper/tools/ValueType.java +++ b/src/main/java/com/aerospike/mapper/tools/ValueType.java @@ -8,7 +8,7 @@ import com.aerospike.mapper.tools.DeferredObjectLoader.DeferredSetter; import com.aerospike.mapper.tools.utils.TypeUtils.AnnotatedType; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java b/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java index 3e2c400..268045c 100644 --- a/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java +++ b/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.aerospike.client.AerospikeException; import com.aerospike.mapper.annotations.AerospikeEmbed; diff --git a/src/main/java/com/aerospike/mapper/tools/converters/MappingConverter.java b/src/main/java/com/aerospike/mapper/tools/converters/MappingConverter.java index 082e7cd..6734e04 100644 --- a/src/main/java/com/aerospike/mapper/tools/converters/MappingConverter.java +++ b/src/main/java/com/aerospike/mapper/tools/converters/MappingConverter.java @@ -17,7 +17,7 @@ import com.aerospike.mapper.tools.utils.MapperUtils; import com.aerospike.mapper.tools.utils.TypeUtils; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/BaseVirtualList.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/BaseVirtualList.java index 4e2203f..2159fd3 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/BaseVirtualList.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/BaseVirtualList.java @@ -14,7 +14,7 @@ import com.aerospike.mapper.tools.mappers.ListMapper; import com.aerospike.mapper.tools.utils.TypeUtils; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/Interactor.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/Interactor.java index b121819..e7d5375 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/Interactor.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/Interactor.java @@ -1,6 +1,6 @@ package com.aerospike.mapper.tools.virtuallist; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.aerospike.client.Operation; diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/MultiOperation.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/MultiOperation.java index 416aca6..8963991 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/MultiOperation.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/MultiOperation.java @@ -9,7 +9,7 @@ import com.aerospike.mapper.tools.IAeroMapper; import com.aerospike.mapper.tools.mappers.ListMapper; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveMultiOperation.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveMultiOperation.java index b34d453..3076fb1 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveMultiOperation.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveMultiOperation.java @@ -9,7 +9,7 @@ import com.aerospike.mapper.tools.mappers.ListMapper; import reactor.core.publisher.Mono; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveVirtualList.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveVirtualList.java index 5d98ad0..85e9915 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveVirtualList.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/ReactiveVirtualList.java @@ -10,7 +10,7 @@ import com.aerospike.mapper.tools.IReactiveAeroMapper; import reactor.core.publisher.Mono; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; public class ReactiveVirtualList extends BaseVirtualList implements IReactiveVirtualList { diff --git a/src/main/java/com/aerospike/mapper/tools/virtuallist/VirtualList.java b/src/main/java/com/aerospike/mapper/tools/virtuallist/VirtualList.java index b63823b..a2a244a 100644 --- a/src/main/java/com/aerospike/mapper/tools/virtuallist/VirtualList.java +++ b/src/main/java/com/aerospike/mapper/tools/virtuallist/VirtualList.java @@ -9,7 +9,7 @@ import com.aerospike.mapper.tools.ClassCache; import com.aerospike.mapper.tools.IAeroMapper; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.List; public class VirtualList extends BaseVirtualList implements IVirtualList { From 879658a4264a1a829a9f8722135508de9bf6b7f7 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 2 Apr 2026 17:49:01 +0200 Subject: [PATCH 2/5] Use JUnit version 5.12.2 due to JDK8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f012d37..937d274 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.21.2 1.18.44 3.8.4 - 6.0.3 + 5.12.2 From bda1f014b930ce5dbdecf66bae6d735a264c1ebc Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 2 Apr 2026 17:55:06 +0200 Subject: [PATCH 3/5] Update build action --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 462eddf..6f82e0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,10 @@ jobs: # Aerospike cluster for integration tests (https://github.com/reugn/github-action-aerospike) - name: Set up Aerospike Database - uses: reugn/github-action-aerospike@v1 + uses: aerospike/shared-workflows/.github/actions/setup-aerospike-server@334ad55b790658d549747b0d154407dfc730acca with: - server-version: 7.2.0.6 + oidc-provider: ${{ secrets.JFROG_OIDC_PROVIDER }} + oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }} # See: https://github.com/actions/cache/blob/master/examples.md#java---maven - name: Cache local Maven repository From 5d66ccbc4559fdbdfe58f163f1a09054bb3dfa41 Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 2 Apr 2026 17:57:10 +0200 Subject: [PATCH 4/5] Update permissions in build action --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f82e0b..2f9af2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,9 @@ name: Build project + +permissions: + id-token: write + contents: read + on: push: branches: From 46d2717fdf1e7ca525e1b892ba86a6604118c8fa Mon Sep 17 00:00:00 2001 From: Andrey G Date: Thu, 2 Apr 2026 17:58:22 +0200 Subject: [PATCH 5/5] Text cleanup --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f9af2d..39ad8ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,6 @@ jobs: distribution: 'temurin' java-version: 8 - # Aerospike cluster for integration tests (https://github.com/reugn/github-action-aerospike) - name: Set up Aerospike Database uses: aerospike/shared-workflows/.github/actions/setup-aerospike-server@334ad55b790658d549747b0d154407dfc730acca with: