Skip to content

Commit b1ac2bc

Browse files
committed
Merge branch '2.19'
2 parents 1be9994 + 163f423 commit b1ac2bc

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

avro/src/test/java/tools/jackson/dataformat/avro/interop/InteropTestBase.java

+12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.lang.reflect.Type;
77

88
import org.apache.avro.Schema;
9+
10+
import org.junit.Before;
911
import org.junit.runner.RunWith;
1012
import org.junit.runners.Parameterized;
1113

@@ -24,6 +26,16 @@ public enum DummyEnum {
2426
NORTH, SOUTH, EAST, WEST
2527
}
2628

29+
// see https://github.com/FasterXML/jackson-dataformats-binary/pull/539 for
30+
// explanation (need to allow-list Jackson test packages for Avro 1.11.4+)
31+
@Before
32+
public void init() {
33+
System.setProperty("org.apache.avro.SERIALIZABLE_PACKAGES",
34+
"java.lang,java.math,java.io,java.net,org.apache.avro.reflect," +
35+
// ^^^ These are default trusted packages by Avro 1.11.4
36+
InteropTestBase.class.getPackage().getName());
37+
}
38+
2739
/**
2840
* Helper method for building a {@link ParameterizedType} for use with <code>roundTrip(Type, Object)</code>
2941
*

release-notes/VERSION-2.x

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Active maintainers:
2626
(fix contributed by Michal F)
2727
#536: (avro) Add Logical Type support for `java.util.UUID`
2828
(contributed by Michal F)
29+
#539: (avro) Upgrade `org.apache.avro:avro` dependency to 1.11.4
2930

3031
2.18.3 (not yet released)
3132

@@ -38,7 +39,7 @@ No changes since 2.18.1
3839

3940
2.18.1 (28-Oct-2024)
4041

41-
#518: Should not read past end for CBOR string values
42+
#518: (cbor) Should not read past end for CBOR string values
4243
(contributed by Knut W)
4344

4445
2.18.0 (26-Sep-2024)

0 commit comments

Comments
 (0)