Skip to content

Commit ede7c77

Browse files
committed
Fix #22: increase JDK baseline from Java 6 to Java 8
1 parent 341fc70 commit ede7c77

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<groupId>com.fasterxml</groupId>
55
<artifactId>oss-parent</artifactId>
6-
<version>41</version>
6+
<version>48</version>
77
</parent>
88
<groupId>com.fasterxml.util</groupId>
99
<artifactId>java-merge-sort</artifactId>
1010
<name>java-merge-sort</name>
11-
<version>1.0.3-SNAPSHOT</version>
11+
<version>1.1.0-SNAPSHOT</version>
1212
<packaging>bundle</packaging>
1313
<description>Basic configurable disk-backed N-way merge sort
1414
</description>
@@ -48,7 +48,7 @@
4848
<groupId>com.fasterxml.jackson</groupId>
4949
<artifactId>jackson-bom</artifactId>
5050
<type>pom</type>
51-
<version>2.11.3</version>
51+
<version>2.13.4</version>
5252
<scope>import</scope>
5353
</dependency>
5454
</dependencies>

release-notes/CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ Mathias Herberts (hbs@github)
1818
john lilley (wheezil@github)
1919
* Reported, contributed fix for #16: Temp files that result from two-phase merge are not deleted
2020
(1.0.2)
21+
22+
Jonathan Leitschuh (JLLeitschuh@github)
23+
* Contributed #21: Fix Temporary File Information Disclosure Vulnerability
24+
(1.1.0)

release-notes/VERSION

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
Project: java-merge-sort
22
License: Apache License 2.0
3-
Version:
4-
Release date:
5-
6-
- Update `oss-parent` to 41 (for junit 4.13.1)
3+
Version: 1.1.0
4+
Release date: 2022-11-19
75

86
------------------------------------------------------------------------
97
=== History: ===
108
------------------------------------------------------------------------
119

10+
1.1.0 (2022-11-19)
11+
12+
#21: Fix Temporary File Information Disclosure Vulnerability
13+
(contributed by Jonathan L)
14+
#22: Increase JDK baseline from Java 6 to Java 8
15+
- Update `oss-parent` to 48
16+
1217
1.0.2 (2019-09-18)
1318

1419
#16: Temp files that result from two-phase merge are not deleted

0 commit comments

Comments
 (0)