#3531: [BUG][BE-12113]fix htrace dependency conflicts (#12126)

* fix htrace dependency conflicts

* replace htrace-core with hbase-noop-htrace

commit.ref

@@ -1 +1 @@
-Subproject commit e6832220c35680aedae98d5ea88758b5d380bdfa
+Subproject commit cf5a8894e2ac7b73b59544737a0380230dbf30ac

commit.yml

@@ -2,202 +2,76 @@
 branches: {
   }
 fileChange:
-  /docs:
+  /dolphinscheduler-api:
-    newFile: !uuid 'b792a75d318a3a738390c0c7c67e2fe34ef0406f'
+    newFile: !uuid '106e825ccf86001e6fcf184e0518d9dddbb9a74e'
-    oldFile: !uuid '48e651d446ea347c761387bde655cf9179c4df75'
+    oldFile: !uuid '3a692134efe4646bfb9036bddaa1965a7aaaf4e0'
-  /docs/docs:
+  /dolphinscheduler-api/pom.xml:
-    newFile: !uuid '06efdf1fba96fd152c80e9bc03c66041521ad9d4'
+    newFile: !uuid 'fee8b2505653b7670063c95097464664f3bdcbaf'
-    oldFile: !uuid '06dcf628519d7c205bcd3c504b3ee44a3f0b2a4e'
+    oldFile: !uuid 'efaac0b7d53c57f7a47bbf6feb84832e8e1c7d6f'
-  /docs/docs/en:
+  /dolphinscheduler-bom:
-    newFile: !uuid 'cc7c7954578eceb638f7b86aa019504da37f4119'
+    newFile: !uuid '0cda9fe8c68415684a6e61b79b353d81f374cf55'
-    oldFile: !uuid '350456aa2564940ddf114d4c57843a47b09635b8'
+    oldFile: !uuid '1e63a8a2e06114a623f5ba8ebe2e6ae57875f6f0'
-  /docs/docs/en/guide:
+  /dolphinscheduler-bom/pom.xml:
-    newFile: !uuid '7a24610fa136a51284aeb3886a7929ea8e4ec715'
+    newFile: !uuid 'a5182afff2a192b394f389c92b16f7082a89bc0c'
-    oldFile: !uuid '30e8623133e38548ce80ff532fd0b0ae9f2b4294'
+    oldFile: !uuid '2364ae85618bf37de00c33cb6f2055b8eef372c7'
-  /docs/docs/en/guide/upgrade:
+  /dolphinscheduler-common:
-    newFile: !uuid 'd830ce901385dc828aab33741e59bb1a0a949a18'
+    newFile: !uuid 'bb9dd11f164020a62336ee7d6553165a40b40b71'
-    oldFile: !uuid 'bc387661425f80e86e384a0d0f9be79fa8bd0424'
+    oldFile: !uuid '5bba21564610e90c43072146c7519c4691547790'
-  /docs/docs/en/guide/upgrade/incompatible.md:
+  /dolphinscheduler-common/pom.xml:
-    newFile: !uuid '7b20d8fda4042b709d5813693d1d5a213fadd5de'
+    newFile: !uuid 'ea698aeecd16ce4a3832bf70e7b0ebb545c64bf9'
-    oldFile: !uuid 'e17ae2f1322fa1d0c82927071b746c354375118c'
+    oldFile: !uuid 'da26f3c9ab9a219159036b8d6652a1b33d8b40da'
-  /docs/docs/zh:
+  /dolphinscheduler-datasource-plugin:
-    newFile: !uuid '7b4b61a25cf2cb9310ce0bba009e1d68841b214a'
+    newFile: !uuid '91ff9ce9fcb6e10f51fe82c156421d3e065e61b1'
-    oldFile: !uuid '7ac0d3b9485146e29d848be7688b723d58f84aa8'
+    oldFile: !uuid '3253aac41b948f6608aa8d7c041daa8f7c3a1651'
-  /docs/docs/zh/guide:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api:
-    newFile: !uuid '340edc98a027bd80daae8086a8bc0fa23b04e4ed'
+    newFile: !uuid 'af56eab4ea9ba98456b07989fadea5f7808c200b'
-    oldFile: !uuid 'aa628c4290c6a797d15cf0084793eb106d1b9f13'
+    oldFile: !uuid '7978c17355f93441f0dc2e0b06d92e5da9b6384b'
-  /docs/docs/zh/guide/task:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml:
-    newFile: !uuid '545c77e1ef0e1d79782db6c9d65ff9ebd630389e'
+    newFile: !uuid '21e17068ef74310e1740f1c7732bee0cf69e7a36'
-    oldFile: !uuid 'e0a6367d5aa4e8fa236e1a41ad0f87d442d35fec'
+    oldFile: !uuid 'a866fc77dfcf837785c527e283842ff955c41824'
-  /docs/docs/zh/guide/task/sql.md:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive:
-    newFile: !uuid 'fd55e2d5e67621325991c98837db2783e00f88da'
+    newFile: !uuid '2ef4db15f2940551bea7a61c2fd56f02fc7ca0e3'
-    oldFile: !uuid 'ba5cb817bcba5aaeb980f0ec89b8c8cffe1c5f4b'
+    oldFile: !uuid 'd45094dd41aa64fb44ab3c9dbee90f7518f51798'
-  /docs/docs/zh/guide/upgrade:
+  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml:
-    newFile: !uuid 'e710c55afe7d531795072f51174cbd43b05a3415'
+    newFile: !uuid 'cf55ee4a531e9f208187f90d62533c9c1cae08a1'
-    oldFile: !uuid '929fe5311316c252f64084ad94ee23bcb7443de5'
+    oldFile: !uuid '7175f4572a680eda2c12eb72b78e3615d2df1787'
-  /docs/docs/zh/guide/upgrade/incompatible.md:
+  /dolphinscheduler-dist:
-    newFile: !uuid '6e97f7d3161f0b3bdd5c3a0e16747408a0d75704'
+    newFile: !uuid '33bcdf8da956091ca6d9affdd85e1b5f0898796e'
-    oldFile: !uuid '59ec1e673e623490109650846e596bece15010e4'
+    oldFile: !uuid 'aaf5f2e9d2addc251e9f2f3a1f020e78c37fef21'
-  /dolphinscheduler-spi:
+  /dolphinscheduler-dist/release-docs:
-    newFile: !uuid 'be7792b4c24258ea565657ea26a08f050d524089'
+    newFile: !uuid '5c5753d8cfb6c3a4d9466bdeb6f58c9d24734782'
-    oldFile: !uuid 'b94229a0a5b893de1b3f854e3d94e5816aec25fc'
+    oldFile: !uuid 'f0069a983060ff81475464494788d00d53ec3f76'
-  /dolphinscheduler-spi/src:
+  /dolphinscheduler-dist/release-docs/LICENSE:
-    newFile: !uuid 'd4086106cd0a3276c9ca5e7150820028e1796072'
+    newFile: !uuid '1acb320f67754c3cc9514716d228b4775ff425b6'
-    oldFile: !uuid 'ebdf7fa985536e0cf241622489b52768bf971d85'
+    oldFile: !uuid '23f2d1b31382d79e49eca6215a5c57db85a7677d'
-  /dolphinscheduler-spi/src/main:
+  /dolphinscheduler-dist/release-docs/licenses:
-    newFile: !uuid 'fad77b4baca0651cf0f05a6589a207a7f0a47cac'
+    newFile: !uuid 'be8730bb8b0083d9aa05cb6ab60b7d725c8c1026'
-    oldFile: !uuid 'a023c3af47a60f23018ce3d11b1b34f8c21553c2'
+    oldFile: !uuid '1cc3533782722bb55d514d41fee10fdfde4187ed'
-  /dolphinscheduler-spi/src/main/java:
+  /dolphinscheduler-dist/release-docs/licenses/LICENSE-hbase-noop-htrace.txt:
-    newFile: !uuid '4e20f0232ec2d6ded4dfe96756603f08ca583a6c'
+    newFile: !uuid '9c8f3ea0871e0bfe81da0fa6e7c1d7d156dc380e'
-    oldFile: !uuid 'df1db6bde0a0668a5170f2143ab763c3f3282987'
+    oldFile: null
-  /dolphinscheduler-spi/src/main/java/org:
+  /dolphinscheduler-master:
-    newFile: !uuid '1679cd1d7b3c41e7ad4ca4ebf1e9f7978b5fbdfe'
+    newFile: !uuid '4d7839ce9793f91be648e3b8d861b7d370f55f86'
-    oldFile: !uuid '540a3761b92edc2ee0472536d6b868c5d7ff5af9'
+    oldFile: !uuid 'aa94ace3201b16fe8ee098511d427ac46b8400bd'
-  /dolphinscheduler-spi/src/main/java/org/apache:
+  /dolphinscheduler-master/pom.xml:
-    newFile: !uuid 'b29882ce166225ffe3c7cd0b80b3bef912a9c5ab'
+    newFile: !uuid '9294794a76f5901d8ee20a0a5ee5d49bf71c70da'
-    oldFile: !uuid '9c4d6410c3d953fa5bb1ac849eeec6f6e379974c'
+    oldFile: !uuid 'dcb8203a2292fac37fb661f01ed2292843856cd5'
-  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler:
+  /dolphinscheduler-server:
-    newFile: !uuid 'd2fda2b98d3ea4b5ef6d097764e9932153ce55c1'
+    newFile: !uuid 'de37aedd37f7ccf93e7f398689de3fd93c51091d'
-    oldFile: !uuid '1b6e32cbac343aaa3badb5a3f9b5e75783fb04c8'
+    oldFile: !uuid '6ad889a4ae9ef38c2fbe49d9564658bff30ddbdb'
-  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi:
+  /dolphinscheduler-server/pom.xml:
-    newFile: !uuid '380dd4e9ee2a4677b4fe8ba3ea839a4a5f5e230f'
+    newFile: !uuid '40c8d166b7cbbe7f2dd4ffa69ed3c7edc3a2b9ec'
-    oldFile: !uuid '777b09f434158cd5344ea7515dd89071ac0bc095'
+    oldFile: !uuid '780624dbaca507c42f36d912fd4a4684bed42957'
-  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums:
+  /tools:
-    newFile: !uuid '07b0fd2ec245168960f43c736abf1e1d72b8b661'
+    newFile: !uuid 'e35fe907abe1b36f5f7d040466dd6c5f508f9d6d'
-    oldFile: !uuid '1199e639401d83039a1953a615a74c16c7a1408c'
+    oldFile: !uuid 'dab92476f42bd33514ad4903b137e3e166361e2b'
-  /dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java:
+  /tools/dependencies:
-    newFile: !uuid '99c5ec81876afb75f8caf435481a296928d70a23'
+    newFile: !uuid '6f7cddf6b83d7c328fba3a9f326738ada53b7757'
-    oldFile: !uuid 'c1e0144448aec669d16a977edd01e74d73da66fd'
+    oldFile: !uuid 'd8f069f0185b2ea20e3e8e4951a21da8be346275'
-  /dolphinscheduler-task-plugin:
+  /tools/dependencies/known-dependencies.txt:
-    newFile: !uuid 'e23ea2d605d661ec899be95146540a701028473d'
+    newFile: !uuid '7e50034b67c1e3cc8b03bbbdc2af04dd3bb64108'
-    oldFile: !uuid 'ab14d24ec15d26ef7cefccf8c3fff917b7973013'
+    oldFile: !uuid 'df1129c4d7b51f8a4713b6cd613e42d9e1f72ebb'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api:
+gitCommitId: !uuid 'cf5a8894e2ac7b73b59544737a0380230dbf30ac'
-    newFile: !uuid '69763dd23b779572321927d46706f246cb48564d'
-    oldFile: !uuid 'f6452f013abcc24f94b2949046d615c456076161'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src:
-    newFile: !uuid '3992e1a41a979bc29e7bea063fa19bb170b0867f'
-    oldFile: !uuid 'ad570d1ae9825ce99795a136ccc7f42142626737'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main:
-    newFile: !uuid 'b09429fcb4e0dd78625426575b59d94168566a4f'
-    oldFile: !uuid '04c1cecb516ee9a36f8d0dbbf628351f8c47bc5e'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java:
-    newFile: !uuid '07a5f2c3fcd7c164d89f642c61f766506d89b625'
-    oldFile: !uuid 'e4711ad5f61209e8509d5113dfa5fa0b58b2e626'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org:
-    newFile: !uuid 'a846dc0d85ac7e6b78b6ebc81347f9fe27c3df6d'
-    oldFile: !uuid 'd8c1d226909b27a6131711fc4beed546c9f7334b'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache:
-    newFile: !uuid 'a8d19058317dfb13d1b0bcc2f6a912cd4ec64225'
-    oldFile: !uuid 'c0d01fd26286ef4940a81e4f372730a2034cde1a'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '868f0b9581d751f964576cde5c61e5c607e77404'
-    oldFile: !uuid '3926ff45b5f0b08b5ad49304f1113e0ae2be480b'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin:
-    newFile: !uuid 'f8570f999bc55de0f6a7e78dabd154ea8ad8c065'
-    oldFile: !uuid '7d283acd132d9c02c28a17093f8ad0016ca04097'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task:
-    newFile: !uuid 'b7d4020b0489cd56cdcbf9320f3478ad3a73b4e9'
-    oldFile: !uuid '0e93a01a10b70b395cce5ca1e32322d2bb45c76a'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api:
-    newFile: !uuid 'e18bbfb417074dfd518cbc0705c71240504dd94c'
-    oldFile: !uuid 'c181ea84a3e8506645fbbdfe2ff2a0104b976266'
-  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters
-  : newFile: !uuid '545a4be3b6a882ab5fa107fa21fe2a02b2bf4d1d'
-    oldFile: !uuid 'f4696de3074f4819c16fae72de3ab1640a2b75ac'
-  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/SqlParameters.java
-  : newFile: !uuid 'b3e2df055d1b6374e0775ec07b2fd322793f4923'
-    oldFile: !uuid '2bb7822a8788fcd290d997128612d9abc19f8d37'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql:
-    newFile: !uuid 'ed4f383756205eedfaa72b0f99fe9716684b77a6'
-    oldFile: !uuid '0255a3a007b3ad285c40ca71cc9723a11627f345'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src:
-    newFile: !uuid 'ab1e360eac5f9dc40b722c220db6905c1db41b5a'
-    oldFile: !uuid '9de0090bcfb0c879934ba627fad8a22130d8710d'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main:
-    newFile: !uuid 'c7137242ce93a4d4d06ad453b446cfa7062e7319'
-    oldFile: !uuid '5262b0ce0c638d4769dbfb0f7473177906178e7d'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java:
-    newFile: !uuid '4b8f621ee9da40c679e2cffed57560998538b4e9'
-    oldFile: !uuid '3121ccaf60f6d79d7a1e69813cf82bf9f5148e32'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org:
-    newFile: !uuid '89f5d1d5d13a722141124dc91b24960921f9a4f1'
-    oldFile: !uuid '7e308f0ae1e90e517cf211ca3b18df2001623d2f'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache:
-    newFile: !uuid '949b47c36d6716f16ad4e342e63955ba1d908bac'
-    oldFile: !uuid 'b67d906597d88ab9d913a61ca23bc9007b47fe6a'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '355078005cfed694be6e49d918f936bd7b98a19e'
-    oldFile: !uuid 'c5f1e5d3c121b0d3f3d679d35a1e16bdd675baa7'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin:
-    newFile: !uuid 'e21155f92f29026fd42932d137fceed6784d16f0'
-    oldFile: !uuid '73ecb1479cf2479e54835cc2a8a5a3777828cf94'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task:
-    newFile: !uuid '15e6acb79b81387d164ed0168c0a9575ce9a6407'
-    oldFile: !uuid 'ce90f5e5db08fd94bd771d39a5944c2df8be83a6'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql:
-    newFile: !uuid 'bde8de59921b8795a3c972f9adf0e5cc2b144bfe'
-    oldFile: !uuid 'd7d713ae82ef28aff2b9f08b6e517817a6794da6'
-  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlSplitter.java
-  : newFile: null
-    oldFile: !uuid '0271b7c341da61d33e36c08b91179b0aff79d5b0'
-  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
-  : newFile: !uuid '2f766cca7f30daff8faf01144dc98ffd302470b6'
-    oldFile: !uuid 'f58817efd19ebb8961742cb81470824778ff88f0'
-  /dolphinscheduler-ui:
-    newFile: !uuid 'd16e20ccb9e9e913e840a254b76b9e0456152842'
-    oldFile: !uuid 'cb723bc988e9de658a72dfc65d11dcc07bcac29a'
-  /dolphinscheduler-ui/src:
-    newFile: !uuid 'ce90f2c4de3a00a75eeca913a23bada83ae4d89b'
-    oldFile: !uuid '5585b7a398495b798633368179a059361efd8a59'
-  /dolphinscheduler-ui/src/locales:
-    newFile: !uuid '949bcff8286b083e59f864e3613c85d7467232cd'
-    oldFile: !uuid 'f0aea8915628f8de08d93b472cfe238c73e3fd11'
-  /dolphinscheduler-ui/src/locales/en_US:
-    newFile: !uuid 'd4146291e261f56d68825832520c490b54c1e535'
-    oldFile: !uuid '1dbd058ff2617bc8306a01208a5fe10be8ed2805'
-  /dolphinscheduler-ui/src/locales/en_US/project.ts:
-    newFile: !uuid '74218748a6d28378964285e4071e3353b402525e'
-    oldFile: !uuid '3697187a9017c0acce34ddf5485b9f8618a5e92b'
-  /dolphinscheduler-ui/src/locales/zh_CN:
-    newFile: !uuid 'bed70803fe68b0f4eac942600a0d37beea05f122'
-    oldFile: !uuid '1157d8682cdedc0a40cd9c27584d12f1df38b343'
-  /dolphinscheduler-ui/src/locales/zh_CN/project.ts:
-    newFile: !uuid '6ea2c23a962c1a0fabb70dd34f13bdc3f1f9399d'
-    oldFile: !uuid '071a49e2328db5617fc8c8667f5aa0ed5cfbdb2a'
-  /dolphinscheduler-ui/src/views:
-    newFile: !uuid '567c71369da9c71c1826aa36be4aef7d903846db'
-    oldFile: !uuid '5583b419caade2c860c277c5fbc1f52e21ff44ce'
-  /dolphinscheduler-ui/src/views/projects:
-    newFile: !uuid 'ec8e7908358072c308ea2073009165f8aaf38135'
-    oldFile: !uuid 'c45f61a93cd2482ec5352d7f4ceffb2350a2705a'
-  /dolphinscheduler-ui/src/views/projects/task:
-    newFile: !uuid '9d631a00b4f4c9a21b63e36e0d5dadf5eeae4b09'
-    oldFile: !uuid 'c75bfa899e54f048c089fecae149ad1e1f1f300e'
-  /dolphinscheduler-ui/src/views/projects/task/components:
-    newFile: !uuid 'a4e041895d7ce94b1f13e6fbb33632cb9e39dd13'
-    oldFile: !uuid '8e13bc2e66eb10da57d528b7c0d3a10746336c10'
-  /dolphinscheduler-ui/src/views/projects/task/components/node:
-    newFile: !uuid '4b07cc8347e8e24b2df4a733c42469ebeb62c81c'
-    oldFile: !uuid 'b33cedf0417ee92c008c3f276c29562cb2a5376e'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/fields:
-    newFile: !uuid '8f9ebaa44e5b7b5cfaf38eddcbade0ec38058d52'
-    oldFile: !uuid '4dc1b0ede166732785ba0e6d0f5f8ae67ce7404f'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sql-type.ts:
-    newFile: !uuid '1e93c9e2087c3cd029db39840b17d3f3fc64dfc5'
-    oldFile: !uuid '0fcc5a3e6284c4d7481afdcb8773edadd2231dcd'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts:
-    newFile: !uuid '5e3a3c7d9983b3c4c5e93d0165829fd49b076921'
-    oldFile: !uuid 'edb6cd4043668b6370afa14f910f059281efe4c0'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/tasks:
-    newFile: !uuid '0112ead1cc5ad05c74343380296eaefc1d93b848'
-    oldFile: !uuid 'b09f812f2041d468af15a344afa9e37967ec6ab8'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sql.ts:
-    newFile: !uuid '8e235ac3d09719b1dd8bb8c03cebba4a6f067083'
-    oldFile: !uuid 'd477d340c9d8226e95d115bab2d22625c0650f56'
-  /dolphinscheduler-ui/src/views/projects/task/components/node/types.ts:
-    newFile: !uuid 'e8732f3f34a31adabc78a5c4265fcea8eb30bf78'
-    oldFile: !uuid 'c013a7b2fbc7ce5c8f2d25806ae9d2e07580fdfd'
-gitCommitId: !uuid 'e6832220c35680aedae98d5ea88758b5d380bdfa'
 renames: {
   }
-revisionId: 3530
+revisionId: 3531