Resolve conflicts

CHANGES.md

@@ -2,29 +2,13 @@ Changes by Version
 ==================
 Release Notes.
 
-9.3.0
+9.4.0
 ------------------
 
-* Remove `idleCount` tag in Alibaba Druid meter plugin.
-* Fix NPE in handleMethodException method of apm-jdk-threadpool-plugin.
-* Support for C3P0 connection pool tracing.
-* Use a daemon thread to flush logs.
-* Fix typos in `URLParser`.
-* Add support for `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc url format in `URLParser`.
-* Optimize spring-plugins:scheduled-annotation-plugin compatibility about Spring 6.1.x support.
-* Add a forceIgnoring mechanism in a CROSS_THREAD scenario.
-* Fix NPE in Redisson plugin since Redisson 3.20.0.
-* Support for showing batch command details and ignoring PING commands in Redisson plugin.
-* Fix peer value of Master-Slave mode in Redisson plugin.
-* Support for tracing the callbacks of asynchronous methods in elasticsearch-6.x-plugin/elasticsearch-7.x-plugin.
-* Fixed the invalid issue in the isInterface method in PluginFinder.
-* Fix the opentracing toolkit SPI config
-* Improve 4x performance of ContextManagerExtendService.createTraceContext()
-* Add a plugin that supports the Solon framework.
-* Fixed issues in the MySQL component where the executeBatch method could result in empty SQL statements .
+* Upgrade nats plugin to support 2.16.5
 * Add a plugin that supports the Spring JMS 5.x.
 
-All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/213?closed=1)
+All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1)
 
 ------------------
 Find change logs of all versions [here](changes).

docs/en/setup/service-agent/java-agent/Plugin-list.md

@@ -54,6 +54,7 @@
 - jetty-client-9.x
 - jetty-server-9.x
 - kafka-0.11.x/1.x/2.x
+- kafka-3.7.x
 - kotlin-coroutine
 - lettuce-5.x
 - light4j
@@ -161,7 +162,7 @@
 - hutool-http-5.x
 - micronaut-http-client-3.2.x-3.6.x
 - micronaut-http-server-3.2.x-3.6.x
-- nats-client-2.14.x-2.15.x
+- nats-client-2.14.x-2.16.5
 - impala-jdbc-2.6.x
 - jdk-forkjoinpool-plugin
 - jetty-thread-pool