Browse Source

#4164: [CI] [Test] Try to fix jar conficts (#14407)

* try to fix jar conficts
git-as-svn/v1/dev
xiangzihao 1 year ago committed by GitHub
parent
commit
17a8ad79dd
  1. 2
      commit.ref
  2. 55
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit 9c92b4b240a30e54464509b2e696e3310894507a
Subproject commit 091d869d66a880af0888d7fd991099b6d1f87f6e

55
commit.yml

@ -2,43 +2,22 @@
branches: {
}
fileChange:
/dolphinscheduler-task-plugin:
newFile: !uuid '4fde8f008b21cc10a4165642d055aefb20b2d6a4'
oldFile: !uuid 'ae45f73404c5a5472a17096f51308b194de75b08'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax:
newFile: !uuid 'a49184a3ee3524985d63bd4985e8780bdede8a20'
oldFile: !uuid 'cbfbc540b78cea16d06da5a5222b2dcb7956a3da'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src:
newFile: !uuid '1a1fdcf06b5a5705da716618736e0a9fc06712b9'
oldFile: !uuid '76ec8539f8b4ee8514d8a98c5db0fd2383ca302b'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main:
newFile: !uuid '12b5075d5af3c8973045c948aec1666a93643fc3'
oldFile: !uuid '4c8831a6b1e439a4114ca1a2ec530062948df3c0'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java:
newFile: !uuid '92394ebecedb4f7f985b06a2131d0f984d9e3b0a'
oldFile: !uuid 'bf47b28b3876d03eaac8e729fa7bb84decb5e172'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org:
newFile: !uuid '89ad6ee6a3d62299639dab057987c3988ba10bd1'
oldFile: !uuid '99697fe0050870331bc4c99940b5ea7b95427c49'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache:
newFile: !uuid 'db88b45f424b7ba6ca1b2043f0e1706b681b4b49'
oldFile: !uuid 'c90a2fc876be8c04c558a86fac333cf45f4fb804'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '73465525f74f130c6235152b1ee8845dbe28c9c4'
oldFile: !uuid '6ddc29996ec22b245a0e791da6363a6d51e2bade'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin:
newFile: !uuid 'af3c480d6da488c8a9982d6b964c09466e19e2c1'
oldFile: !uuid 'b473a8b3dc29b0c5b911a1e20f8dab227689b06a'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task:
newFile: !uuid '159bd05d5bef723c375d7ad2344d1ba71548d882'
oldFile: !uuid '60e79fc07f04a98c067b253f3d92b9c002a1f4d7'
/dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax:
newFile: !uuid '4f5d5d9fca1a770ce26fa3934884db8ca6880fd4'
oldFile: !uuid 'c14fc9caa3ba310bf0ce084515edc68a34a4e695'
? /dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxUtils.java
: newFile: !uuid '33b1f2779eaa9ccf84517d13d36977341224936e'
oldFile: !uuid '30b9224d96167e1c9236e98e6aa1d3ede176cdba'
gitCommitId: !uuid '9c92b4b240a30e54464509b2e696e3310894507a'
/dolphinscheduler-bom:
newFile: !uuid '8e267d2cafefc9a206219e67a43aacdff536b420'
oldFile: !uuid '5d3d2f79098c63b44462f13900d15c4be315995c'
/dolphinscheduler-bom/pom.xml:
newFile: !uuid 'af622b1a86871bc85dc44dcaa7ed5a5ec91bcc80'
oldFile: !uuid 'fd5764e2e1c6df86fbfa1eb4b395cd70a7bb9297'
/tools:
newFile: !uuid '996ce49242319075257a9d830e233b4c25c606f1'
oldFile: !uuid 'cd5917199f1eb890ab42ee8d5bdf766512d3eb2f'
/tools/dependencies:
newFile: !uuid '8d8ac1f6a1cd095642ca4c2bf778caeb1a5a90ac'
oldFile: !uuid 'e3fa17d40111bab39fd234fa1d9f14dc2bcaa21a'
/tools/dependencies/known-dependencies.txt:
newFile: !uuid '3137fa83da4aea95f19c0c57fbe65d3f903a125b'
oldFile: !uuid '11d061d2c8efdee3503f6526f8ed13c1f23514ad'
gitCommitId: !uuid '091d869d66a880af0888d7fd991099b6d1f87f6e'
renames: {
}
revisionId: 4163
revisionId: 4164

Loading…
Cancel
Save