Skip to content

Commit 6cf9618

Browse files
committed
Merge branch '2.5' of github.com:FasterXML/jackson-module-jsonSchema into 2.5
Conflicts: release-notes/VERSION
2 parents 92e8e67 + 491e51c commit 6cf9618

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.fasterxml.jackson.module</groupId>
99
<artifactId>jackson-module-jsonSchema</artifactId>
1010
<name>jackson-module-jsonSchema</name>
11-
<version>2.5.1-SNAPSHOT</version>
11+
<version>2.5.2-SNAPSHOT</version>
1212
<packaging>bundle</packaging>
1313
<description>Add-on module for Jackson (http://jackson.codehaus.org) to support
1414
JSON Schema (http://tools.ietf.org/html/draft-zyp-json-schema-03) version 3 generation.
@@ -34,7 +34,7 @@ JSON Schema (http://tools.ietf.org/html/draft-zyp-json-schema-03) version 3 gene
3434
</developers>
3535
<properties>
3636
<version.jackson.annotations>2.5.0</version.jackson.annotations>
37-
<version.jackson.core>2.5.0</version.jackson.core>
37+
<version.jackson.core>2.5.1</version.jackson.core>
3838

3939
<osgi.export>${project.groupId}.jsonSchema.*</osgi.export>
4040
</properties>

release-notes/VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Project: jackson-module-jsonSchema
44
=== Releases ===
55
------------------------------------------------------------------------
66

7-
2.5.1 (not yet released)
7+
2.5.1 (06-Feb-2015)
88

9-
...
9+
No changes since 2.5.0
1010

1111
2.5.0 (01-Jan-2015)
1212

0 commit comments

Comments
 (0)