From d1940b148ee8ca9a1e2f231bcf53015f62ba1827 Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Fri, 28 Sep 2018 09:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96javax.el=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/hswebframework/web/authorization/AuthorizeTests.java | 0
 .../web/authorization/RedisUserTokenManagerTests.java        | 0
 .../hswebframework/web/authorization/TestApplication.java    | 0
 .../basic/embed/EmbedAuthenticationManagerTest.groovy        | 0
 .../web/authorization/basic/handler/TestController.java      | 0
 .../basic/handler/UserAllowPermissionHandlerTest.groovy      | 0
 .../hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml      | 5 ++---
 .../hsweb-commons-service-simple/pom.xml                     | 5 ++---
 .../web/authorization/starter/TestApplication.java           | 0
 .../authorization/starter/UserSettingControllerTest.groovy   | 0
 .../hsweb-system-dynamic-form-local/pom.xml                  | 5 ++---
 hsweb-tests/pom.xml                                          | 5 ++---
 12 files changed, 8 insertions(+), 12 deletions(-)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/AuthorizeTests.java (100%)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/RedisUserTokenManagerTests.java (100%)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/TestApplication.java (100%)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/basic/embed/EmbedAuthenticationManagerTest.groovy (100%)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/basic/handler/TestController.java (100%)
 rename hsweb-authorization/hsweb-authorization-basic/src/test/{java => groovy}/org/hswebframework/web/authorization/basic/handler/UserAllowPermissionHandlerTest.groovy (100%)
 rename hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/{java => groovy}/org/hswebframework/web/authorization/starter/TestApplication.java (100%)
 rename hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/{java => groovy}/org/hswebframework/web/authorization/starter/UserSettingControllerTest.groovy (100%)

diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/AuthorizeTests.java b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/AuthorizeTests.java
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/AuthorizeTests.java
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/AuthorizeTests.java
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/RedisUserTokenManagerTests.java b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/RedisUserTokenManagerTests.java
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/RedisUserTokenManagerTests.java
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/RedisUserTokenManagerTests.java
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/TestApplication.java b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/TestApplication.java
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/TestApplication.java
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/TestApplication.java
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/embed/EmbedAuthenticationManagerTest.groovy b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/embed/EmbedAuthenticationManagerTest.groovy
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/embed/EmbedAuthenticationManagerTest.groovy
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/embed/EmbedAuthenticationManagerTest.groovy
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/handler/TestController.java b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/handler/TestController.java
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/handler/TestController.java
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/handler/TestController.java
diff --git a/hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/handler/UserAllowPermissionHandlerTest.groovy b/hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/handler/UserAllowPermissionHandlerTest.groovy
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-basic/src/test/java/org/hswebframework/web/authorization/basic/handler/UserAllowPermissionHandlerTest.groovy
rename to hsweb-authorization/hsweb-authorization-basic/src/test/groovy/org/hswebframework/web/authorization/basic/handler/UserAllowPermissionHandlerTest.groovy
diff --git a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml
index 6f0e81b9b..f459d6196 100644
--- a/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml
+++ b/hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml
@@ -84,9 +84,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>2.2</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml
index b563be1ac..3e6065cb0 100644
--- a/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml
+++ b/hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml
@@ -61,9 +61,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/authorization/starter/TestApplication.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/groovy/org/hswebframework/web/authorization/starter/TestApplication.java
similarity index 100%
rename from hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/authorization/starter/TestApplication.java
rename to hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/groovy/org/hswebframework/web/authorization/starter/TestApplication.java
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/authorization/starter/UserSettingControllerTest.groovy b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/groovy/org/hswebframework/web/authorization/starter/UserSettingControllerTest.groovy
similarity index 100%
rename from hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/authorization/starter/UserSettingControllerTest.groovy
rename to hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/groovy/org/hswebframework/web/authorization/starter/UserSettingControllerTest.groovy
diff --git a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml
index d484538b7..d685547b3 100644
--- a/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml
+++ b/hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/pom.xml
@@ -15,9 +15,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>2.2.4</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/hsweb-tests/pom.xml b/hsweb-tests/pom.xml
index 6d27b43a2..bde4252d7 100644
--- a/hsweb-tests/pom.xml
+++ b/hsweb-tests/pom.xml
@@ -19,9 +19,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <version>2.2</version>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
         </dependency>
 
         <dependency>