Skip to content

Commit 0440e6b

Browse files
Merge pull request #31 from qbicsoftware/hotfix/1.5.2
Hotfix 1.5.2
2 parents 30163c1 + d81cecb commit 0440e6b

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
java-version: 1.8
4646
settings-path: ${{ github.workspace }}
4747

48+
- name: Load local Maven repository cache
49+
uses: actions/cache@v2
50+
with:
51+
path: ~/.m2/repository
52+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
53+
restore-keys: |
54+
${{ runner.os }}-maven-
4855
4956
# Initializes the CodeQL tools for scanning.
5057
- name: Initialize CodeQL

CHANGELOG.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ Changelog
44

55
This project adheres to `Semantic Versioning <https://semver.org/>`_.
66

7+
1.5.2
8+
-----
9+
10+
**Added**
11+
12+
**Fixed**
13+
14+
* CVE-2021-45046
15+
16+
**Dependencies**
17+
18+
* ``org.apache.logging.log4j:log4j-core:2.15.0`` -> ``2.16.0``
19+
* ``org.apache.logging.log4j:log4j-api:2.15.0`` -> ``2.16.0``
20+
21+
**Deprecated**
22+
23+
724
1.5.1
825
-----
926

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<version>1.4.0</version>
1010
</parent>
1111
<artifactId>barcode-dragon-portlet</artifactId>
12-
<version>1.5.1</version>
12+
<version>1.5.2</version>
1313
<name>Barcode Dragon Portlet</name>
1414
<url>https://github.com/qbicsoftware/barcode-dragon-portlet</url>
1515
<description>Portlet which allows the creation of printable sample sheets with barcodes for customers.</description>
1616
<packaging>war</packaging>
1717
<properties>
18-
<log4j.version>2.15.0</log4j.version>
18+
<log4j.version>2.16.0</log4j.version>
1919
</properties>
2020
<!-- we only need to tell maven where to find our parent pom and other QBiC
2121
dependencies -->

0 commit comments

Comments
 (0)