Skip to content

Commit a7f74c9

Browse files
committed
...
1 parent 50f8352 commit a7f74c9

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

pom.xml

+9-20
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>com.fasterxml</groupId>
7-
<artifactId>oss-parent</artifactId>
8-
<version>12</version>
6+
<groupId>com.fasterxml.jackson</groupId>
7+
<artifactId>jackson-parent</artifactId>
8+
<version>2.4</version>
99
</parent>
1010

1111
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -28,9 +28,8 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
2828
</scm>
2929

3030
<properties>
31-
<jackson.version.annotations>2.4-SNAPSHOT</jackson.version.annotations>
32-
<jackson.version.core>2.4.0-SNAPSHOT</jackson.version.core>
33-
<jackson.version.jaxb>${jackson.version.core}</jackson.version.jaxb>
31+
<version.jackson.core>${project.version}</version.jackson.core>
32+
<version.jackson.jaxb>${version.jackson.core}</version.jackson.jaxb>
3433
<packageVersion.dir>com/fasterxml/jackson/dataformat/xml</packageVersion.dir>
3534
<packageVersion.package>${project.groupId}.xml</packageVersion.package>
3635

@@ -64,23 +63,23 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
6463
<dependency>
6564
<groupId>com.fasterxml.jackson.core</groupId>
6665
<artifactId>jackson-core</artifactId>
67-
<version>${jackson.version.core}</version>
66+
<version>${version.jackson.core}</version>
6867
</dependency>
6968
<dependency>
7069
<groupId>com.fasterxml.jackson.core</groupId>
7170
<artifactId>jackson-annotations</artifactId>
72-
<version>${jackson.version.annotations}</version>
71+
<version>${version.jackson.annotations}</version>
7372
</dependency>
7473
<dependency>
7574
<groupId>com.fasterxml.jackson.core</groupId>
7675
<artifactId>jackson-databind</artifactId>
77-
<version>${jackson.version.core}</version>
76+
<version>${version.jackson.core}</version>
7877
</dependency>
7978
<!-- JAXB annotation introspector is needed too? -->
8079
<dependency>
8180
<groupId>com.fasterxml.jackson.module</groupId>
8281
<artifactId>jackson-module-jaxb-annotations</artifactId>
83-
<version>${jackson.version.jaxb}</version>
82+
<version>${version.jackson.jaxb}</version>
8483
</dependency>
8584
<!-- JDK 1.6 provides stax-api (javax.xml.stream), but let's add this for documentation
8685
-->
@@ -112,16 +111,6 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
112111
<version>4.1.5</version>
113112
<scope>test</scope>
114113
</dependency>
115-
116-
117-
<!-- Test Dependencies -->
118-
119-
<dependency>
120-
<groupId>junit</groupId>
121-
<artifactId>junit</artifactId>
122-
<version>4.10</version>
123-
<scope>test</scope>
124-
</dependency>
125114
</dependencies>
126115

127116
<build>

release-notes/VERSION

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ Version: 2.4.0 (xx-xxx-2014)
55
=== History: ===
66
------------------------------------------------------------------------
77

8-
2.3.2 (xx-Feb-2014)
8+
2.3.2 (01-Mar-2014)
99

1010
#81: Serialization of a polymorphic class As.Property with Identity info doesn't work
1111
(fixed by Pascal G)
12-
-- NOTE! Depends on a related fix in `jackson-databind` 2.3.2
1312
#91: @JsonPropertyOrder not working correctly with attributes
1413
(reported by thrykol@github)
1514

16-
1715
2.3.1 (28-Dec-2013)
1816

1917
#84: Problem with @JacksonXmlText when property output is suppressed

0 commit comments

Comments
 (0)