Skip to content

Commit ef06772

Browse files
committed
Create 2.11 branch
1 parent 148e93c commit ef06772

File tree

11 files changed

+13
-45
lines changed

11 files changed

+13
-45
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
language: java
22

33
jdk:
4-
- openjdk7
54
- openjdk8
5+
- openjdk11
66

77
# whitelist
88
branches:
99
only:
1010
- master
11-
- "2.9"
11+
- "2.11"
1212

1313
env:
1414
global:

avro/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.fasterxml.jackson.dataformat</groupId>
66
<artifactId>jackson-dataformats-binary</artifactId>
7-
<version>2.10.1-SNAPSHOT</version>
7+
<version>2.11.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>jackson-dataformat-avro</artifactId>
1010
<name>Jackson dataformat: Avro</name>

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,6 @@ public final void writeFieldName(SerializableString name)
300300
_avroContext.writeFieldName(name.getValue());
301301
}
302302

303-
@Override
304-
public final void writeStringField(String fieldName, String value)
305-
throws IOException
306-
{
307-
_avroContext.writeFieldName(fieldName);
308-
writeString(value);
309-
}
310-
311303
/*
312304
/**********************************************************
313305
/* Public API: low-level I/O

cbor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.fasterxml.jackson.dataformat</groupId>
66
<artifactId>jackson-dataformats-binary</artifactId>
7-
<version>2.10.1-SNAPSHOT</version>
7+
<version>2.11.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>jackson-dataformat-cbor</artifactId>
1010
<name>Jackson dataformat: CBOR</name>

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -468,23 +468,6 @@ public final void writeFieldId(long id) throws IOException {
468468
_writeNumberNoCheck(id);
469469
}
470470

471-
@Override
472-
public final void writeStringField(String fieldName, String value)
473-
throws IOException
474-
{
475-
if (!_cborContext.writeFieldName(fieldName)) {
476-
_reportError("Can not write a field name, expecting a value");
477-
}
478-
_writeString(fieldName);
479-
// inlined from 'writeString()'
480-
if (value == null) {
481-
writeNull();
482-
return;
483-
}
484-
_verifyValueWrite("write String value");
485-
_writeString(value);
486-
}
487-
488471
/*
489472
/**********************************************************
490473
/* Overridden methods, copying with tag-awareness

ion/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.fasterxml.jackson.dataformat</groupId>
66
<artifactId>jackson-dataformats-binary</artifactId>
7-
<version>2.10.1-SNAPSHOT</version>
7+
<version>2.11.0-SNAPSHOT</version>
88
</parent>
99
<groupId>com.fasterxml.jackson.dataformat</groupId>
1010
<artifactId>jackson-dataformat-ion</artifactId>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<groupId>com.fasterxml.jackson</groupId>
55
<artifactId>jackson-base</artifactId>
6-
<version>2.10.0</version>
6+
<version>2.11.0-SNAPSHOT</version>
77
</parent>
88
<groupId>com.fasterxml.jackson.dataformat</groupId>
99
<artifactId>jackson-dataformats-binary</artifactId>
1010
<name>Jackson dataformats: Binary</name>
11-
<version>2.10.1-SNAPSHOT</version>
11+
<version>2.11.0-SNAPSHOT</version>
1212
<packaging>pom</packaging>
1313
<description>Parent pom for Jackson binary dataformats.
1414
</description>

protobuf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.fasterxml.jackson.dataformat</groupId>
66
<artifactId>jackson-dataformats-binary</artifactId>
7-
<version>2.10.1-SNAPSHOT</version>
7+
<version>2.11.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>jackson-dataformat-protobuf</artifactId>
1010
<name>Jackson dataformat: protobuf</name>

release-notes/VERSION-2.x

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Project: jackson-datatypes-binaryModules:
88
=== Releases ===
99
------------------------------------------------------------------------
1010

11+
2.11.0 (not yet released)
12+
13+
-
14+
1115
2.10.0 (26-Sep-2019)
1216

1317
#139: (cbor) Incorrect decimal fraction representation

smile/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.fasterxml.jackson.dataformat</groupId>
66
<artifactId>jackson-dataformats-binary</artifactId>
7-
<version>2.10.1-SNAPSHOT</version>
7+
<version>2.11.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>jackson-dataformat-smile</artifactId>
1010
<name>Jackson dataformat: Smile</name>

0 commit comments

Comments
 (0)