diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 1859782194d8..581fb98a7e47 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -14,7 +14,7 @@
${basedir}/target/jetty-home
${basedir}/target/jetty-home-sources
- 1.0.4
+ 2.0.1
true
@@ -85,43 +85,6 @@
-
- copy-setuid-deps
- generate-resources
-
- copy
-
-
-
-
- org.eclipse.jetty.toolchain.setuid
- jetty-setuid-java
- ${jetty-setuid-version}
- jar
- true
- ${assembly-directory}/lib/setuid
-
-
- org.eclipse.jetty.toolchain.setuid
- libsetuid-linux
- ${jetty-setuid-version}
- so
- true
- ${assembly-directory}/lib/setuid
- libsetuid-linux.so
-
-
- org.eclipse.jetty.toolchain.setuid
- libsetuid-osx
- ${jetty-setuid-version}
- so
- true
- ${assembly-directory}/lib/setuid
- libsetuid-osx.so
-
-
-
-
copy-jetty-core-deps
generate-resources
@@ -304,7 +267,7 @@
- org.eclipse.jetty, org.eclipse.jetty.websocket
+ org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.toolchain.setuid
jetty-infinispan-embedded,jetty-infinispan-remote,jetty-test-helper,alpn-api,javax.security.auth.message,javax.activation
config
@@ -629,18 +592,21 @@
jetty-nosql
true
-
org.eclipse.jetty.demos
jetty-demo-handler
${project.version}
true
-
org.eclipse.jetty
jetty-keystore
true
+
+ org.eclipse.jetty.toolchain.setuid
+ jetty-setuid-jna
+ ${jetty-setuid-version}
+
diff --git a/jetty-home/src/main/resources/etc/jetty-setuid.xml b/jetty-home/src/main/resources/etc/jetty-setuid.xml
deleted file mode 100644
index 3c70cbb266f3..000000000000
--- a/jetty-home/src/main/resources/etc/jetty-setuid.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jetty-home/src/main/resources/modules/setuid.mod b/jetty-home/src/main/resources/modules/setuid.mod
deleted file mode 100644
index 977cbb818690..000000000000
--- a/jetty-home/src/main/resources/modules/setuid.mod
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
-
-[description]
-Enables the UNIX setUID configuration.
-The server may be started as root to open privileged ports/files before
-changing to a restricted user (e.g. Jetty).
-
-[depend]
-server
-
-[lib]
-lib/setuid/jetty-setuid-java-1.0.4.jar
-
-[xml]
-etc/jetty-setuid.xml
-
-[ini-template]
-## SetUID Configuration
-# jetty.setuid.startServerAsPrivileged=false
-# jetty.setuid.userName=jetty
-# jetty.setuid.groupName=jetty
-# jetty.setuid.umask=002
-# jetty.setuid.clearSupplementalGroups=false