Merge branch 'release/v1.0.7'

power4j · Jul 3, 2024 · 4d9bd00 · 4d9bd00
2 parents 1fbf6fc + 044d225
commit 4d9bd00
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.power4j.kit</groupId>
     <artifactId>screw</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <inceptionYear>2020</inceptionYear>
     <name>screw</name>
     <description>简洁好用的数据库表结构文档生成工具</description>
@@ -61,7 +61,7 @@
         <HikariCP.version>3.4.5</HikariCP.version>
         <lombok.version>1.18.32</lombok.version>
         <freemarker.version>2.3.30</freemarker.version>
-        <velocity.version>1.7</velocity.version>
+        <velocity.version>2.3</velocity.version>
         <velocity-tools.version>2.0</velocity-tools.version>
         <dbutils.version>1.7</dbutils.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
@@ -168,7 +168,7 @@
             <!-- velocity -->
             <dependency>
                 <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
+                <artifactId>velocity-engine-core</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
             <dependency>

diff --git a/screw-core/pom.xml b/screw-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.power4j.kit</groupId>
         <artifactId>screw</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -43,7 +43,7 @@
         <!-- velocity -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
+            <artifactId>velocity-engine-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <!--junit-->

diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java b/screw-core/src/main/java/cn/smallbun/screw/core/engine/velocity/VelocityTemplateEngine.java
@@ -28,7 +28,6 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.log.NullLogChute;
 
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;
@@ -75,11 +74,9 @@ public VelocityTemplateEngine(EngineConfig templateConfig) {
             velocityEngine.setProperty("file.resource.loader.class",
                 "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
         }
-        velocityEngine.setProperty("runtime.log.logsystem.class", NullLogChute.class.getName());
         velocityEngine.setProperty(Velocity.FILE_RESOURCE_LOADER_PATH, "");
         velocityEngine.setProperty(Velocity.ENCODING_DEFAULT, DEFAULT_ENCODING);
         velocityEngine.setProperty(Velocity.INPUT_ENCODING, DEFAULT_ENCODING);
-        velocityEngine.setProperty("file.resource.loader.unicode", "true");
     }
 
     /**

diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/util/BeanUtils.java b/screw-core/src/main/java/cn/smallbun/screw/core/util/BeanUtils.java
@@ -17,7 +17,7 @@
  */
 package cn.smallbun.screw.core.util;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

diff --git a/screw-core/src/main/resources/properties/db2.properties b/screw-core/src/main/resources/properties/db2.properties
@@ -1,6 +1,6 @@
 #
-# screw-core - \u7B80\u6D01\u597D\u7528\u7684\u6570\u636E\u5E93\u8868\u7ED3\u6784\u6587\u6863\u751F\u6210\u5DE5\u5177
-# Copyright \u00A9 2020 SanLi ([email protected])
+# screw-core - 简洁好用的数据库表结构文档生成工具
+# Copyright © 2020 SanLi ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by

diff --git a/screw-extension/pom.xml b/screw-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>screw</artifactId>
         <groupId>com.power4j.kit</groupId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/screw-maven-plugin/pom.xml b/screw-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.power4j.kit</groupId>
         <artifactId>screw</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>