Add support for bundling JBoss Logging

The RPM spec has been updated such that by default it will bundle JBoss Logging library.
dogtagpki · Jul 3, 2024 · 55e83fb · 55e83fb
1 parent 6c32f66
commit 55e83fb
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN if [ -n "$COPR_REPO" ]; then dnf copr enable -y $COPR_REPO; fi
 
 # Install PKI runtime dependencies
 RUN dnf install -y dogtag-pki \
-    && rpm -e --nodeps $(rpm -qa | grep -E "^java-|^dogtag-|^python3-dogtag-|^pki-resteasy-") \
+    && rpm -e --nodeps $(rpm -qa | grep -E "^java-|^dogtag-|^python3-dogtag-|^pki-resteasy-|^jboss-logging-") \
     && dnf clean all \
     && rm -rf /var/cache/dnf
 

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -208,13 +208,32 @@ find_file(JAVAX_ANNOTATIONS_API_JAR
         /usr/share/java
 )
 
-find_file(JBOSS_LOGGING_JAR
-    NAMES
-        jboss-logging.jar
-    PATHS
-        /usr/share/java/jboss-logging
-        /usr/share/java
-)
+if (EXISTS "${CMAKE_SOURCE_DIR}/lib")
+    # use imported JARs
+
+    execute_process(
+        COMMAND ls ${CMAKE_SOURCE_DIR}/lib
+        COMMAND sed -n "s/^jboss-logging-\\(.*\\)\\.jar\$/\\1/p"
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE JBOSS_LOGGING_VERSION
+    )
+    message("JBOSS_LOGGING_VERSION: ${JBOSS_LOGGING_VERSION}")
+
+    set(JBOSS_LOGGING_JAR "${CMAKE_SOURCE_DIR}/lib/jboss-logging-${JBOSS_LOGGING_VERSION}.jar")
+    set(JBOSS_LOGGING_LINK "jboss-logging-${JBOSS_LOGGING_VERSION}.jar")
+
+else()
+    # use system JARs
+
+    find_file(JBOSS_LOGGING_JAR
+        NAMES
+            jboss-logging.jar
+        PATHS
+            /usr/share/java/jboss-logging
+            /usr/share/java
+    )
+    set(JBOSS_LOGGING_LINK "../../../..${JBOSS_LOGGING_JAR}")
+endif (EXISTS "${CMAKE_SOURCE_DIR}/lib")
 
 find_file(JSS_JAR
     NAMES

diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
@@ -134,7 +134,7 @@ add_custom_command(
     COMMAND ln -sf ../../../..${JAVAX_ANNOTATIONS_API_JAR} lib/javax.annotations-api.jar
     COMMAND ln -sf ../../../..${JAXB_API_JAR} lib/jaxb-api.jar
     COMMAND ln -sf ../../../..${JAXRS_API_JAR} lib/jaxrs-api.jar
-    COMMAND ln -sf ../../../..${JBOSS_LOGGING_JAR} lib/jboss-logging.jar
+    COMMAND ln -sf ${JBOSS_LOGGING_LINK} lib/jboss-logging.jar
     COMMAND ln -sf ../../../..${JSS_JAR} lib/jss.jar
     COMMAND ln -sf ../../../..${LDAPJDK_JAR} lib/ldapjdk.jar
     COMMAND ln -sf ../../../..${P11_KIT_TRUST} lib/p11-kit-trust.so

diff --git a/pki.spec b/pki.spec
@@ -916,6 +916,12 @@ if [ ! -d lib ]
 then
     mkdir lib
 
+    JBOSS_LOGGING_VERSION=$(rpm -q jboss-logging | sed -n 's/^jboss-logging-\([^-]*\)-.*$/\1.Final/p')
+    echo "Importing JBoss Logging $JBOSS_LOGGING_VERSION from RPM"
+
+    cp /usr/share/java/jboss-logging/jboss-logging.jar \
+        lib/jboss-logging-$JBOSS_LOGGING_VERSION.jar
+
     RESTEASY_VERSION=$(rpm -q pki-resteasy-core | sed -n 's/^pki-resteasy-core-\([^-]*\)-.*$/\1.Final/p')
     echo "Importing RESTEasy $RESTEASY_VERSION from RPM"
 
@@ -1174,24 +1180,28 @@ pkgs=base\
 %if %{with meta}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki.xml
 %endif
 
 %if %{with base}
 echo "Installing JAR deps into %{buildroot}%{_datadir}/pki/lib"
+cp lib/jboss-logging-*.jar %{buildroot}%{_datadir}/pki/lib
 cp lib/resteasy-jaxrs-*.jar %{buildroot}%{_datadir}/pki/lib
 cp lib/resteasy-client-*.jar %{buildroot}%{_datadir}/pki/lib
 cp lib/resteasy-jackson2-provider-*.jar %{buildroot}%{_datadir}/pki/lib
 ls -l %{buildroot}%{_datadir}/pki/lib
 
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-java.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-java.xml
 
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tools.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-tools.xml
 %endif
@@ -1203,55 +1213,63 @@ ls -l %{buildroot}%{_datadir}/pki/server/common/lib
 
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-server.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-server.xml
 %endif
 
 %if %{with ca}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-ca.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-ca.xml
 %endif
 
 %if %{with kra}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-kra.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-kra.xml
 %endif
 
 %if %{with ocsp}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-ocsp.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-ocsp.xml
 %endif
 
 %if %{with tks}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tks.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-tks.xml
 %endif
 
 %if %{with tps}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-tps.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-tps.xml
 %endif
 
 %if %{with acme}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-acme.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-acme.xml
 %endif
 
 %if %{with est}
 echo "Removing RPM deps from %{buildroot}%{_datadir}/maven-metadata/pki-pki-est.xml"
 xmlstarlet edit --inplace \
+    -d "//_:dependency[_:groupId='org.jboss.logging']" \
     -d "//_:dependency[_:groupId='org.jboss.resteasy']" \
     %{buildroot}%{_datadir}/maven-metadata/pki-pki-est.xml
 %endif