diff --git a/common/pom.xml b/common/pom.xml
index 55f52b60..4f7549b4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -295,39 +295,6 @@
-
-
-
-
- net.alchim31.maven
- yuicompressor-maven-plugin
-
-
- prepare-package
-
- compress
-
-
-
-
- UTF-8
- false
- true
- 30000
- true
-
- **/*.js
- **/*.css
-
-
- **/*.min.js
- **/*.min.css
- **/jquery-*.js
-
-
-
-
-
diff --git a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
index 40666582..eba64bc2 100644
--- a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
+++ b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
@@ -104,7 +104,7 @@ public class ReflectUtils {
try {
result = (E)field.get(obj);
} catch (IllegalAccessException e) {
- logger.error("不可能抛出的异常{}", e.getMessage());
+ logger.error("不可能抛出的异常: {}", e.getMessage());
}
return result;
}
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 2992dee2..c22138b6 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -25,14 +25,13 @@
- com.oracle
- ojdbc6
- 11.2.0.3
+ mysql
+ mysql-connector-java
runtime
- mysql
- mysql-connector-java
+ com.oracle.ojdbc
+ ojdbc8
runtime
diff --git a/modules/core/src/main/resources/jta.properties b/modules/core/src/main/resources/jta.properties
index e9ba07d0..f33df176 100644
--- a/modules/core/src/main/resources/jta.properties
+++ b/modules/core/src/main/resources/jta.properties
@@ -1,5 +1,6 @@
# transactions.properties not found - looking for jta.properties in classpath...
com.atomikos.icatch.service=com.atomikos.icatch.standalone.UserTransactionServiceFactory
+#com.atomikos.icatch.log_base_dir=./transaction-logs/
com.atomikos.icatch.max_timeout=-1
com.atomikos.icatch.max_actives=-1
com.atomikos.icatch.enable_logging=false
diff --git a/parent/pom.xml b/parent/pom.xml
index caa78779..ae1e1ac7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -53,6 +53,9 @@
3.0.19-SNAPSHOT
1.6.0
+
+ 8.0.11
+
1.8
@@ -227,9 +230,9 @@
- net.alchim31.maven
- yuicompressor-maven-plugin
- 1.5.1
+ com.jeesite.maven
+ compressor-maven-plugin
+ 1.0.0-SNAPSHOT
prepare-package
@@ -356,8 +359,8 @@
- net.alchim31.maven
- yuicompressor-maven-plugin
+ com.jeesite.maven
+ compressor-maven-plugin
@@ -369,8 +372,8 @@
- net.alchim31.maven
- yuicompressor-maven-plugin
+ com.jeesite.maven
+ compressor-maven-plugin
diff --git a/web/pom.xml b/web/pom.xml
index af877f4a..2f757de3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -41,6 +41,34 @@
${project.parent.version}
+
+
+ com.jeesite
+ jeesite-module-swagger
+ ${project.parent.version}
+
+
+
+
+ com.jeesite
+ jeesite-module-weboffice
+ ${project.parent.version}
+
+
+
+
+ com.jeesite
+ jeesite-module-filemanager
+ ${project.parent.version}
+
+
+
+
+ com.jeesite
+ jeesite-module-bpm
+ ${project.parent.version}
+
+
org.springframework.boot