Merge branch '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.0"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:4.0.1"
     }
 }
 
@@ -35,17 +35,17 @@ subprojects {
         springVersion = "7.0.2"
         // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
         // https://spring.io/projects/spring-boot
-        springBootVersion = "4.0.0"
+        springBootVersion = "4.0.1"
         // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
         junitVersion = "6.0.1"
         // http://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core
         // http://hibernate.org/orm/downloads/
         hibernateVersion = "7.2.0.Final"
         // http://mvnrepository.com/artifact/org.hibernate.tool/hibernate-tools-orm
-        hibernateToolsVersion = "7.1.11.Final"
+        hibernateToolsVersion = "7.2.0.Final"
         // https://mvnrepository.com/artifact/org.hibernate.search/hibernate-search-mapper-orm
         // http://hibernate.org/search/downloads/
-        hibernateSearchVersion = "8.2.0.Final"
+        hibernateSearchVersion = "8.2.1.Final"
         // https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator
         hibernateValidatorVersion = "9.1.0.Final"
         // https://mvnrepository.com/artifact/org.ehcache/ehcache
@@ -68,7 +68,7 @@ subprojects {
         luceneVersion = "10.3.2"
         // http://mvnrepository.com/artifact/redis.clients/jedis
         // https://github.com/redis/jedis
-        jedisVersion = "7.1.0"
+        jedisVersion = "7.2.0"
         // http://mvnrepository.com/artifact/org.quartz-scheduler/quartz
         // https://github.com/quartz-scheduler/quartz/releases
         quartzVersion = "2.5.2"
@@ -101,7 +101,7 @@ subprojects {
         // https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging
         jbossLoggingVersion = "3.6.1.Final"
         // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-        log4jVersion = "2.25.2"
+        log4jVersion = "2.25.3"
         // https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor
         extractorVersion = "2.19.0"
         // https://mvnrepository.com/artifact/org.sejda.imageio/webp-imageio

publiccms-parent/pom.xml

@@ -29,17 +29,17 @@
         <version.spring>7.0.2</version.spring>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <!-- https://spring.io/projects/spring-boot -->
-        <version.springBoot>4.0.0</version.springBoot>
+        <version.springBoot>4.0.1</version.springBoot>
         <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
         <version.juint>6.0.1</version.juint>
         <!-- http://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core -->
         <!-- http://hibernate.org/orm/releases/ -->
         <version.hibernate>7.2.0.Final</version.hibernate>
         <!-- https://mvnrepository.com/artifact/org.hibernate.tool/hibernate-tools-orm -->
-        <version.hibernateTools>7.1.11.Final</version.hibernateTools>
+        <version.hibernateTools>7.2.0.Final</version.hibernateTools>
         <!-- https://mvnrepository.com/artifact/org.hibernate.search/hibernate-search-mapper-orm/ -->
         <!-- http://hibernate.org/search/releases/ -->
-        <version.hibernateSearch>8.2.0.Final</version.hibernateSearch>
+        <version.hibernateSearch>8.2.1.Final</version.hibernateSearch>
         <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
         <version.hibernateValidator>9.1.0.Final</version.hibernateValidator>
         <!-- http://mvnrepository.com/artifact/org.mybatis/mybatis -->
@@ -62,7 +62,7 @@
         <version.lucene>10.3.2</version.lucene>
         <!-- http://mvnrepository.com/artifact/redis.clients/jedis -->
         <!-- https://github.com/redis/jedis -->
-        <version.jedis>7.1.0</version.jedis>
+        <version.jedis>7.2.0</version.jedis>
         <!-- http://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
         <version.quartz>2.5.2</version.quartz>
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
@@ -92,7 +92,7 @@
         <!-- http://mvnrepository.com/artifact/commons-codec/commons-codec -->
         <version.codec>1.20.0</version.codec>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
-        <version.log4j>2.25.2</version.log4j>
+        <version.log4j>2.25.3</version.log4j>
         <!-- https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging -->
         <version.jbossLogging>3.6.1.Final</version.jbossLogging>
         <!-- https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor -->

publiccms-parent/publiccms/src/main/webapp/resource/css/core.css

@@ -158,17 +158,17 @@ header .navbar-toggler.side-right{background-image:url(../images/side-right.png)
 .tabsPage .tabsPageContent{display:block;overflow:hidden;position:relative;}
 
 /* Tree */
-.tree li{line-height:30px;padding-left:20px;cursor:pointer;clear:both;}
+.tree li{line-height:26px;padding-left:15px;cursor:pointer;clear:both;}
 .tree>li{padding-left:5px;}
 .tree li div{white-space:nowrap;}
 .tree li:not(:has(ul)){min-width:155px;float:left;clear:none;}
 .leftPageContent .tree li:not(:has(ul)){min-width:auto;float:none;clear:both;}
 .tree ul:after{display:block;content:".";height:0;clear:both;visibility:hidden;}
 .tree li a.disabled{color:#aaa;}
-.tree a{height:auto;line-height:30px;font-size:13px;}
+.tree a{height:auto;line-height:26px;font-size:13px;}
 .tree a>i{margin-right:5px;}
 .tree a, .tree a:hover{text-decoration:none;}
-.tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable,.tree .ckbox{font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display: inline-block;line-height:30px;text-align:center;width:22px;}
+.tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable,.tree .ckbox{font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display: inline-block;line-height:26px;text-align:center;width:18px;}
 .tree .collapsable,.tree .end_collapsable,.tree .end_expandable,.tree .expandable,.tree .file,.tree .folder_collapsable,.tree .folder_expandable,.tree .last_collapsable,.tree .last_expandable, .tree .first_collapsable, .tree .first_expandable{font-family:iconfont;}
 .tree .folder_collapsable:before{content:"\e668";}
 .tree .collapsable:before,.tree .end_collapsable:before,.tree .last_collapsable:before, .tree .first_collapsable:before{content:"\e668";}
@@ -260,9 +260,9 @@ a.button:hover{text-decoration:none;}
 .button i,.buttonActive i,.buttonDisabled i{margin-right:5px;}
 
 /* Layout */
-.leftPageContent{float:left;display:block;overflow:auto;width:205px;line-height:21px;}
+.leftPageContent{float:left;display:block;overflow:auto;width:220px;line-height:21px;}
 .leftPageContent .card{margin-right:4px;}
-.rightPageContent{margin-left:205px;}
+.rightPageContent{margin-left:220px;}
 .thumbnail,.image-list{position:relative;overflow:hidden;margin-top:5px;margin-right:5px;border:1px dashed #cacbcc;display:inline-block;text-align:center;line-height:0px;}
 /* Pages default */
 .page{display:block;overflow:hidden;width:100%;height:100%;-webkit-overflow-scrolling:touch;}