This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch bumpup-deps
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 0ffb17ab024211c7916d828dad438de7768bda91
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Aug 20 09:37:53 2025 +0700
Dependencies Upgrades in compiling and e2e
* Bump up root parent apache pom to v30.
* Bump up agent-oap protocol to
latest(16c51358ebcf42629bf4ffdf952253971f20eb25).
* Bump up gRPC to v1.74.0.
* Bump up netty to v4.1.124.Final.
* Bump up GSON to v2.13.1.
* Bump up guava to v33.4.8.
* Bump up oap to the
10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e.
* Bump up cli to the
0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e.
---
CHANGES.md | 9 ++++++++-
apm-protocol/apm-network/src/main/proto | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 2 +-
dist-material/LICENSE | 10 +++++-----
pom.xml | 12 ++++++------
test/e2e/base/base-compose.yml | 2 +-
test/e2e/script/env | 2 +-
7 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index de2ded2867..6371204185 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,14 @@ Release Notes.
9.6.0
------------------
-
+* Bump up root parent apache pom to v30.
+* Bump up agent-oap protocol to
latest(16c51358ebcf42629bf4ffdf952253971f20eb25).
+* Bump up gRPC to v1.74.0.
+* Bump up netty to v4.1.124.Final.
+* Bump up GSON to v2.13.1.
+* Bump up guava to v33.4.8.
+* Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79)
in e2e.
+* Bump up cli to the
0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/242?closed=1)
diff --git a/apm-protocol/apm-network/src/main/proto
b/apm-protocol/apm-network/src/main/proto
index bd1f91f7e1..16c51358eb 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit bd1f91f7e1cb4de9d9b5ccb71f36ce6b1c7c97f5
+Subproject commit 16c51358ebcf42629bf4ffdf952253971f20eb25
diff --git a/apm-sniffer/apm-agent-core/pom.xml
b/apm-sniffer/apm-agent-core/pom.xml
index f4a7350214..d3565d7db3 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<generateGitPropertiesFilename>${project.build.outputDirectory}/skywalking-agent-version.properties</generateGitPropertiesFilename>
- <guava.version>32.0.1-jre</guava.version>
+ <guava.version>33.4.8-jre</guava.version>
<wiremock.version>2.6.0</wiremock.version>
<os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index e261fd20da..308c923b88 100755
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -216,12 +216,12 @@ The following components are provided under the Apache
License. See project link
The text of each license is the standard Apache 2.0 license.
raphw (byte-buddy) 1.17.6: http://bytebuddy.net/ , Apache 2.0
- Google: grpc-java 1.68.1: https://github.com/grpc/grpc-java, Apache 2.0
- Google: gson 2.8.9: https://github.com/google/gson , Apache 2.0
- Google: proto-google-common-protos 2.0.1:
https://github.com/googleapis/googleapis , Apache 2.0
+ Google: grpc-java 1.74.0: https://github.com/grpc/grpc-java, Apache 2.0
+ Google: gson 2.13.1: https://github.com/google/gson , Apache 2.0
+ Google: proto-google-common-protos 2.59.2:
https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.2:
http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom
, Apache 2.0
- Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0
- netty 4.1.115: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache
2.0
+ Google: guava 33.4.8: https://github.com/google/guava , Apache 2.0
+ netty 4.1.124: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache
2.0
async-profiler 3.0:
https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0
========================================================================
diff --git a/pom.xml b/pom.xml
index ebaa942c17..f8a705ffe3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>30</version>
<relativePath />
</parent>
@@ -87,14 +87,14 @@
<!-- core lib dependency -->
<bytebuddy.version>1.17.6</bytebuddy.version>
- <grpc.version>1.68.1</grpc.version>
- <netty.version>4.1.115.Final</netty.version>
- <gson.version>2.8.9</gson.version>
+ <grpc.version>1.74.0</grpc.version>
+ <netty.version>4.1.124.Final</netty.version>
+ <gson.version>2.13.1</gson.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<com.google.protobuf.protoc.version>3.25.5</com.google.protobuf.protoc.version>
-
<protoc-gen-grpc-java.plugin.version>1.68.1</protoc-gen-grpc-java.plugin.version>
-
<netty-tcnative-boringssl-static.version>2.0.48.Final</netty-tcnative-boringssl-static.version>
+
<protoc-gen-grpc-java.plugin.version>1.74.0</protoc-gen-grpc-java.plugin.version>
+
<netty-tcnative-boringssl-static.version>2.0.70.Final</netty-tcnative-boringssl-static.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<objenesis.version>3.1</objenesis.version>
<async-profiler.version>3.0</async-profiler.version>
diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml
index e6b4b70c4b..28aa37fa2e 100644
--- a/test/e2e/base/base-compose.yml
+++ b/test/e2e/base/base-compose.yml
@@ -18,7 +18,7 @@ version: '2.1'
services:
oap:
- image:
ghcr.io/apache/skywalking/oap:1730f2c84bbd4da999ec2c74d1c26db31d5a0d24
+ image:
ghcr.io/apache/skywalking/oap:dc8740d4757b35374283c4850a9a080e40f0eb79
expose:
- 11800
- 12800
diff --git a/test/e2e/script/env b/test/e2e/script/env
index e57ec37b21..5a16f80f0b 100644
--- a/test/e2e/script/env
+++ b/test/e2e/script/env
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SW_CTL_COMMIT=b90255132f916f53eb90955cc8a6445b03a4bec3
+SW_CTL_COMMIT=77b4c49e89c9c000278f44e62729d534f2ec842e
