Bump up protobuf java dependencies to 3.25.5

apache · Sep 23, 2024 · 83469ee · 83469ee
1 parent 7288694
commit 83469ee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
@@ -388,8 +388,8 @@ BSD-3-Clause licenses
 The following components are provided under the BSD-3-Clause License. See project link for details.
 The text of each license is also included in licenses/LICENSE-[project].txt.
 
-    https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/3.25.1 BSD-3-Clause
-    https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util/3.25.1 BSD-3-Clause
+    https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/3.25.5 BSD-3-Clause
+    https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java-util/3.25.5 BSD-3-Clause
     https://npmjs.com/package/d3-collection/v/1.0.7 1.0.7 BSD-3-Clause
     https://npmjs.com/package/d3-ease/v/3.0.1 3.0.1 BSD-3-Clause
     https://npmjs.com/package/d3-tip/node_modules/d3-selection/v/1.4.2 1.4.2 BSD-3-Clause

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -68,6 +68,7 @@
 * Adapt BanyanDB Java Client 0.7.0-rc3.
 * Add SkyWalking Java Agent self observability dashboard.
 * Add Component ID(5022) for the GoFrame framework.
+* Bump up protobuf java dependencies to 3.25.5.
 
 #### UI
 

diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
@@ -41,8 +41,8 @@
         <zookeeper.version>3.5.7</zookeeper.version>
         <guava.version>32.0.1-jre</guava.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <protobuf-java.version>3.25.1</protobuf-java.version>
-        <protobuf-java-util.version>3.25.1</protobuf-java-util.version>
+        <protobuf-java.version>3.25.5</protobuf-java.version>
+        <protobuf-java-util.version>3.25.5</protobuf-java-util.version>
         <commons-codec.version>1.11</commons-codec.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-io.version>2.7</commons-io.version>

diff --git a/...h-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Mappings.java b/...h-client/src/main/java/org/apache/skywalking/library/elasticsearch/response/Mappings.java
@@ -44,11 +44,13 @@ public final class Mappings {
 
     @Getter
     @Setter
+    @Builder.Default
     private Map<String, Object> properties = new HashMap<>();
 
     @JsonProperty("_source")
     @Getter
     @Setter
+    @Builder.Default
     private Source source = new Source();
 
     @EqualsAndHashCode