Skip to content

Commit 1d65e26

Browse files
authored
Merge pull request #1638 from hanbingleixue/develop
Upgrading Open-Source Software Versions
2 parents 41390eb + a9fc80f commit 1d65e26

File tree

2 files changed

+15
-3
lines changed
  • sermant-agentcore/sermant-agentcore-implement
  • sermant-backend

2 files changed

+15
-3
lines changed

sermant-agentcore/sermant-agentcore-implement/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<jackson-databind.version>2.13.4.2</jackson-databind.version>
6060
<envoyproxy.controlplane.version>0.1.32</envoyproxy.controlplane.version>
6161
<micrometer.version>1.9.5</micrometer.version>
62+
<simpleclient.version>0.16.0</simpleclient.version>
6263
</properties>
6364

6465
<dependencies>
@@ -178,6 +179,17 @@
178179
<groupId>io.micrometer</groupId>
179180
<artifactId>micrometer-registry-prometheus</artifactId>
180181
<version>${micrometer.version}</version>
182+
<exclusions>
183+
<exclusion>
184+
<groupId>io.prometheus</groupId>
185+
<artifactId>simpleclient_common</artifactId>
186+
</exclusion>
187+
</exclusions>
188+
</dependency>
189+
<dependency>
190+
<groupId>io.prometheus</groupId>
191+
<artifactId>simpleclient_common</artifactId>
192+
<version>${simpleclient.version}</version>
181193
</dependency>
182194
<dependency>
183195
<groupId>junit</groupId>

sermant-backend/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<jdk.version>1.8</jdk.version>
1616
<spring-boot.version>2.7.18</spring-boot.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<io.netty.version>4.1.100.Final</io.netty.version>
18+
<io.netty.version>4.1.108.Final</io.netty.version>
1919
<protobuf-java.version>3.19.6</protobuf-java.version>
2020
<lombok.version>1.18.22</lombok.version>
2121
<fastjson.version>1.2.83</fastjson.version>
@@ -30,8 +30,8 @@
3030
<expiringmap.version>0.5.8</expiringmap.version>
3131
<jackson-databind.version>2.13.4.2</jackson-databind.version>
3232
<aspectjweaver.version>1.8.4</aspectjweaver.version>
33-
<tomcat-embed.version>9.0.86</tomcat-embed.version>
34-
<spring-framework.version>5.3.33</spring-framework.version>
33+
<tomcat-embed.version>9.0.95</tomcat-embed.version>
34+
<spring-framework.version>5.3.39</spring-framework.version>
3535
<nacos-client-version>2.2.1</nacos-client-version>
3636
<webapp.path>${project.basedir}/src/main/webapp/frontend</webapp.path>
3737
</properties>

0 commit comments

Comments
 (0)