From df4055290b56d8eb22b2fc631266bf182e974dce Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Mon, 13 Dec 2021 16:38:51 -0800 Subject: [PATCH 1/2] chore: Update log4j to 2.15 --- README.md | 2 +- doc/releasenotes.md | 8 ++++++++ pom.xml | 6 +++--- pom.xml.orig | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 11a6844..931b627 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Following dependencies are downloaded automatically: * Aerospike Java client 4.3.0 or greater * Apache commons cli 1.2 -* Log4j 2.11.1 +* Log4j 2.15.0 * Junit 4.4 * Json-simple 1.1.1 diff --git a/doc/releasenotes.md b/doc/releasenotes.md index 9e5b3d0..d9b594c 100644 --- a/doc/releasenotes.md +++ b/doc/releasenotes.md @@ -44,3 +44,11 @@ - Fixed data upload counters. - Fix docs related to json/geojson spec. - Fix examples for GeoJSON object. + +## Aerospike Loader [2.4] Release Date [19 Oct 2021] +### New features: +- Add shebang to run_loader script to allow execution from non-bash based shells. + +## Aerospike Loader [2.4.1] Release Date [13 Dec 2021] +### Fix/Changes: +- Update log4j to version 2.15.0. diff --git a/pom.xml b/pom.xml index 7d60a25..bf718cc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.aerospike aerospike-load - 2.3.5 + 2.4.1 Aerospike DSV Loader jar @@ -44,12 +44,12 @@ org.apache.logging.log4j log4j-api - 2.11.1 + 2.15.0 org.apache.logging.log4j log4j-core - 2.11.1 + 2.15.0 diff --git a/pom.xml.orig b/pom.xml.orig index 6662c5f..abecd4e 100644 --- a/pom.xml.orig +++ b/pom.xml.orig @@ -3,7 +3,7 @@ 4.0.0 com.aerospike aerospike-load - 2.3.5 + 2.4.1 Aerospike DSV Loader jar From 4d8029121ac5a58c6beaf1c04531cc7a850fee49 Mon Sep 17 00:00:00 2001 From: Jesse Schmidt Date: Mon, 13 Dec 2021 16:39:13 -0800 Subject: [PATCH 2/2] fix: Add shebang to support non-bash based shells --- build | 1 + 1 file changed, 1 insertion(+) diff --git a/build b/build index 9ba2bca..9591a23 100755 --- a/build +++ b/build @@ -1,3 +1,4 @@ +#! /usr/bin/env bash # Build Java projects with Maven. # Maven and Java must be installed prior to running this script.