Merge branch 'v1.5' into master

babysor · Nov 25, 2020 · 2543618 · 2543618
2 parents e43ce4f + f4a3900
commit 2543618
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,11 +6,11 @@ ARG MS_VERSION=dev
 
 RUN mkdir -p /opt/apps && mkdir -p /opt/jmeter
 
-COPY backend/target/backend-1.4.jar /opt/apps
+COPY backend/target/backend-1.5.jar /opt/apps
 
 COPY backend/target/classes/jmeter/ /opt/jmeter/
 
-ENV JAVA_APP_JAR=/opt/apps/backend-1.4.jar
+ENV JAVA_APP_JAR=/opt/apps/backend-1.5.jar
 
 ENV AB_OFF=true
 

diff --git a/README-EN.md b/README-EN.md
@@ -17,8 +17,8 @@ MeterSphere is a one-stop open-source enterprise-class continuous testing platfo
 Only need two steps to install MeterSphere：
 
 What you need:
- 1. Prepare a 64-bit Linux host with no less than 8 G RAM
- 2. Log into root user and execute the command down below to install MeterSphere
+1.  Prepare a 64-bit Linux host with no less than 8 G RAM
+2.  Log into root user and execute the command down below to install MeterSphere
 
 ```sh
 curl -sSL https://github.com/metersphere/metersphere/releases/latest/download/quick_start.sh | sh

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>metersphere-server</artifactId>
         <groupId>io.metersphere</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>metersphere-server</artifactId>
     <groupId>io.metersphere</groupId>
-    <version>1.4</version>
+    <version>1.5</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -157,7 +157,7 @@ export class Test extends BaseConfig {
   constructor(options) {
     super();
     this.type = "MS API CONFIG";
-    this.version = '1.4.0';
+    this.version = '1.5.0';
     this.id = uuid();
     this.name = undefined;
     this.projectId = undefined;

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.metersphere</groupId>
     <artifactId>metersphere-server</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
     <packaging>pom</packaging>
 
     <parent>