Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
name: Build project

permissions:
id-token: write
contents: read

on:
push:
branches:
Expand All @@ -22,11 +27,11 @@ jobs:
distribution: 'temurin'
java-version: 8

# 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
Expand Down
59 changes: 30 additions & 29 deletions .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
26 changes: 13 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.aerospike</groupId>
<artifactId>java-object-mapper</artifactId>
<version>2.6.0</version>
<version>2.7.0</version>
<packaging>jar</packaging>

<name>Aerospike Object Mapper</name>
Expand All @@ -27,16 +27,16 @@
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
<maven-central-publishing-plugin.version>0.8.0</maven-central-publishing-plugin.version>
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
<aerospike-client-jdk8.version>9.0.5</aerospike-client-jdk8.version>
<aerospike-reactor.version>9.0.5</aerospike-reactor.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<maven-central-publishing-plugin.version>0.10.0</maven-central-publishing-plugin.version>
<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
<aerospike-client-jdk8.version>10.0.0</aerospike-client-jdk8.version>
<aerospike-reactor.version>10.0.0</aerospike-reactor.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<snakeyaml.version>2.6</snakeyaml.version>
<jackson-databind.version>2.21.2</jackson-databind.version>
<lombok.version>1.18.38</lombok.version>
<reactor-test.version>3.7.7</reactor-test.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version>
<lombok.version>1.18.44</lombok.version>
<reactor-test.version>3.8.4</reactor-test.version>
<junit-jupiter.version>5.12.2</junit-jupiter.version>
</properties>

<licenses>
Expand Down Expand Up @@ -75,11 +75,11 @@
</distributionManagement>

<dependencies>
<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
<!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${javax.validation-api.version}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jakarta.validation-api.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/com.aerospike/aerospike-client -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/aerospike/mapper/tools/AeroMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/aerospike/mapper/tools/ClassCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/aerospike/mapper/tools/IAeroMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/aerospike/mapper/tools/ValueType.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<E> extends BaseVirtualList<E> implements IReactiveVirtualList<E> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<E> extends BaseVirtualList<E> implements IVirtualList<E> {
Expand Down
Loading