|
 |
981330 |
From 3fdc686c9a4bab492d50cef707beef1f5f043153 Mon Sep 17 00:00:00 2001
|
|
|
981330 |
From: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
981330 |
Date: Tue, 28 Jun 2016 15:50:36 +1000
|
|
|
981330 |
Subject: [PATCH] Fix build on Fedora 25
|
|
|
981330 |
|
|
|
981330 |
Look for the right JAX-RS API JAR (it has moved in Fedora 25).
|
|
|
981330 |
|
|
|
981330 |
Also remove a lot of redundant 'find_file' operations for this JAR.
|
|
|
981330 |
|
|
|
981330 |
Fixes: https://fedorahosted.org/pki/ticket/2373
|
|
|
981330 |
---
|
|
|
981330 |
base/CMakeLists.txt | 10 ++++++++++
|
|
|
981330 |
base/ca/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/common/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/java-tools/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/kra/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/ocsp/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/server/cms/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/server/cmscore/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/server/tomcat/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/server/tomcat7/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/server/tomcat8/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/tks/src/CMakeLists.txt | 7 -------
|
|
|
981330 |
base/tps/src/CMakeLists.txt | 14 --------------
|
|
|
981330 |
13 files changed, 10 insertions(+), 91 deletions(-)
|
|
|
981330 |
|
|
|
981330 |
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
|
|
|
981330 |
index b9d5c7b..bb156ba 100644
|
|
|
981330 |
--- a/base/CMakeLists.txt
|
|
|
981330 |
+++ b/base/CMakeLists.txt
|
|
|
981330 |
@@ -2,6 +2,16 @@ project(base)
|
|
|
981330 |
|
|
|
981330 |
# The order is important!
|
|
|
981330 |
if (APPLICATION_FLAVOR_PKI_CORE)
|
|
|
981330 |
+
|
|
|
981330 |
+ find_file(JAXRS_API_JAR
|
|
|
981330 |
+ NAMES
|
|
|
981330 |
+ jaxrs-api.jar
|
|
|
981330 |
+ jboss-jaxrs-2.0-api.jar
|
|
|
981330 |
+ PATHS
|
|
|
981330 |
+ ${RESTEASY_LIB}
|
|
|
981330 |
+ /usr/share/java
|
|
|
981330 |
+ )
|
|
|
981330 |
+
|
|
|
981330 |
add_subdirectory(test)
|
|
|
981330 |
add_subdirectory(symkey)
|
|
|
981330 |
add_subdirectory(util)
|
|
|
981330 |
diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
|
|
|
981330 |
index 2a43c8d..854ce28 100644
|
|
|
981330 |
--- a/base/ca/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/ca/src/CMakeLists.txt
|
|
|
981330 |
@@ -52,13 +52,6 @@ find_file(JACKSON_MAPPER_JAR
|
|
|
981330 |
/usr/share/java/jackson
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
|
|
|
981330 |
index 072bd00..ee41b2f 100644
|
|
|
981330 |
--- a/base/common/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/common/src/CMakeLists.txt
|
|
|
981330 |
@@ -83,13 +83,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
|
|
|
981330 |
index 9a3c72f..e7ca5db 100644
|
|
|
981330 |
--- a/base/java-tools/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/java-tools/src/CMakeLists.txt
|
|
|
981330 |
@@ -60,13 +60,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
|
|
|
981330 |
index bfc8cdd..400ec01 100644
|
|
|
981330 |
--- a/base/kra/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/kra/src/CMakeLists.txt
|
|
|
981330 |
@@ -61,13 +61,6 @@ find_file(COMMONS_CODEC_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
|
|
|
981330 |
index d4a2009..32fcc92 100644
|
|
|
981330 |
--- a/base/ocsp/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/ocsp/src/CMakeLists.txt
|
|
|
981330 |
@@ -46,13 +46,6 @@ find_file(LDAPJDK_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
# '${JAVA_LIB_INSTALL_DIR}' jars
|
|
|
981330 |
find_file(JSS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
diff --git a/base/server/cms/src/CMakeLists.txt b/base/server/cms/src/CMakeLists.txt
|
|
|
981330 |
index 33b1cd3..93f4a8a 100644
|
|
|
981330 |
--- a/base/server/cms/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/server/cms/src/CMakeLists.txt
|
|
|
981330 |
@@ -90,13 +90,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/server/cmscore/src/CMakeLists.txt b/base/server/cmscore/src/CMakeLists.txt
|
|
|
981330 |
index ef12938..32e4351 100644
|
|
|
981330 |
--- a/base/server/cmscore/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/server/cmscore/src/CMakeLists.txt
|
|
|
981330 |
@@ -83,13 +83,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/server/tomcat/src/CMakeLists.txt b/base/server/tomcat/src/CMakeLists.txt
|
|
|
981330 |
index 669cc88..4cb40ad 100644
|
|
|
981330 |
--- a/base/server/tomcat/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/server/tomcat/src/CMakeLists.txt
|
|
|
981330 |
@@ -83,13 +83,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/server/tomcat7/src/CMakeLists.txt b/base/server/tomcat7/src/CMakeLists.txt
|
|
|
981330 |
index f84369c..18f0b91 100644
|
|
|
981330 |
--- a/base/server/tomcat7/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/server/tomcat7/src/CMakeLists.txt
|
|
|
981330 |
@@ -83,13 +83,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/server/tomcat8/src/CMakeLists.txt b/base/server/tomcat8/src/CMakeLists.txt
|
|
|
981330 |
index 0f49ff9..db1b9dc 100644
|
|
|
981330 |
--- a/base/server/tomcat8/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/server/tomcat8/src/CMakeLists.txt
|
|
|
981330 |
@@ -90,13 +90,6 @@ find_file(XERCES_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
|
|
|
981330 |
index d1ebbb1..51f98c9 100644
|
|
|
981330 |
--- a/base/tks/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/tks/src/CMakeLists.txt
|
|
|
981330 |
@@ -68,13 +68,6 @@ find_file(COMMONS_LANG_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
diff --git a/base/tps/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt
|
|
|
981330 |
index b8b13a9..5e51f60 100644
|
|
|
981330 |
--- a/base/tps/src/CMakeLists.txt
|
|
|
981330 |
+++ b/base/tps/src/CMakeLists.txt
|
|
|
981330 |
@@ -28,13 +28,6 @@ find_file(COMMONS_LANG_JAR
|
|
|
981330 |
/usr/share/java
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(TOMCAT_CATALINA_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
catalina.jar
|
|
|
981330 |
@@ -77,13 +70,6 @@ find_file(PKI_NSUTIL_JAR
|
|
|
981330 |
/usr/share/java/pki
|
|
|
981330 |
)
|
|
|
981330 |
|
|
|
981330 |
-find_file(JAXRS_API_JAR
|
|
|
981330 |
- NAMES
|
|
|
981330 |
- jaxrs-api.jar
|
|
|
981330 |
- PATHS
|
|
|
981330 |
- ${RESTEASY_LIB}
|
|
|
981330 |
-)
|
|
|
981330 |
-
|
|
|
981330 |
find_file(RESTEASY_JAXRS_JAR
|
|
|
981330 |
NAMES
|
|
|
981330 |
resteasy-jaxrs.jar
|
|
|
981330 |
--
|
|
|
981330 |
2.5.5
|
|
|
981330 |
|