From 8979e52ae090c90ca89a104fcd2eaa1281412901 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 4 May 2024 15:11:59 +0800
Subject: [PATCH] v 4.0.4 jar update

---
 ReleaseNotes.txt  | 21 ++++++++++++++++++++-
 gradle.properties |  6 +++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 6ab202939..18d38780e 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,23 @@
-MaxKey v 4.0.3 GA 2024/03/28
+MaxKey v 4.0.4 GA 2024/05/--
+    *(MAXKEY-240201) 开源协议的说明细化
+    *(MAXKEY-240202) 更改标准打包方式为Fat Jar
+    *(MAXKEY-240203) 优化OpenAPI接口Basic和OAuth认证
+    *(MAXKEY-240204) 代码优化，删除UserAdjoint次要功能
+    *(MAXKEY-240205) OAuth 2增加URLDecoder兼容，支持URL Fragment
+    *(MAXKEY-240206) SQL中mxk_userinfo表SORTORDER调整为SORTINDEX
+    *(MAXKEY-240207) 管理控制台左侧菜单颜色优化
+    *(MAXKEY-240208) 增加 date格式化支持
+    *(MAXKEY-240209) maxkey.session.timeout 改为maxkey.auth.session.timeout 
+    *(MAXKEY-240210) 日期类型调整为date
+    *(MAXKEY-240211) 源代码增加版权声明
+    *(MAXKEY-240212) Linux和Window启动脚本调整优化
+    *(MAXKEY-240213) 开源之夏项目MaxKey APP客户端Flutter开发项目和MaxKey同步功能增强，增加属性映射关系管理
+    *(MAXKEY-240214) 依赖项引用、更新和升级
+        spring              6.0.19
+        springBoot          3.1.11
+        tomcat              10.1.23
+        
+axKey v 4.0.3 GA 2024/03/28
     *(MAXKEY-240101) JDBC 同步器 问题修改 @liuxiaogang1987
     *(MAXKEY-240102) 显示应用编码
     *(MAXKEY-240103) 优化OpenAPI接口Basic和OAuth认证
diff --git a/gradle.properties b/gradle.properties
index 9f4157572..c5078dd42 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,8 +27,8 @@ jibToAuthPassword               =docker registry credential
 
 #maxkey used jars version
 #spring 
-springVersion                   =6.0.18
-springBootVersion               =3.1.9
+springVersion                   =6.0.19
+springBootVersion               =3.1.11
 springSecurityVersion           =6.1.6
 springDataVersion               =3.0.3
 springkafkaVersion              =3.0.13
@@ -77,7 +77,7 @@ freemarkerVersion               =2.3.32
 xmlbeansVersion                 =5.0.2
 poiVersion                      =5.2.3
 #tomcat
-tomcatVersion                   =10.1.18
+tomcatVersion                   =10.1.23
 #logs
 log4jVersion                    =2.23.0
 slf4jVersion                    =2.0.11