Commit 144988f6 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '300-jetty-upgrade' into 'main'

Resolve "Jetty upgrade"

Closes #300

See merge request grin-global/grin-global-server!401
parents 12d758a8 a5ecd470
......@@ -14,7 +14,7 @@ RUN mv WEB-INF/lib ..
# RUN find .
FROM jetty:9.4.46-jre11 as jetty
FROM jetty:10.0.9-jre11 as jetty
LABEL maintainer "Matija Obreza <matija.obreza@croptrust.org>"
ENV USER=jetty
......
......@@ -66,7 +66,7 @@
<application.blocks.version>4.0-SNAPSHOT</application.blocks.version>
<!--Container -->
<jetty.version>9.4.46.v20220331</jetty.version>
<jetty.version>10.0.9</jetty.version>
<jstl.version>1.2</jstl.version>
<servlet-api.version>4.0.1</servlet-api.version>
<jsp-api.version>2.3.3</jsp-api.version>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment