Merge remote-tracking branch 'upstream/dev' into feature-fs-tencent-cos

This commit is contained in:
qianmoQ 2024-08-24 19:31:29 +08:00
commit 6a0dcbea77
11 changed files with 92 additions and 37 deletions

View File

@ -16,7 +16,7 @@
<properties>
<commons-io.version>2.11.0</commons-io.version>
<commons-csv.version>1.10.0</commons-csv.version>
<commons-csv.version>1.11.0</commons-csv.version>
</properties>
<dependencies>

View File

@ -47,6 +47,7 @@
"vue": "^3.4.21",
"vue-clipboard3": "^2.0.0",
"vue-i18n": "^9.10.1",
"vue-picture-cropper": "^0.7.0",
"vue-router": "^4.3.0",
"vue3-ace-editor": "^2.2.4",
"vue3-calendar-heatmap": "^2.0.5",
@ -133,6 +134,14 @@
"node": ">=6.9.0"
}
},
"node_modules/@bassist/utils": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@bassist/utils/-/utils-0.4.0.tgz",
"integrity": "sha512-aoFTl0jUjm8/tDZodP41wnEkvB+C5O9NFCuYN/ztL6jSUSsuBkXq90/1ifBm1XhV/zySHgLYlU1+tgo3XtQ+nA==",
"dependencies": {
"@withtypes/mime": "^0.1.2"
}
},
"node_modules/@codemirror/autocomplete": {
"version": "6.15.0",
"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
@ -2003,6 +2012,14 @@
"url": "https://github.com/sponsors/antfu"
}
},
"node_modules/@withtypes/mime": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@withtypes/mime/-/mime-0.1.2.tgz",
"integrity": "sha512-PB9BfZGzwblUONJY0LiOwsHCA6uV3DIPj/w9ReekdHxPOl0VdUFgI5s4avKycuuq9Gf5Nz2ZPA2O36GAUzlMPA==",
"dependencies": {
"mime": "^3.0.0"
}
},
"node_modules/abs-svg-path": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz",
@ -2208,12 +2225,11 @@
}
},
"node_modules/braces": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"license": "MIT",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dependencies": {
"fill-range": "^7.0.1"
"fill-range": "^7.1.1"
},
"engines": {
"node": ">=8"
@ -2453,6 +2469,11 @@
"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
"license": "MIT"
},
"node_modules/cropperjs": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.2.tgz",
"integrity": "sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA=="
},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -2897,10 +2918,9 @@
}
},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"license": "MIT",
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dependencies": {
"to-regex-range": "^5.0.1"
},
@ -3233,7 +3253,6 @@
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"license": "MIT",
"engines": {
"node": ">=0.12.0"
}
@ -3463,6 +3482,17 @@
"node": ">=8.6"
}
},
"node_modules/mime": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
"bin": {
"mime": "cli.js"
},
"engines": {
"node": ">=10.0.0"
}
},
"node_modules/mime-db": {
"version": "1.52.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@ -4635,7 +4665,6 @@
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"license": "MIT",
"dependencies": {
"is-number": "^7.0.0"
},
@ -4977,6 +5006,18 @@
"vue": "^3.0.0"
}
},
"node_modules/vue-picture-cropper": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.7.0.tgz",
"integrity": "sha512-NF7+Dgso6d0GB16E5d/BbrcTIHm1VWz8dS3IjLhoBl+ZeC+yDA46CyJphQuO32SisaPmrKHN8VbiE2LgAfhnkQ==",
"dependencies": {
"@bassist/utils": "^0.4.0",
"cropperjs": "^1.6.1"
},
"peerDependencies": {
"vue": ">=3.2.13"
}
},
"node_modules/vue-router": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz",

View File

@ -1761,11 +1761,11 @@ brace-expansion@^2.0.1:
balanced-match "^1.0.0"
braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
dependencies:
fill-range "^7.0.1"
fill-range "^7.1.1"
browserslist@^4.23.0:
version "4.23.0"
@ -2222,10 +2222,10 @@ file-source@0.6:
dependencies:
stream-source "0.3"
fill-range@^7.0.1:
version "7.0.1"
resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
fill-range@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
dependencies:
to-regex-range "^5.0.1"
@ -3066,8 +3066,16 @@ stream-source@0.3:
resolved "https://registry.npmjs.org/stream-source/-/stream-source-0.3.5.tgz"
integrity sha512-ZuEDP9sgjiAwUVoDModftG0JtYiLUV8K4ljYD1VyUMRWtbVf92474o4kuuul43iZ8t/hRuiDAx1dIJSvirrK/g==
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
name string-width-cjs
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
string-width@^4.1.0:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -3097,8 +3105,14 @@ string_decoder@~0.10.x:
resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
name strip-ansi-cjs
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==

View File

@ -14,7 +14,7 @@
<description>DataCap - Dameng</description>
<properties>
<dameng.version>8.1.3.62</dameng.version>
<dameng.version>8.1.3.140</dameng.version>
<plugin.name>jdbc-dameng</plugin.name>
</properties>

View File

@ -15,7 +15,7 @@
<properties>
<!-- https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-jdbc.html#jdbc-compatibility -->
<x-pack-sql-jdbc.version>8.12.0</x-pack-sql-jdbc.version>
<x-pack-sql-jdbc.version>8.15.0</x-pack-sql-jdbc.version>
<plugin.name>jdbc-elasticsearch</plugin.name>
</properties>

View File

@ -14,7 +14,7 @@
<description>DataCap - Apache Kyuubi</description>
<properties>
<kyuubi-jdbc.version>1.7.1</kyuubi-jdbc.version>
<kyuubi-jdbc.version>1.9.2</kyuubi-jdbc.version>
<plugin.name>jdbc-kyuubi</plugin.name>
</properties>

View File

@ -14,7 +14,7 @@
<description>DataCap - MonetDB</description>
<properties>
<monetdb.version>3.2</monetdb.version>
<monetdb.version>11.19.15</monetdb.version>
<plugin.name>jdbc-monetdb</plugin.name>
</properties>

View File

@ -14,7 +14,7 @@
<description>DataCap - Apache Phoenix</description>
<properties>
<phoenix.version>4.16.0</phoenix.version>
<phoenix.version>5.2.0</phoenix.version>
<plugin.name>jdbc-phoenix</plugin.name>
</properties>

View File

@ -14,7 +14,7 @@
<description>DataCap - Apache Hadoop HDFS</description>
<properties>
<hadoop.version>3.3.4</hadoop.version>
<hadoop.version>3.4.0</hadoop.version>
<plugin.name>native-hdfs</plugin.name>
</properties>

12
pom.xml
View File

@ -155,9 +155,9 @@
<properties>
<!-- dependency -->
<dep.mysql.version>8.0.30</dep.mysql.version>
<dep.snowflake.version>3.14.4</dep.snowflake.version>
<dep.snowflake.version>3.17.0</dep.snowflake.version>
<dep.guice.version>5.1.0</dep.guice.version>
<dep.trino.version>414</dep.trino.version>
<dep.trino.version>450</dep.trino.version>
<dep.antlr4.version>4.12.0</dep.antlr4.version>
<springboot.version>2.7.4</springboot.version>
<lombok.version>1.18.30</lombok.version>
@ -165,7 +165,7 @@
<jjwt.version>0.9.1</jjwt.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<findbugs.version>3.0.1</findbugs.version>
<jackson.version>2.16.1</jackson.version>
<jackson.version>2.17.2</jackson.version>
<logback.version>1.2.13</logback.version>
<slf4j.version>2.0.10</slf4j.version>
<sql-formatter.version>2.0.3</sql-formatter.version>
@ -173,7 +173,7 @@
<kotlin.version>1.9.10</kotlin.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<redis.version>3.8.0</redis.version>
<testcontainers.version>1.19.5</testcontainers.version>
<testcontainers.version>1.20.1</testcontainers.version>
<assembly-plugin.version>3.6.0</assembly-plugin.version>
<dep.reflections.version>0.10.2</dep.reflections.version>
<!-- datacap plugin dependency -->
@ -187,11 +187,11 @@
<!-- maven plugin -->
<plugin.maven.checkstyle.version>3.0.0</plugin.maven.checkstyle.version>
<plugin.maven.findbugs.version>4.8.5.0</plugin.maven.findbugs.version>
<plugin.maven.compiler.version>3.12.1</plugin.maven.compiler.version>
<plugin.maven.compiler.version>3.13.0</plugin.maven.compiler.version>
<plugin.maven.cobertura.version>2.7</plugin.maven.cobertura.version>
<plugin.maven.dependency.version>3.0.1</plugin.maven.dependency.version>
<plugin.maven.source.version>2.2.1</plugin.maven.source.version>
<plugin.maven.javadoc.version>3.6.3</plugin.maven.javadoc.version>
<plugin.maven.javadoc.version>3.8.0</plugin.maven.javadoc.version>
<plugin.maven.gpg.version>1.6</plugin.maven.gpg.version>
<plugin.maven.nexus.version>1.6.13</plugin.maven.nexus.version>
<plugin.maven.dokka.version>1.9.10</plugin.maven.dokka.version>

View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<pinot.version>0.8.0</pinot.version>
<pinot.version>1.1.0</pinot.version>
<datacap.shade.packageName>io.edurt.datacap.pinot</datacap.shade.packageName>
</properties>