Skip to content

Commit 405cd63

Browse files
committed
Update oss-parent (parent pom) dep to 41
1 parent c4b101a commit 405cd63

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.fasterxml</groupId>
55
<artifactId>oss-parent</artifactId>
6-
<version>38</version>
6+
<version>41</version>
77
</parent>
88
<groupId>com.fasterxml.util</groupId>
99
<artifactId>java-merge-sort</artifactId>
@@ -48,7 +48,7 @@
4848
<groupId>com.fasterxml.jackson</groupId>
4949
<artifactId>jackson-bom</artifactId>
5050
<type>pom</type>
51-
<version>2.9.9</version>
51+
<version>2.11.3</version>
5252
<scope>import</scope>
5353
</dependency>
5454
</dependencies>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>junit</groupId>
6161
<artifactId>junit</artifactId>
62-
<version>4.12</version>
62+
<version>${version.junit}</version>
6363
<scope>test</scope>
6464
</dependency>
6565

release-notes/VERSION

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
Project: java-merge-sort
22
License: Apache License 2.0
3-
Version: 1.0.2
4-
Release date: 2019-09-18
3+
Version:
4+
Release date:
55

6-
#16: Temp files that result from two-phase merge are not deleted
7-
(reported, fix contributed by John L)
8-
- Add `Automatic-Module-Name` of "com.fasterxml.sort"
6+
- Update `oss-parent` to 41 (for junit 4.13.1)
97

108
------------------------------------------------------------------------
119
=== History: ===
1210
------------------------------------------------------------------------
1311

12+
1.0.2 (2019-09-18)
13+
14+
#16: Temp files that result from two-phase merge are not deleted
15+
(reported, fix contributed by John L)
16+
- Add `Automatic-Module-Name` of "com.fasterxml.sort"
17+
1418
1.0.1 (2017-02-14)
1519

1620
#14: Long lines are corrupted when read by `RawTextLineReader._readNextSlow()`

0 commit comments

Comments
 (0)