9 Commits

Author SHA1 Message Date
openeuler-ci-bot
38a799dfcd
!20 同步master分支添加与glassfish-servlet-api的冲突,并提供glassfish-servlet-api
From: @wk333 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
2023-04-12 02:13:00 +00:00
wk333
d1889de0ed Add Confilict glassfish-servlet-api due to provides same file glassfish-servlet-api.jar 2023-04-12 09:44:40 +08:00
openeuler-ci-bot
436d0be576
!15 Change source
From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-11-17 01:14:45 +00:00
wk333
016d96c2b8 Change source 2022-11-16 17:09:32 +08:00
openeuler-ci-bot
21d9a8b4fe
!8 [sync] PR-7: 【安装冲突】openEuler:22.03:LTS分支与glassfish-servlet-api包安装冲突
From: @openeuler-sync-bot 
Reviewed-by: @wangchong1995924 
Signed-off-by: @wangchong1995924
2022-02-14 02:42:38 +00:00
wang--ge
5c5fb0c8d5 fix instal conflict
(cherry picked from commit d3e8696bf91d9121591d85ec3c3df5bc9effd3f5)
2022-02-14 10:16:58 +08:00
openeuler-ci-bot
a2233a0c9f !6 [sync] PR-1: Init jakarta-servlet
Merge pull request !6 from openeuler-sync-bot/sync-pr1-openEuler-20.03-LTS-SP1-to-openEuler-22.03-LTS-Next
2021-12-25 02:38:41 +00:00
houyingchao
61accc61ca Init jakarta-servlet
(cherry picked from commit c570ea3ebc65148bc9ab3ecb8e4111ae5572fd57)
2021-12-24 14:34:26 +08:00
openeuler-ci-bot
18e25fd61f
Initial commit 2021-12-23 09:10:04 +00:00