www/jetty10: Update to 10.0.16

3 files changed, 19 insertions, 14 deletions

diff --git a/www/jetty10/Makefile b/www/jetty10/Makefile
index c0ca5aa9ef8b..de1d81eec33b 100644
--- a/www/jetty10/Makefile
+++ b/www/jetty10/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	jetty
-PORTVERSION=	10.0.12
+PORTVERSION=	10.0.16
 CATEGORIES=	www java
 MASTER_SITES=	https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${PORTVERSION}/
 PKGNAMESUFFIX=	10
@@ -17,7 +17,7 @@ RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe shebangfix
 
-CONFLICTS=	jetty8.* jetty9.*
+CONFLICTS=	jetty8.* jetty9.* jetty11.* jetty12.*
 
 USE_JAVA=	yes
 NO_ARCH=	yes
diff --git a/www/jetty10/distinfo b/www/jetty10/distinfo
index c194e1d0ca69..5f97ed1b5716 100644
--- a/www/jetty10/distinfo
+++ b/www/jetty10/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666621633
-SHA256 (jetty-home-10.0.12.tar.gz) = b2ae3170a729365e05ba9da057aee5d2654d169912efec73cddc8381ac35d516
-SIZE (jetty-home-10.0.12.tar.gz) = 10955855
+TIMESTAMP = 1695045957
+SHA256 (jetty-home-10.0.16.tar.gz) = dd56e9329437e6d195113ac08c98e5f53828d7f5025a751a2a7e9baa9b86add7
+SIZE (jetty-home-10.0.16.tar.gz) = 11006912
diff --git a/www/jetty10/pkg-plist b/www/jetty10/pkg-plist
index fbc3b6e176f0..e853899f3b26 100644
--- a/www/jetty10/pkg-plist
+++ b/www/jetty10/pkg-plist
@@ -34,6 +34,7 @@
 %%APP_NAME%%/%%ETCDIR%%-jmx.xml
 %%APP_NAME%%/%%ETCDIR%%-lowresources.xml
 %%APP_NAME%%/%%ETCDIR%%-openid.xml
+%%APP_NAME%%/%%ETCDIR%%-pid.xml
 %%APP_NAME%%/%%ETCDIR%%-proxy-protocol-ssl.xml
 %%APP_NAME%%/%%ETCDIR%%-proxy-protocol.xml
 %%APP_NAME%%/%%ETCDIR%%-proxy.xml
@@ -46,12 +47,14 @@
 %%APP_NAME%%/%%ETCDIR%%-ssl-context-reload.xml
 %%APP_NAME%%/%%ETCDIR%%-ssl-context.xml
 %%APP_NAME%%/%%ETCDIR%%-ssl.xml
-%%APP_NAME%%/%%ETCDIR%%-started.xml
+%%APP_NAME%%/%%ETCDIR%%-state.xml
 %%APP_NAME%%/%%ETCDIR%%-stats.xml
 %%APP_NAME%%/%%ETCDIR%%-stop.xml
 %%APP_NAME%%/%%ETCDIR%%-test-keystore.xml
 %%APP_NAME%%/%%ETCDIR%%-threadlimit.xml
 %%APP_NAME%%/%%ETCDIR%%-threadpool.xml
+%%APP_NAME%%/%%ETCDIR%%-threadpool-virtual-preview.xml
+%%APP_NAME%%/%%ETCDIR%%-threadpool-virtual.xml
 %%APP_NAME%%/%%ETCDIR%%-unixdomain-http.xml
 %%APP_NAME%%/%%ETCDIR%%-unixsocket-forwarded.xml
 %%APP_NAME%%/%%ETCDIR%%-unixsocket-http.xml
@@ -85,10 +88,10 @@
 %%APP_NAME%%/etc/sessions/session-data-cache/xmemcached.xml
 %%APP_NAME%%/etc/webdefault.xml
 %%APP_NAME%%/etc/well-known.xml
-%%APP_NAME%%/lib/annotations/asm-9.3.jar
-%%APP_NAME%%/lib/annotations/asm-analysis-9.3.jar
-%%APP_NAME%%/lib/annotations/asm-commons-9.3.jar
-%%APP_NAME%%/lib/annotations/asm-tree-9.3.jar
+%%APP_NAME%%/lib/annotations/asm-9.5.jar
+%%APP_NAME%%/lib/annotations/asm-analysis-9.5.jar
+%%APP_NAME%%/lib/annotations/asm-commons-9.5.jar
+%%APP_NAME%%/lib/annotations/asm-tree-9.5.jar
 %%APP_NAME%%/lib/annotations/jakarta.annotation-api-1.3.5.jar
 %%APP_NAME%%/lib/apache-jsp/org.eclipse.jdt.ecj-3.26.0.jar
 %%APP_NAME%%/lib/apache-jsp/org.eclipse.%%APP_NAME%%.apache-jsp-%%PORTVERSION%%.jar
@@ -106,14 +109,13 @@
 %%APP_NAME%%/lib/http3/http3-server-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/http3/quic-common-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/http3/quic-quiche-common-%%PORTVERSION%%.jar
-%%APP_NAME%%/lib/http3/quic-quiche-foreign-incubator-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/http3/quic-quiche-jna-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/http3/quic-server-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/infinispan-common-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/infinispan-embedded-query-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/infinispan-remote-query-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/jakarta.transaction-api-1.3.3.jar
-%%APP_NAME%%/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
+%%APP_NAME%%/lib/jaspi/jakarta.security.auth.message-api-1.1.3.jar
 %%APP_NAME%%/lib/%%APP_NAME%%-alpn-client-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/%%APP_NAME%%-alpn-conscrypt-server-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/%%APP_NAME%%-alpn-java-server-%%PORTVERSION%%.jar
@@ -151,7 +153,7 @@
 %%APP_NAME%%/lib/%%APP_NAME%%-webapp-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/%%APP_NAME%%-xml-%%PORTVERSION%%.jar
 %%APP_NAME%%/lib/logging/%%APP_NAME%%-slf4j-impl-%%PORTVERSION%%.jar
-%%APP_NAME%%/lib/logging/slf4j-api-2.0.0.jar
+%%APP_NAME%%/lib/logging/slf4j-api-2.0.5.jar
 %%APP_NAME%%/lib/setuid/%%APP_NAME%%-setuid-java-1.0.4.jar
 %%APP_NAME%%/lib/websocket/%%APP_NAME%%-javax-websocket-api-1.1.2.jar
 %%APP_NAME%%/lib/websocket/websocket-core-client-%%PORTVERSION%%.jar
@@ -236,7 +238,6 @@
 %%APP_NAME%%/modules/http3.mod
 %%APP_NAME%%/modules/https.mod
 %%APP_NAME%%/modules/inetaccess.mod
-%%APP_NAME%%/modules/inetaccess/inetaccess.xml
 %%APP_NAME%%/modules/inetaccess/%%APP_NAME%%-inetaccess.xml
 %%APP_NAME%%/modules/infinispan-embedded-query.mod
 %%APP_NAME%%/modules/infinispan-embedded.mod
@@ -286,6 +287,7 @@
 %%APP_NAME%%/modules/msie.mod
 %%APP_NAME%%/modules/openid.mod
 %%APP_NAME%%/modules/openid/openid-baseloginservice.xml
+%%APP_NAME%%/modules/pid.mod
 %%APP_NAME%%/modules/plus.mod
 %%APP_NAME%%/modules/proxy-protocol-ssl.mod
 %%APP_NAME%%/modules/proxy-protocol.mod
@@ -333,11 +335,14 @@
 %%APP_NAME%%/modules/setuid.mod
 %%APP_NAME%%/modules/ssl-reload.mod
 %%APP_NAME%%/modules/ssl.mod
+%%APP_NAME%%/modules/state.mod
 %%APP_NAME%%/modules/stats.mod
 %%APP_NAME%%/modules/stop.mod
 %%APP_NAME%%/modules/test-keystore.mod
 %%APP_NAME%%/modules/threadlimit.mod
 %%APP_NAME%%/modules/threadpool.mod
+%%APP_NAME%%/modules/threadpool-virtual-preview.mod
+%%APP_NAME%%/modules/threadpool-virtual.mod
 %%APP_NAME%%/modules/unixdomain-http.mod
 %%APP_NAME%%/modules/unixsocket-forwarded.mod
 %%APP_NAME%%/modules/unixsocket-http.mod