diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 044e4a2cdd5..ddc13a6a881 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -300,6 +300,13 @@ find_file(RESTEASY_JACKSON2_PROVIDER_JAR
/usr/share/java/resteasy
)
+find_file(RESTEASY_SERVLET_INITIALIZER_JAR
+ NAMES
+ resteasy-servlet-initializer.jar
+ PATHS
+ /usr/share/java/resteasy
+)
+
find_file(JASPIC_API_JAR
NAMES
jaspic-api.jar
diff --git a/base/acme/CMakeLists.txt b/base/acme/CMakeLists.txt
index 6917f8236a8..b2c3a570450 100644
--- a/base/acme/CMakeLists.txt
+++ b/base/acme/CMakeLists.txt
@@ -51,6 +51,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-acme.jar webapp/lib/pki-acme.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/ca/CMakeLists.txt b/base/ca/CMakeLists.txt
index 90f8888b63e..accada966e0 100644
--- a/base/ca/CMakeLists.txt
+++ b/base/ca/CMakeLists.txt
@@ -63,6 +63,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-ca.jar webapp/lib/pki-ca.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/est/CMakeLists.txt b/base/est/CMakeLists.txt
index ee76a146cf8..1177837922c 100644
--- a/base/est/CMakeLists.txt
+++ b/base/est/CMakeLists.txt
@@ -55,6 +55,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-est.jar webapp/lib/pki-est.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/kra/CMakeLists.txt b/base/kra/CMakeLists.txt
index 8875b19ee2b..4820958211b 100644
--- a/base/kra/CMakeLists.txt
+++ b/base/kra/CMakeLists.txt
@@ -59,6 +59,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-kra.jar webapp/lib/pki-kra.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/ocsp/CMakeLists.txt b/base/ocsp/CMakeLists.txt
index ebea8360411..d7ac1ce4c78 100644
--- a/base/ocsp/CMakeLists.txt
+++ b/base/ocsp/CMakeLists.txt
@@ -58,6 +58,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-ocsp.jar webapp/lib/pki-ocsp.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/server-webapp/CMakeLists.txt b/base/server-webapp/CMakeLists.txt
index 918432dadce..3aa6ad33771 100644
--- a/base/server-webapp/CMakeLists.txt
+++ b/base/server-webapp/CMakeLists.txt
@@ -53,6 +53,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server-webapp.jar webapp/lib/pki-server-webapp.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/tks/CMakeLists.txt b/base/tks/CMakeLists.txt
index e10bf722a13..424bc2c8ff7 100644
--- a/base/tks/CMakeLists.txt
+++ b/base/tks/CMakeLists.txt
@@ -61,6 +61,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-tks.jar webapp/lib/pki-tks.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
install(
diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt
index 0b739766f7d..7629a3ebc55 100644
--- a/base/tps/CMakeLists.txt
+++ b/base/tps/CMakeLists.txt
@@ -57,6 +57,7 @@ add_custom_command(
COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar webapp/lib/pki-server.jar
COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-tps.jar webapp/lib/pki-tps.jar
+ COMMAND ln -sf ../../../../../../../..${RESTEASY_SERVLET_INITIALIZER_JAR} webapp/lib/resteasy-servlet-intializer.jar
)
add_custom_target(pki-tps-man ALL
diff --git a/pki.spec b/pki.spec
index 3a801520944..a8b7c35ce0b 100644
--- a/pki.spec
+++ b/pki.spec
@@ -169,7 +169,10 @@ BuildRequires: mvn(commons-net:commons-net)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
-BuildRequires: pki-resteasy >= 3.0.26
+BuildRequires: mvn(org.jboss.resteasy:resteasy-client)
+BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
+BuildRequires: mvn(org.jboss.resteasy:resteasy-jaxrs)
+BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer)
BuildRequires: jss >= 5.4
BuildRequires: tomcatjss >= 8.4
BuildRequires: ldapjdk >= 5.4
@@ -370,10 +373,12 @@ Requires: mvn(commons-logging:commons-logging)
Requires: mvn(commons-net:commons-net)
Requires: mvn(org.slf4j:slf4j-api)
Requires: mvn(org.slf4j:slf4j-jdk14)
+Requires: mvn(org.jboss.resteasy:resteasy-client)
+Requires: mvn(org.jboss.resteasy:resteasy-jackson2-provider)
+Requires: mvn(org.jboss.resteasy:resteasy-jaxrs)
Requires: jss >= 5.4
Requires: ldapjdk >= 5.4
Requires: %{product_id}-base = %{version}-%{release}
-Requires: pki-resteasy >= 3.0.26
%description -n %{product_id}-java
This package provides common and client libraries for Java.
@@ -435,6 +440,7 @@ Requires: python3-policycoreutils
Requires: selinux-policy-targeted >= 3.13.1-159
+Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer)
%if 0%{?rhel} && ! 0%{?eln}
Requires: pki-servlet-engine >= 9.0.31
%else
diff --git a/pom.xml b/pom.xml
index 1d231f25f01..e06b4782104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,12 @@
3.0.26.Final
+
+ org.jboss.resteasy
+ resteasy-servlet-initializer
+ 3.0.26.Final
+
+
xml-apis
xml-apis