From 25e08d423914d272656be3da5599d10d78fda67d Mon Sep 17 00:00:00 2001 From: cj Date: Wed, 3 Jul 2024 15:14:49 +0800 Subject: [PATCH 1/4] feat: upgrade velocity v2 --- pom.xml | 4 ++-- screw-core/pom.xml | 2 +- .../screw/core/engine/velocity/VelocityTemplateEngine.java | 3 --- .../src/main/java/cn/smallbun/screw/core/util/BeanUtils.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 26afb7a..fea4453 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.4.5 1.18.32 2.3.30 - 1.7 + 2.3 2.0 1.7 1.9.4 @@ -168,7 +168,7 @@ org.apache.velocity - velocity + velocity-engine-core ${velocity.version} diff --git a/screw-core/pom.xml b/screw-core/pom.xml index 2c22754..2e6d46f 100644 --- a/screw-core/pom.xml +++ b/screw-core/pom.xml @@ -43,7 +43,7 @@ org.apache.velocity - velocity + velocity-engine-core provided 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 index 27f9d75..ae93195 100644 --- 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 index 130bcbe..b855c80 100644 --- 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; From f1ad320a04479eea3bc0047541b882a41e5c11f4 Mon Sep 17 00:00:00 2001 From: cj Date: Wed, 3 Jul 2024 15:18:07 +0800 Subject: [PATCH 2/4] chore: polish --- screw-core/src/main/resources/properties/db2.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screw-core/src/main/resources/properties/db2.properties b/screw-core/src/main/resources/properties/db2.properties index 6fd0ce2..eaa8083 100644 --- 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 (qinggang.zuo@gmail.com) +# screw-core - 简洁好用的数据库表结构文档生成工具 +# Copyright © 2020 SanLi (qinggang.zuo@gmail.com) # # 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 From 098d7d2d46a0b806bb388dc2777101de3fb2e2ef Mon Sep 17 00:00:00 2001 From: cj Date: Wed, 3 Jul 2024 15:19:24 +0800 Subject: [PATCH 3/4] update develop verision --- pom.xml | 2 +- screw-core/pom.xml | 2 +- screw-extension/pom.xml | 2 +- screw-maven-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fea4453..e6456f3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.power4j.kit screw pom - 1.0.6 + 1.0.7-SNAPSHOT 2020 screw 简洁好用的数据库表结构文档生成工具 diff --git a/screw-core/pom.xml b/screw-core/pom.xml index 2e6d46f..e946d7e 100644 --- a/screw-core/pom.xml +++ b/screw-core/pom.xml @@ -5,7 +5,7 @@ com.power4j.kit screw - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml jar diff --git a/screw-extension/pom.xml b/screw-extension/pom.xml index fb16f07..98d4cb8 100644 --- a/screw-extension/pom.xml +++ b/screw-extension/pom.xml @@ -5,7 +5,7 @@ screw com.power4j.kit - 1.0.6 + 1.0.7-SNAPSHOT 4.0.0 diff --git a/screw-maven-plugin/pom.xml b/screw-maven-plugin/pom.xml index c7a040a..dbdc288 100644 --- a/screw-maven-plugin/pom.xml +++ b/screw-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.power4j.kit screw - 1.0.6 + 1.0.7-SNAPSHOT ../pom.xml 4.0.0 From 044d2258491c922666405b4206324600bc0c31a1 Mon Sep 17 00:00:00 2001 From: cj Date: Wed, 3 Jul 2024 15:28:51 +0800 Subject: [PATCH 4/4] version 1.0.7 --- pom.xml | 2 +- screw-core/pom.xml | 2 +- screw-extension/pom.xml | 2 +- screw-maven-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e6456f3..be52551 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.power4j.kit screw pom - 1.0.7-SNAPSHOT + 1.0.7 2020 screw 简洁好用的数据库表结构文档生成工具 diff --git a/screw-core/pom.xml b/screw-core/pom.xml index e946d7e..8fa44b0 100644 --- a/screw-core/pom.xml +++ b/screw-core/pom.xml @@ -5,7 +5,7 @@ com.power4j.kit screw - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml jar diff --git a/screw-extension/pom.xml b/screw-extension/pom.xml index 98d4cb8..7f9620e 100644 --- a/screw-extension/pom.xml +++ b/screw-extension/pom.xml @@ -5,7 +5,7 @@ screw com.power4j.kit - 1.0.7-SNAPSHOT + 1.0.7 4.0.0 diff --git a/screw-maven-plugin/pom.xml b/screw-maven-plugin/pom.xml index dbdc288..e64e7e0 100644 --- a/screw-maven-plugin/pom.xml +++ b/screw-maven-plugin/pom.xml @@ -5,7 +5,7 @@ com.power4j.kit screw - 1.0.7-SNAPSHOT + 1.0.7 ../pom.xml 4.0.0