The attached patch fixes build on Fedora 25 (JAX-RS API JAR had moved). It also removes a bunch of redundant find_file directives. This can probably be done for many other JARs but I've kept it to just the one for now.
No urgency to get this in. Cheers, Fraser
From c818adaac1da2b43b42e199dc288d2c3b6a79bcc Mon Sep 17 00:00:00 2001 From: Fraser Tweedale <[email protected]> Date: Tue, 28 Jun 2016 15:50:36 +1000 Subject: [PATCH] Fix build on Fedora 25 Look for the right JAX-RS API JAR (it has moved in Fedora 25). Also remove a lot of redundant 'find_file' operations for this JAR. --- base/CMakeLists.txt | 10 ++++++++++ base/ca/src/CMakeLists.txt | 7 ------- base/common/src/CMakeLists.txt | 7 ------- base/java-tools/src/CMakeLists.txt | 7 ------- base/kra/src/CMakeLists.txt | 7 ------- base/ocsp/src/CMakeLists.txt | 7 ------- base/server/cms/src/CMakeLists.txt | 7 ------- base/server/cmscore/src/CMakeLists.txt | 7 ------- base/server/tomcat/src/CMakeLists.txt | 7 ------- base/server/tomcat7/src/CMakeLists.txt | 7 ------- base/server/tomcat8/src/CMakeLists.txt | 7 ------- base/tks/src/CMakeLists.txt | 7 ------- base/tps/src/CMakeLists.txt | 14 -------------- 13 files changed, 10 insertions(+), 91 deletions(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index b9d5c7bac81ef9dfde2b32fb2127a946bc38a94b..bb156ba48c008ec12fb52f4f35fbb853d9b0fff5 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -2,6 +2,16 @@ project(base) # The order is important! if (APPLICATION_FLAVOR_PKI_CORE) + + find_file(JAXRS_API_JAR + NAMES + jaxrs-api.jar + jboss-jaxrs-2.0-api.jar + PATHS + ${RESTEASY_LIB} + /usr/share/java + ) + add_subdirectory(test) add_subdirectory(symkey) add_subdirectory(util) diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt index 2a43c8dbb4f88c22df244bb752ea963b2f0d646c..854ce28a25f729181a5009af13fde5bf0b4c013f 100644 --- a/base/ca/src/CMakeLists.txt +++ b/base/ca/src/CMakeLists.txt @@ -52,13 +52,6 @@ find_file(JACKSON_MAPPER_JAR /usr/share/java/jackson ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt index 072bd00307f6f299679c107836b2163ed0ff4b7c..ee41b2f47bdab9495c69167a6467cdc6471d86e3 100644 --- a/base/common/src/CMakeLists.txt +++ b/base/common/src/CMakeLists.txt @@ -83,13 +83,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt index 9a3c72fa2a7f1c631bc91f5af1e73536904a42b2..e7ca5db627cb3e398c4220029d2a78ade45c1d60 100644 --- a/base/java-tools/src/CMakeLists.txt +++ b/base/java-tools/src/CMakeLists.txt @@ -60,13 +60,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt index bfc8cdddaf150a4030e9c48ddebf8e8e828018a6..400ec016fe22ea156ea94bbe124ecd5eb8bc684c 100644 --- a/base/kra/src/CMakeLists.txt +++ b/base/kra/src/CMakeLists.txt @@ -61,13 +61,6 @@ find_file(COMMONS_CODEC_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt index d4a2009a9b390d5401a338c0b86559d0d3adac51..32fcc92dba9cf0f877af8970890df033de1d2375 100644 --- a/base/ocsp/src/CMakeLists.txt +++ b/base/ocsp/src/CMakeLists.txt @@ -46,13 +46,6 @@ find_file(LDAPJDK_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - # '${JAVA_LIB_INSTALL_DIR}' jars find_file(JSS_JAR NAMES diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt index 33b1cd3baf8d321c7f1a2f50e5f3e8360c515695..93f4a8a4a275cc4997da1b9c031b830eee3190b3 100644 --- a/base/server/cms/src/CMakeLists.txt +++ b/base/server/cms/src/CMakeLists.txt @@ -90,13 +90,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/server/cmscore/src/CMakeLists.txt b/base/server/cmscore/src/CMakeLists.txt index ef12938652250b98187e1e8157d12df902179ade..32e4351ca947580ee75bd887bf78d1f1b5064181 100644 --- a/base/server/cmscore/src/CMakeLists.txt +++ b/base/server/cmscore/src/CMakeLists.txt @@ -83,13 +83,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt index 669cc8883043062119afdb5b55db28828d09e92f..4cb40ada4e83d4ec6ee9040e96f2c72aacec1ae3 100644 --- a/base/server/tomcat/src/CMakeLists.txt +++ b/base/server/tomcat/src/CMakeLists.txt @@ -83,13 +83,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/server/tomcat7/src/CMakeLists.txt b/base/server/tomcat7/src/CMakeLists.txt index f84369ccc33d47c11f32bc3e956431f501c121e4..18f0b91dccbb57d2f22a3396a7a92150dd910dda 100644 --- a/base/server/tomcat7/src/CMakeLists.txt +++ b/base/server/tomcat7/src/CMakeLists.txt @@ -83,13 +83,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/server/tomcat8/src/CMakeLists.txt b/base/server/tomcat8/src/CMakeLists.txt index 0f49ff9bc6366e65c289ab76e1ee32e6fac928fd..db1b9dc31c2291c98774066bdbb570f74efc3d7a 100644 --- a/base/server/tomcat8/src/CMakeLists.txt +++ b/base/server/tomcat8/src/CMakeLists.txt @@ -90,13 +90,6 @@ find_file(XERCES_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt index d1ebbb13d60a3205c3547ebf209c93a40f29612b..51f98c9b4ae4f9588e6d8d04295f20de90b75c5b 100644 --- a/base/tks/src/CMakeLists.txt +++ b/base/tks/src/CMakeLists.txt @@ -68,13 +68,6 @@ find_file(COMMONS_LANG_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar diff --git a/base/tps/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt index b8b13a9934b376cf283b7c6d35c3c4548ce843eb..5e51f609c68f487fa9db1b0b4782a3627aab3cc6 100644 --- a/base/tps/src/CMakeLists.txt +++ b/base/tps/src/CMakeLists.txt @@ -28,13 +28,6 @@ find_file(COMMONS_LANG_JAR /usr/share/java ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(TOMCAT_CATALINA_JAR NAMES catalina.jar @@ -77,13 +70,6 @@ find_file(PKI_NSUTIL_JAR /usr/share/java/pki ) -find_file(JAXRS_API_JAR - NAMES - jaxrs-api.jar - PATHS - ${RESTEASY_LIB} -) - find_file(RESTEASY_JAXRS_JAR NAMES resteasy-jaxrs.jar -- 2.5.5
_______________________________________________ Pki-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/pki-devel
