Merge remote-tracking branch 'origin/V5' into V6

Author: sanluan

publiccms-parent/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-gradle-plugin
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:4.0.1"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:4.0.2"
     }
 }
 
@@ -32,17 +32,17 @@ subprojects {
         servletVersion = "6.1.0"
         // http://mvnrepository.com/artifact/org.springframework/spring-core
         // https://spring.io/projects/spring-framework
-        springVersion = "7.0.2"
+        springVersion = "7.0.3"
         // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
         // https://spring.io/projects/spring-boot
-        springBootVersion = "4.0.1"
+        springBootVersion = "4.0.2"
         // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
-        junitVersion = "6.0.1"
+        junitVersion = "6.0.2"
         // http://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core
         // http://hibernate.org/orm/downloads/
-        hibernateVersion = "7.2.0.Final"
+        hibernateVersion = "7.2.2.Final"
         // http://mvnrepository.com/artifact/org.hibernate.tool/hibernate-tools-orm
-        hibernateToolsVersion = "7.2.0.Final"
+        hibernateToolsVersion = "7.2.2.Final"
         // https://mvnrepository.com/artifact/org.hibernate.search/hibernate-search-mapper-orm
         // http://hibernate.org/search/downloads/
         hibernateSearchVersion = "8.2.1.Final"
@@ -61,14 +61,14 @@ subprojects {
         // https://mvnrepository.com/artifact/org.mybatis.dynamic-sql/mybatis-dynamic-sql
         dynamicSqlVersion = "1.5.2"
         // http://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-        jacksonVersion = "3.0.3"
+        jacksonVersion = "3.0.4"
         // http://mvnrepository.com/artifact/org.freemarker/freemarker
         freemarkerVersion = "2.3.34"
         // https://mvnrepository.com/artifact/org.apache.lucene/lucene-core
         luceneVersion = "10.3.2"
         // http://mvnrepository.com/artifact/redis.clients/jedis
         // https://github.com/redis/jedis
-        jedisVersion = "7.2.0"
+        jedisVersion = "7.2.1"
         // http://mvnrepository.com/artifact/org.quartz-scheduler/quartz
         // https://github.com/quartz-scheduler/quartz/releases
         quartzVersion = "2.5.2"
@@ -99,7 +99,7 @@ subprojects {
         // http://mvnrepository.com/artifact/commons-codec/commons-codec
         codecVersion = "1.20.0"
         // https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging
-        jbossLoggingVersion = "3.6.1.Final"
+        jbossLoggingVersion = "3.6.2.Final"
         // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
         log4jVersion = "2.25.3"
         // https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor

publiccms-parent/pom.xml

@@ -26,17 +26,17 @@
         <version.servlet>6.1.0</version.servlet>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->
         <!-- https://spring.io/projects/spring-framework -->
-        <version.spring>7.0.2</version.spring>
+        <version.spring>7.0.3</version.spring>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <!-- https://spring.io/projects/spring-boot -->
-        <version.springBoot>4.0.1</version.springBoot>
+        <version.springBoot>4.0.2</version.springBoot>
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
-        <version.juint>6.0.1</version.juint>
+        <version.juint>6.0.2</version.juint>
         <!-- http://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core -->
         <!-- http://hibernate.org/orm/releases/ -->
-        <version.hibernate>7.2.0.Final</version.hibernate>
+        <version.hibernate>7.2.2.Final</version.hibernate>
         <!-- https://mvnrepository.com/artifact/org.hibernate.tool/hibernate-tools-orm -->
-        <version.hibernateTools>7.2.0.Final</version.hibernateTools>
+        <version.hibernateTools>7.2.2.Final</version.hibernateTools>
         <!-- https://mvnrepository.com/artifact/org.hibernate.search/hibernate-search-mapper-orm/ -->
         <!-- http://hibernate.org/search/releases/ -->
         <version.hibernateSearch>8.2.1.Final</version.hibernateSearch>
@@ -55,14 +55,14 @@
         <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
         <version.ehcache>3.11.1</version.ehcache>
         <!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
-        <version.jackson>3.0.3</version.jackson>
+        <version.jackson>3.0.4</version.jackson>
         <!-- http://mvnrepository.com/artifact/org.freemarker/freemarker -->
         <version.freemarker>2.3.34</version.freemarker>
         <!-- https://mvnrepository.com/artifact/org.apache.lucene/lucene-core -->
         <version.lucene>10.3.2</version.lucene>
         <!-- http://mvnrepository.com/artifact/redis.clients/jedis -->
         <!-- https://github.com/redis/jedis -->
-        <version.jedis>7.2.0</version.jedis>
+        <version.jedis>7.2.1</version.jedis>
         <!-- http://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
         <version.quartz>2.5.2</version.quartz>
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
@@ -94,7 +94,7 @@
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <version.log4j>2.25.3</version.log4j>
         <!-- https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging -->
-        <version.jbossLogging>3.6.1.Final</version.jbossLogging>
+        <version.jbossLogging>3.6.2.Final</version.jbossLogging>
         <!-- https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor -->
         <version.extractor>2.19.0</version.extractor>
         <!-- https://mvnrepository.com/artifact/org.sejda.imageio/webp-imageio -->

publiccms-parent/publiccms-analyzer/build.gradle

@@ -10,6 +10,6 @@ dependencies {
 
     implementation "org.apache.lucene:lucene-analysis-smartcn:${luceneVersion}"
     // https://mvnrepository.com/artifact/org.lionsoul/ip2region
-    implementation 'org.lionsoul:ip2region:3.3.3'
+    implementation 'org.lionsoul:ip2region:3.3.4'
     implementation "jakarta.servlet:jakarta.servlet-api:${servletVersion}"
 }

publiccms-parent/publiccms-analyzer/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
-            <version>3.3.3</version>
+            <version>3.3.4</version>
         </dependency>
         <dependency>
             <groupId>com.github.therapi</groupId>

publiccms-parent/publiccms-oss/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     implementation project(':publiccms-core')
 
     // https://mvnrepository.com/artifact/software.amazon.awssdk/s3
-    implementation "software.amazon.awssdk:s3:2.41.1"
+    implementation "software.amazon.awssdk:s3:2.41.16"
 
     compileOnly "com.github.therapi:therapi-runtime-javadoc-scribe:${therapiJavadocVersion}"
     compileOnly "jakarta.servlet:jakarta.servlet-api:${servletVersion}"

publiccms-parent/publiccms-oss/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
-            <version>2.41.1</version>
+            <version>2.41.16</version>
         </dependency>
         <dependency>
             <groupId>com.github.therapi</groupId>

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/ueditor.config.js

@@ -365,7 +365,7 @@
         //, allowLinkProtocols: ['http:', 'https:', '#', '/', 'ftp:', 'mailto:', 'tel:', 'git:', 'svn:']
 
         //默认过滤规则相关配置项目
-        //,disabledTableInTable:true  //禁止表格嵌套
+        ,disabledTableInTable:false  //禁止表格嵌套
         ,allowDivTransToP:false      //允许进入编辑器的div标签自动变成p标签
         //,rgb2Hex:true               //默认产出的数据中的color自动从rgb格式变成16进制格式