Merge pull request #1638 from hanbingleixue/develop

Upgrading Open-Source Software Versions
sermant-io · Sep 30, 2024 · 1d65e26 · 1d65e26
2 parents 41390eb + a9fc80f
commit 1d65e26
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/sermant-agentcore/sermant-agentcore-implement/pom.xml b/sermant-agentcore/sermant-agentcore-implement/pom.xml
@@ -59,6 +59,7 @@
         <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <envoyproxy.controlplane.version>0.1.32</envoyproxy.controlplane.version>
         <micrometer.version>1.9.5</micrometer.version>
+        <simpleclient.version>0.16.0</simpleclient.version>
     </properties>
 
     <dependencies>
@@ -178,6 +179,17 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
             <version>${micrometer.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.prometheus</groupId>
+                    <artifactId>simpleclient_common</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient_common</artifactId>
+            <version>${simpleclient.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/sermant-backend/pom.xml b/sermant-backend/pom.xml
@@ -15,7 +15,7 @@
         <jdk.version>1.8</jdk.version>
         <spring-boot.version>2.7.18</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <io.netty.version>4.1.100.Final</io.netty.version>
+        <io.netty.version>4.1.108.Final</io.netty.version>
         <protobuf-java.version>3.19.6</protobuf-java.version>
         <lombok.version>1.18.22</lombok.version>
         <fastjson.version>1.2.83</fastjson.version>
@@ -30,8 +30,8 @@
         <expiringmap.version>0.5.8</expiringmap.version>
         <jackson-databind.version>2.13.4.2</jackson-databind.version>
         <aspectjweaver.version>1.8.4</aspectjweaver.version>
-        <tomcat-embed.version>9.0.86</tomcat-embed.version>
-        <spring-framework.version>5.3.33</spring-framework.version>
+        <tomcat-embed.version>9.0.95</tomcat-embed.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
         <nacos-client-version>2.2.1</nacos-client-version>
         <webapp.path>${project.basedir}/src/main/webapp/frontend</webapp.path>
     </properties>