Skip to content

Commit

Permalink
Merge pull request #9 from citrusleaf/TOOLS-1888-update-log4j-to-2.15
Browse files Browse the repository at this point in the history
Tools 1888 update log4j to 2.15
  • Loading branch information
Jesse S authored Dec 14, 2021
2 parents f55e921 + 4d80291 commit e3c31f7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions build
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#! /usr/bin/env bash
# Build Java projects with Maven.
# Maven and Java must be installed prior to running this script.

Expand Down
8 changes: 8 additions & 0 deletions doc/releasenotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.aerospike</groupId>
<artifactId>aerospike-load</artifactId>
<version>2.3.5</version>
<version>2.4.1</version>
<name>Aerospike DSV Loader</name>
<packaging>jar</packaging>

Expand Down Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
<version>2.15.0</version>
</dependency>
<!-- junit -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml.orig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.aerospike</groupId>
<artifactId>aerospike-load</artifactId>
<version>2.3.5</version>
<version>2.4.1</version>
<name>Aerospike DSV Loader</name>
<packaging>jar</packaging>

Expand Down

0 comments on commit e3c31f7

Please sign in to comment.