Skip to content

Commit e6f1d5e

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.5'
Conflicts: jr-all/pom.xml jr-objects/pom.xml pom.xml release-notes/VERSION
2 parents de831bd + d4c889e commit e6f1d5e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>com.fasterxml.jackson</groupId>
55
<artifactId>jackson-parent</artifactId>
6-
<version>2.5</version>
6+
<version>2.5.1</version>
77
</parent>
88
<groupId>com.fasterxml.jackson.jr</groupId>
99
<artifactId>jackson-jr-parent</artifactId>

‎release-notes/VERSION

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Project: jackson-jr
88

99
- Minor performance optimizations, using new jackson-core 2.6 methods
1010

11+
2.5.3 (24-Apr-2015)
12+
2.5.2 (29-Mar-2015)
1113
2.5.1 (06-Feb-2015)
1214
2.5.0 (01-Jan-2015)
1315

0 commit comments

Comments
 (0)