Merge pull request #82 from getrebuild/fix-1.6.1

bugfix
getrebuild · Nov 1, 2019 · 6420491 · 6420491
2 parents ecb45ab + c1fec07
commit 6420491
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 68 deletions.
diff --git a/.production/package-lock.json b/.production/package-lock.json
diff --git a/.production/package.json b/.production/package.json
@@ -31,6 +31,7 @@
         "rev-hash": "^2.0.0",
         "clean-css": "^4.2.1",
         "set-value": ">=2.0.1",
-        "mixin-deep": ">=1.3.2"
+        "mixin-deep": ">=1.3.2",
+        "lodash.template": ">=4.5.0"
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>com.rebuild</groupId>
 	<artifactId>rebuild</artifactId>
 	<packaging>war</packaging>
-	<version>1.6.0</version>
+	<version>1.6.1</version>
 	<name>rebuild</name>
 	<description>Building your business-systems free!</description>
 	<url>https://getrebuild.com/</url>
@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>com.github.devezhao</groupId>
 			<artifactId>persist4j</artifactId>
-			<version>5eecbb189a</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -261,13 +261,6 @@
 			<artifactId>EasyCaptcha</artifactId>
 			<version>1.5.0</version>
 		</dependency>
-		<!--
-		<dependency>
-			<groupId>com.github.stuxuhai</groupId>
-			<artifactId>jpinyin</artifactId>
-			<version>1.1.8</version>
-		</dependency>
-		-->
 		<dependency>
 			<groupId>eu.bitwalker</groupId>
 			<artifactId>UserAgentUtils</artifactId>
@@ -298,18 +291,6 @@
 			<artifactId>okhttp</artifactId>
 			<version>4.0.1</version>
 		</dependency>
-		<!--
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-redis</artifactId>
-			<version>2.1.2.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>140</version>
-		</dependency>
-		-->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>easyexcel</artifactId>