rinoux
30d122e9a0
REPORT-70827 & REPORT-70810 兼容性问题
3 years ago
superman
ae05b5b5bf
Merge pull request #5680 in CORE/base-third from release/11.0 to feature/x
...
* commit 'dd767a292e8c028770c485bf29d3bb338c509968':
3 years ago
superman
dd767a292e
Merge pull request #5679 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'c57afa68ce7fd573b42525b21d7b8683539df3f8':
3 years ago
superman
c57afa68ce
Merge pull request #5678 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'c7b4826b4bf505003adecb695ad6949d47979c3c':
3 years ago
superman
c7b4826b4b
Merge pull request #5671 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '64f0d0f9c34c3eef44b3a8a5267738f15bb3a0c1':
3 years ago
superman
23b65ac3b6
Merge pull request #5652 in CORE/base-third from release/11.0 to feature/x
...
* commit '50398060ed515af79f94512295d7d6f578252f95':
REPORT-69942 更新Druid到1.2.9
REPORT-69942 更新Druid到1.2.9
3 years ago
superman
50398060ed
Merge pull request #5651 in CORE/base-third from final/11.0 to release/11.0
...
* commit '64f0d0f9c34c3eef44b3a8a5267738f15bb3a0c1':
3 years ago
superman
64f0d0f9c3
Merge pull request #5650 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'ad115f8bc7701a52bbdbf65d403843b13585d96b':
3 years ago
superman
ad115f8bc7
Merge pull request #5643 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '8c7338f99594aaa661290394d6cb23e5aefa2edf':
3 years ago
rinoux
b5e90b90a1
Pull request #5632 : REPORT-69942 更新Druid到真1.2.9
...
Merge in CORE/base-third from ~RINOUX/base-third:release/11.0 to release/11.0
* commit '57be5fa982da316ddfe9682c72c228994d5d17e0':
REPORT-69942 更新Druid到1.2.9
REPORT-69942 更新Druid到1.2.9
3 years ago
rinoux
57be5fa982
REPORT-69942 更新Druid到1.2.9
3 years ago
rinoux
086e32eaba
REPORT-69942 更新Druid到1.2.9
3 years ago
abel.chen
3e2c0129d3
Pull request #5613 : REPORT-70032 & REPORT-70020 poi升级适配
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit 'e86b893d63db60eb16cdfbf277a8d34b39ede756':
REPORT-70032 & REPORT-70020 poi升级适配
3 years ago
abel
e86b893d63
REPORT-70032 & REPORT-70020 poi升级适配
3 years ago
abel.chen
3cf8919229
Pull request #5612 : REPORT-70032 & REPORT-70020 poi升级适配,富文本流式导出问题
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit 'd23a95ed10916a6a41074a806f91bee4e9643945':
REPORT-70032 & REPORT-70020 poi升级适配
3 years ago
abel
d23a95ed10
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
abel
9ac8ccf2b0
REPORT-70032 & REPORT-70020 poi升级适配
3 years ago
superman
96c746ab87
Merge pull request #5611 in CORE/base-third from release/11.0 to feature/x
...
* commit 'a46f2b844a89c4cfe3a85e24d18cab24cbab99b0':
3 years ago
superman
a46f2b844a
Merge pull request #5610 in CORE/base-third from final/11.0 to release/11.0
...
* commit '8c7338f99594aaa661290394d6cb23e5aefa2edf':
3 years ago
superman
8c7338f995
Merge pull request #5602 in CORE/base-third from release/11.0 to final/11.0
...
* commit 'd5a95160620a3942fb6c5e4ee34705690de96e81':
3 years ago
abel.chen
f8967941fc
Pull request #5553 : REPORT-70000 & REPORT-69963 & REPORT-69965
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit 'a33d9f392c2daeaec2e87b52fa4ccaf8dc181e09':
改下打包文件
REPORT-70000
3 years ago
abel
a33d9f392c
改下打包文件
3 years ago
abel
ea0c626a2c
Merge branch 'feature/x' of https://code.fineres.com/scm/~abel.chen/base-third into feature/x
3 years ago
abel
b5bcb1f5c5
REPORT-70000
3 years ago
superman
12fff02294
Merge pull request #5522 in CORE/base-third from release/11.0 to feature/x
...
* commit 'd5a95160620a3942fb6c5e4ee34705690de96e81':
3 years ago
superman
d5a9516062
Merge pull request #5521 in CORE/base-third from final/11.0 to release/11.0
...
* commit '7475a50ff164b32870169f8af96069f91b52608e':
3 years ago
superman
7475a50ff1
Merge pull request #5520 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'c532313de74dcc6b07a6cb9425ace83123b3f2ec':
3 years ago
superman
c532313de7
Merge pull request #5513 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '9505eead6518416aae4cf634ada1da907b09ad9e':
3 years ago
superman
6f85f66d47
Merge pull request #5512 in CORE/base-third from release/11.0 to feature/x
...
* commit 'cbead5088cadc4edf16d8a1ebac7d02df63d23dc':
3 years ago
superman
cbead5088c
Merge pull request #5511 in CORE/base-third from final/11.0 to release/11.0
...
* commit '9505eead6518416aae4cf634ada1da907b09ad9e':
3 years ago
superman
9505eead65
Merge pull request #5510 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'd87da1f6fdf64f14b9122dbcf54a34334c79ae53':
3 years ago
superman
d87da1f6fd
Merge pull request #5503 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '27606be113e3fbda1c922f8b0ea9c6f6b83fbfcb':
REPORT-67908【迭代】tools内置的日志打印规范下
REPORT-67981 feature:删除对于IBM相关jdk的支持 【问题原因】ibm-jdk和openj9的jdk对于OpenJ9VirtualMachineDescriptor、OpenJ9VirtualMachine、OpenJ9AttachProvider这几个类的改动频繁不适合内置,暂不支持 【改动思路】删除支持,输出错误日志
REPORT-67981 bugfix:【迭代】websphere容器,删掉tools后启动失败,进入部署向导 【问题原因】bugfix,循环没有退出 【改动思路】break
REPORT-67847【迭代】windows环境,没有attach,放了tools的情况工程启动失败进入部署向导 【问题原因】放了tools.jar但没有attach.dll的时候虽然使用自定义类加载器,但是因为双亲委派的缘故,加载到了tools.jar中的virtualmachine 【改动思路】使用自定义的类加载器,并且打破双亲委派机制,判断为sun.tools.attach开头的包,都直接加载,不找父亲了
KERNEL-10318 FRBI部署脱离tools.jar
误改pom
KERNEL-10318 FRBI部署脱离tools.jar
3 years ago
abel.chen
ef564fc61b
Pull request #5491 : DEC-15251 poi升级
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit '648f95db9c656665b1bc465425873c555200ce93':
依赖错了
3 years ago
abel
648f95db9c
依赖错了
3 years ago
abel.chen
6314e44481
Pull request #5490 : DEC-15251 poi升级少了编译依赖
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit '3d2e13faa898feb8d85b71b067f3167eb19ad68c':
DEC-15251 poi升级少了编译依赖
3 years ago
abel
3d2e13faa8
DEC-15251 poi升级少了编译依赖
3 years ago
abel.chen
8356196268
Pull request #5489 : DEC-15251 升级poi4.1.2
...
Merge in CORE/base-third from ~ABEL.CHEN/base-third:feature/x to feature/x
* commit 'f47681cf53bcf44863e8e36d526a49237610bde5':
poi升级
poi升级版本4.1.2
3 years ago
abel
f47681cf53
poi升级
3 years ago
abel
4119614fb6
poi升级版本4.1.2
3 years ago
superman
adeeb160df
Merge pull request #5488 in CORE/base-third from release/11.0 to feature/x
...
* commit '1dca505c9089d1b631a64936c6124524b10416ee':
3 years ago
superman
1dca505c90
Merge pull request #5487 in CORE/base-third from final/11.0 to release/11.0
...
* commit '27606be113e3fbda1c922f8b0ea9c6f6b83fbfcb':
3 years ago
Kara
27606be113
Pull request #5479 : 无jira任务, release/11.0 合 final/11.0
...
Merge in CORE/base-third from release/11.0 to final/11.0
* commit '0d4cc083b2316ebbaab45efd3ca6d6ca61d74110':
REPORT-67908【迭代】tools内置的日志打印规范下
REPORT-67981 feature:删除对于IBM相关jdk的支持 【问题原因】ibm-jdk和openj9的jdk对于OpenJ9VirtualMachineDescriptor、OpenJ9VirtualMachine、OpenJ9AttachProvider这几个类的改动频繁不适合内置,暂不支持 【改动思路】删除支持,输出错误日志
REPORT-67981 bugfix:【迭代】websphere容器,删掉tools后启动失败,进入部署向导 【问题原因】bugfix,循环没有退出 【改动思路】break
REPORT-67847【迭代】windows环境,没有attach,放了tools的情况工程启动失败进入部署向导 【问题原因】放了tools.jar但没有attach.dll的时候虽然使用自定义类加载器,但是因为双亲委派的缘故,加载到了tools.jar中的virtualmachine 【改动思路】使用自定义的类加载器,并且打破双亲委派机制,判断为sun.tools.attach开头的包,都直接加载,不找父亲了
KERNEL-10318 FRBI部署脱离tools.jar
误改pom
KERNEL-10318 FRBI部署脱离tools.jar
3 years ago
superman
a98dd9c051
Merge pull request #5423 in CORE/base-third from release/11.0 to feature/x
...
* commit '0d4cc083b2316ebbaab45efd3ca6d6ca61d74110':
REPORT-67908【迭代】tools内置的日志打印规范下
3 years ago
zhouping
0d4cc083b2
Pull request #5414 : REPORT-67908【迭代】tools内置的日志打印规范下
...
Merge in CORE/base-third from ~ZHOUPING/base-third:release/11.0 to release/11.0
* commit '4154d95f2ef56684cba25385cbca72673dc9445f':
REPORT-67908【迭代】tools内置的日志打印规范下
3 years ago
zhouping
4154d95f2e
REPORT-67908【迭代】tools内置的日志打印规范下
3 years ago
superman
82349e59eb
Merge pull request #5395 in CORE/base-third from release/11.0 to feature/x
...
* commit '968bdc6950d3a0420f2aa5b17354393a743143c0':
3 years ago
superman
968bdc6950
Merge pull request #5384 in CORE/base-third from feature/x to release/11.0
...
* commit '7d1ae32c5876d698844ae459a487d6da36d4bb5e':
REPORT-67981 feature:删除对于IBM相关jdk的支持 【问题原因】ibm-jdk和openj9的jdk对于OpenJ9VirtualMachineDescriptor、OpenJ9VirtualMachine、OpenJ9AttachProvider这几个类的改动频繁不适合内置,暂不支持 【改动思路】删除支持,输出错误日志
REPORT-67981 bugfix:【迭代】websphere容器,删掉tools后启动失败,进入部署向导 【问题原因】bugfix,循环没有退出 【改动思路】break
REPORT-67847【迭代】windows环境,没有attach,放了tools的情况工程启动失败进入部署向导 【问题原因】放了tools.jar但没有attach.dll的时候虽然使用自定义类加载器,但是因为双亲委派的缘故,加载到了tools.jar中的virtualmachine 【改动思路】使用自定义的类加载器,并且打破双亲委派机制,判断为sun.tools.attach开头的包,都直接加载,不找父亲了
KERNEL-10318 FRBI部署脱离tools.jar
误改pom
KERNEL-10318 FRBI部署脱离tools.jar
3 years ago
superman
7d1ae32c58
Merge pull request #5347 in CORE/base-third from release/11.0 to feature/x
...
* commit '44f684e68475266d8ea7ff2740202df5b935851a':
3 years ago
superman
44f684e684
Merge pull request #5346 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'bed535c7ef3aedadfb84ffef95508feb362f83e2':
3 years ago
superman
bed535c7ef
Merge pull request #5345 in CORE/base-third from persist/11.0 to final/11.0
...
* commit 'da182264612b21fa5c29bee7bcfbf65fa7189a10':
3 years ago