Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge 

Signed-off-by: Olivier Lamy <olamy@pop-os.localdomain>
This commit is contained in:
Olivier Lamy 2023-06-02 22:29:07 +10:00
parent b434ecf068
commit a8415e02bb
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -119,13 +119,8 @@
<springboot.version>2.1.1.RELEASE</springboot.version>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
<<<<<<< HEAD
<testcontainers.version>1.18.0</testcontainers.version>
<weld.version>4.0.3.Final</weld.version>
=======
<testcontainers.version>1.18.3</testcontainers.version>
<weld.version>3.1.9.Final</weld.version>
>>>>>>> jetty-10.0.x
<weld.version>4.0.3.Final</weld.version>
<wildfly.common.version>1.6.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.1.0.Final</wildfly.elytron.version>
<xmemcached.version>2.4.7</xmemcached.version>