Skip to content

[fix][sec] Upgrade avro to 1.12.2 #24992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lhotari wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

[fix][sec] Upgrade avro to 1.12.2 #24992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b6b16f
[fix][sec] Upgrade avro to 1.12.1
lhotari May 15, 2026
75f7ff7
Protobuf schema now contains a default for enum types
lhotari May 15, 2026
3c5118c
upgrade to avro 1.12.2
lhotari May 15, 2026
2e72754
Add system property required by avro tests
lhotari May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build-logic/conventions/src/main/kotlin/pulsar.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ tasks.withType<Test>().configureEach {
"-Dpulsar.allocator.out_of_memory_policy=FallbackToHeap",
"-Dpulsar.test.preventExit=true",
)
// Avro 1.12.1+ makes Avro serialization strict
systemProperty("org.apache.avro.SERIALIZABLE_CLASSES", "java.math.BigDecimal,java.math.BigInteger,java.net.URI,java.net.URL,java.io.File,java.lang.Integer")
}

// Expose test classes for cross-module test dependencies (Maven test-jar equivalent)
Expand Down
4 changes: 2 additions & 2 deletions distribution/server/src/assemble/LICENSE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ The Apache Software License, Version 2.0
* zt-zip
- org.zeroturnaround-zt-zip-1.17.jar
* Apache Avro
- org.apache.avro-avro-1.12.0.jar
- org.apache.avro-avro-protobuf-1.12.0.jar
- org.apache.avro-avro-1.12.2.jar
- org.apache.avro-avro-protobuf-1.12.2.jar
* Apache Curator
- org.apache.curator-curator-client-5.7.1.jar
- org.apache.curator-curator-framework-5.7.1.jar
Expand Down
4 changes: 2 additions & 2 deletions distribution/shell/src/assemble/LICENSE.bin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@ The Apache Software License, Version 2.0
* Google Error Prone Annotations - error_prone_annotations-2.45.0.jar
* Javassist -- javassist-3.25.0-GA.jar
* Apache Avro
- avro-1.12.0.jar
- avro-protobuf-1.12.0.jar
- avro-1.12.2.jar
- avro-protobuf-1.12.2.jar
* RE2j -- re2j-1.8.jar
* Spotify completable-futures -- completable-futures-0.3.6.jar
* RoaringBitmap -- RoaringBitmap-1.6.9.jar
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ bouncycastle-bcpkix-fips = "2.0.11"
bouncycastle-bcutil-fips = "2.0.6"
bouncycastle-bc-fips = "2.0.1"
# Serialization
avro = "1.12.0"
avro = "1.12.2"
gson = "2.13.2"
snakeyaml = "2.0"
# Vert.x
Expand Down
9 changes: 5 additions & 4 deletions pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import lombok.CustomLog;
import org.apache.avro.Schema;
import org.apache.pulsar.common.schema.SchemaType;
import org.json.JSONException;
import org.skyscreamer.jsonassert.JSONAssert;
import org.testng.Assert;
import org.testng.annotations.Test;

Expand All @@ -51,7 +53,7 @@ public class ProtobufSchemaTest {
+ "\"avro.java.string\":\"String\"},\"default\":\"\"},{\"name\":\"doubleField\","
+ "\"type\":\"double\",\"default\":0.0},{\"name\":\"intField\",\"type\":\"int\","
+ "\"default\":0},{\"name\":\"testEnum\",\"type\":{\"type\":\"enum\","
+ "\"name\":\"TestEnum\",\"symbols\":[\"SHARED\",\"FAILOVER\"]},"
+ "\"name\":\"TestEnum\",\"symbols\":[\"SHARED\",\"FAILOVER\"],\"default\":\"SHARED\"},"
+ "\"default\":\"SHARED\"},{\"name\":\"nestedField\","
+ "\"type\":[\"null\",{\"type\":\"record\",\"name\":\"SubMessage\","
+ "\"fields\":[{\"name\":\"foo\",\"type\":{\"type\":\"string\","
Expand Down Expand Up @@ -136,7 +138,7 @@ public void testSchemaApiSupportsMessageBound() {
}

@Test
public void testSchema() {
public void testSchema() throws JSONException {
ProtobufSchema<org.apache.pulsar.client.schema.proto.Test.TestMessage> protobufSchema =
ProtobufSchema.of(org.apache.pulsar.client.schema.proto.Test.TestMessage.class);

Expand All @@ -145,8 +147,7 @@ public void testSchema() {
String schemaJson = new String(protobufSchema.getSchemaInfo().getSchema());
Schema.Parser parser = new Schema.Parser();
Schema schema = parser.parse(schemaJson);

Assert.assertEquals(schema.toString(), EXPECTED_SCHEMA_JSON);
JSONAssert.assertEquals(schema.toString(), EXPECTED_SCHEMA_JSON, false);
}

@Test
Expand Down
Loading