Resolve dependencies conflicts

[terrymanu]

No description provided.

[codecov-commenter]

Codecov Report

Merging #2353 (5ebea29) into master (a8ba448) will not change coverage.
Report is 9 commits behind head on master.
The diff coverage is 70.00%.

@@            Coverage Diff            @@
##             master    #2353   +/-   ##
=========================================
  Coverage     80.10%   80.10%           
- Complexity     1113     1114    +1     
=========================================
  Files           204      205    +1     
  Lines          3821     3821           
  Branches        445      445           
=========================================
  Hits           3061     3061           
  Misses          570      570           
  Partials        190      190           

Files	Coverage Δ
...icjob/tracing/rdb/storage/RDBStorageSQLMapper.java	100.00% <100.00%> (+10.00%)	⬆️
...b/tracing/rdb/type/TracingStorageDatabaseType.java	100.00% <ø> (ø)
...g/rdb/type/impl/DB2TracingStorageDatabaseType.java	66.66% <100.00%> (ø)
...ng/rdb/type/impl/H2TracingStorageDatabaseType.java	100.00% <100.00%> (ø)
...rdb/type/impl/MySQLTracingStorageDatabaseType.java	66.66% <100.00%> (ø)
...db/type/impl/OracleTracingStorageDatabaseType.java	66.66% <100.00%> (ø)
...ype/impl/PostgreSQLTracingStorageDatabaseType.java	66.66% <100.00%> (ø)
...type/impl/SQLServerTracingStorageDatabaseType.java	50.00% <100.00%> (ø)
.../kernel/tracing/yaml/YamlTracingConfiguration.java	50.00% <ø> (+50.00%)	⬆️
...b/type/impl/DefaultTracingStorageDatabaseType.java	0.00% <0.00%> (ø)
... and 2 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more