Merge branch 'master' into dependabot/npm_and_yarn/babel/traverse-7.23.2

gradle.properties

@@ -1,5 +1,6 @@
 group=org.zkoss.zk
 version=10.0.0-SNAPSHOT
+description=zk
 
 # dependencies
 servletVersion=2.4

release.gradle

@@ -123,6 +123,27 @@ task prepareBin() {
 		dependsOn gradle.includedBuild('zkthemes').task(':release')
 	}
 	doLast {
+		// xsd
+		copy {
+			into "$buildDir/tmp/eebin/dist/xsd"
+			from("$rootDir/zul/src/main/resources/metainfo/xml") {
+				include "**/*.xsd"
+			}
+		}
+		// zweb WEB-INF/tld/
+		copy {
+			into "$buildDir/tmp/eebin/dist/WEB-INF/tld/web"
+			from("$rootDir/zweb/src/main/resources/web/WEB-INF/tld/web") {
+				include "**/*.tld"
+			}
+		}
+		// zk WEB-INF/tld/
+		copy {
+			into "$buildDir/tmp/eebin/dist/WEB-INF/tld/zk"
+			from("$rootDir/zk/src/main/resources/web/WEB-INF/tld/zk") {
+				include "**/*.tld"
+			}
+		}
 		// ext lib jars
 		copy {
 			into "$buildDir/tmp/eebin/dist/lib/ext"
@@ -152,12 +173,6 @@ task prepareBin() {
 			into "$buildDir/tmp/eebin/dist/lib/theme"
 			from("$rootDir/dist/lib") {
 				include "**/iceblue_c.jar"
-			}
-		}
-		copy {
-			includeEmptyDirs false
-			into "$buildDir/tmp/eebin/dist/lib/theme"
-			from("../zkthemes/dist/lib") {
 				include "**/breeze.jar"
 				include "**/sapphire.jar"
 				include "**/silvertail.jar"
@@ -234,9 +249,6 @@ task prepareBin() {
 }
 
 task processBins() {
-	if (gradle.includedBuilds.find {it.name == 'zkcml'} != null) {
-		dependsOn gradle.includedBuild('zkcml').task(':processBins')
-	}
 	doLast {
 		// prepare ee
 		copy {
@@ -447,7 +459,9 @@ task prepareSrc() {
 			// copy src
 			copy {
 				into "$buildDir/tmp/src/$prjName/src"
-				from "$dir/src"
+				from ("$dir/src") {
+					exclude "test/**"
+				}
 			}
 			// copy codegen
 			copy {

typedoc.json

@@ -3,7 +3,7 @@
   "entryPoints": [
     "jsdoc/src/index.d.ts"
   ],
-  "out": "jsdoc/codegen",
+  "out": "build/docs/javadoc/jsdoc",
   "logLevel": "Error",
   "disableSources": true,
   "excludeInternal": true,

zk-bom/pom.xml

@@ -15,15 +15,15 @@
     <description>ZK Bill of Materials</description>
     <properties>
         <zats.version>2.1.1</zats.version>
-        <zkspringboot.version>2.3.1</zkspringboot.version>
-        <zkckeditor.version>4.18.0.0</zkckeditor.version>
-        <zkgmaps.version>3.2.0</zkgmaps.version>
-        <zkcharts.version>7.2.2.0</zkcharts.version>
+        <zkspringboot.version>3.0.0</zkspringboot.version>
+        <zkckeditor.version>4.21.0.0</zkckeditor.version>
+        <zkgmaps.version>4.0.0</zkgmaps.version>
+        <zkcharts.version>10.3.3.0</zkcharts.version>
         <zkpivotable.version>2.5.2</zkpivotable.version>
         <zkpoi.version>3.9.17</zkpoi.version>
         <zss.version>3.9.6</zss.version>
         <keikai.oss.version>5.0.0.1</keikai.oss.version>
-        <keikai.ex.version>5.7.0</keikai.ex.version>
+        <keikai.ex.version>5.12.2</keikai.ex.version>
     </properties>
     <dependencyManagement>
         <dependencies>

zkdoc/release-note

@@ -1,4 +1,13 @@
 ZK 10.0.0
+* Features
+
+* Bugs
+
+* Upgrade Notes
+
+   --------
+ZK 10.0.0-Beta
+Oct 17, 2023
 * Features
   ZK-5024: Add a library property to change the default apply composer for MVVM
   ZK-5039: remove deprecated classicblue theme in ZK 10