You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2022/01/05 01:16:02 UTC
[rocketmq-dashboard] branch master updated: [ISSUE #60]Update SpringBoot version. (#61)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 8acd94c [ISSUE #60]Update SpringBoot version. (#61)
8acd94c is described below
commit 8acd94c89aa1b8c3e9b1b425cc516ac31f049d14
Author: zhangjidi2016 <10...@qq.com>
AuthorDate: Wed Jan 5 09:15:55 2022 +0800
[ISSUE #60]Update SpringBoot version. (#61)
---
pom.xml | 20 +++++++++++++++++++-
.../controller/DlqMessageControllerTest.java | 4 ++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b2a7c52..e318d92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,13 @@
<lombok.version>1.18.12</lombok.version>
<main.basedir>${basedir}/../..</main.basedir>
<docker.image.prefix>apacherocketmq</docker.image.prefix>
- <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
+ <spring.boot.version>2.6.0</spring.boot.version>
<mockito-inline.version>3.3.3</mockito-inline.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<commons-pool2.version>2.4.3</commons-pool2.version>
<easyexcel.version>2.2.10</easyexcel.version>
<asm.version>4.2</asm.version>
+ <junit.version>4.12</junit.version>
</properties>
<dependencies>
@@ -125,6 +126,17 @@
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -246,6 +258,12 @@
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java b/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
index 767881a..482b314 100644
--- a/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
+++ b/src/test/java/org/apache/rocketmq/dashboard/controller/DlqMessageControllerTest.java
@@ -132,7 +132,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
// 2、export dlqMessage success
perform = mockMvc.perform(requestBuilder);
perform.andExpect(status().is(200))
- .andExpect(content().contentType("application/vnd.ms-excel"));
+ .andExpect(content().contentType("application/vnd.ms-excel;charset=utf-8"));
}
@@ -169,7 +169,7 @@ public class DlqMessageControllerTest extends BaseControllerTest {
requestBuilder.content(JSON.toJSONString(dlqMessages));
perform = mockMvc.perform(requestBuilder);
perform.andExpect(status().is(200))
- .andExpect(content().contentType("application/vnd.ms-excel"));
+ .andExpect(content().contentType("application/vnd.ms-excel;charset=utf-8"));
}
@Override protected Object getTestController() {