Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hsweb-commons/hsweb-commons-crud/pom.xml
#	hsweb-concurrent/hsweb-concurrent-cache/pom.xml
zhou-hao 4 years ago
parent
commit
937e7ea57a
2 changed files with 4 additions and 3 deletions
  1. 2 2
      README.md
  2. 2 1
      hsweb-concurrent/hsweb-concurrent-cache/pom.xml

+ 2 - 2
README.md

@@ -27,8 +27,8 @@ com/hs-web/hsweb-framework)
 
 # 文档
 
-TODO
+直接看代码: https://github.com/zhou-hao/hsweb4-examples
 
 # 实践
 
-[JetLinks开源物联网平台](https://github.com/jetlinks)
+[JetLinks开源物联网平台](https://github.com/jetlinks)

+ 2 - 1
hsweb-concurrent/hsweb-concurrent-cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hsweb-concurrent</artifactId>
         <groupId>org.hswebframework.web</groupId>
-        <version>4.0.10-SNAPSHOT</version>
+        <version>4.0.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
             <optional>true</optional>
         </dependency>