Skip to content

Commit d62e6f5

Browse files
committed
Merge branch '2.21' into 2.x
2 parents 34e8ac0 + 781dbcc commit d62e6f5

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ protected JsonMappingException _invalidSchemaDefinition(JavaType type,
232232
public AvroSchema schemaFrom(InputStream in) throws IOException
233233
{
234234
try {
235-
return new AvroSchema(new Schema.Parser().setValidate(true)
235+
return new AvroSchema(new Schema.Parser()
236236
.parse(in));
237237
} finally {
238238
in.close();
@@ -249,7 +249,7 @@ public AvroSchema schemaFrom(InputStream in) throws IOException
249249
*/
250250
public AvroSchema schemaFrom(String schemaAsString) throws IOException
251251
{
252-
return new AvroSchema(new Schema.Parser().setValidate(true)
252+
return new AvroSchema(new Schema.Parser()
253253
.parse(schemaAsString));
254254
}
255255

@@ -263,7 +263,7 @@ public AvroSchema schemaFrom(String schemaAsString) throws IOException
263263
*/
264264
public AvroSchema schemaFrom(File schemaFile) throws IOException
265265
{
266-
return new AvroSchema(new Schema.Parser().setValidate(true)
266+
return new AvroSchema(new Schema.Parser()
267267
.parse(schemaFile));
268268
}
269269
}

avro/src/test/java/perf/PerfBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected GenericRecord itemToRecord(MediaItem item) throws IOException
137137
}
138138

139139
protected static AvroSchema itemSchema() {
140-
return new AvroSchema(new Schema.Parser().setValidate(true).parse(JVM_SERIALIZERS_SCHEMA_STR));
140+
return new AvroSchema(new Schema.Parser().parse(JVM_SERIALIZERS_SCHEMA_STR));
141141
}
142142

143143
protected static MediaItem buildItem()

release-notes/VERSION-2.x

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ Active maintainers:
1414
=== Releases ===
1515
------------------------------------------------------------------------
1616

17+
2.21.1 (not yet released)
18+
19+
#645: (avro) Remove use of Avro `Schema.Parser().setValidate()` to allow
20+
use of Avro core 1.12.1 (2.x)
21+
1722
2.21.0 (18-Jan-2026)
1823

1924
#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
@@ -24,7 +29,7 @@ Active maintainers:
2429
(reported by Josh C)
2530
- (avro) Upgrade `avro` lib dep to 1.11.5 (from 1.11.4)
2631

27-
2.20.2 (not yet released)
32+
2.20.2 (19-Jan-2026)
2833

2934
#640: (cbor) CBOR throws ArrayIndexOutOfBoundsException with long ASCII text
3035
(reported, fix contributed by Manuel S)

0 commit comments

Comments
 (0)