From 86db9e4ea3f82935ebbba401962e497bc42424db Mon Sep 17 00:00:00 2001
From: PengZheng <howtofly@gmail.com>
Date: Tue, 9 Jan 2024 21:00:20 +0800
Subject: [PATCH 1/2] Upgrade to conan 1.62.

---
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/ubuntu.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8ed1777d8..76601a2e0 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install conan and lcov
         run: |
           sudo apt-get install -yq --no-install-recommends lcov
-          sudo pip install conan==1.59.0
+          sudo pip install conan==1.62.0
       - name: Setup Conan Profile
         run: |
           conan profile new default --detect
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index df2994f1f..d5b87a93f 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Install build dependencies
         run: |
-          sudo pip install -U conan==1.59.0
+          sudo pip install -U conan==1.62.0
           sudo apt-get install -yq --no-install-recommends ninja-build
       - name: Setup Conan Profile
         env:

From 62b42f2a04e4e31ac4f409f5163e32d2bc94407d Mon Sep 17 00:00:00 2001
From: PengZheng <howtofly@gmail.com>
Date: Wed, 17 Jan 2024 12:50:51 +0800
Subject: [PATCH 2/2] Remove unnecessary find_dependency from
 CelixDeps.cmake.in.

---
 cmake/CelixDeps.cmake.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/CelixDeps.cmake.in b/cmake/CelixDeps.cmake.in
index 538153630..6567d959d 100644
--- a/cmake/CelixDeps.cmake.in
+++ b/cmake/CelixDeps.cmake.in
@@ -10,7 +10,6 @@ $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::launcher>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::etcdlib>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::deployment_admin>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_dfi>>:find_dependency(CURL)>
-$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::RsaConfiguredDiscovery>>:find_dependency(RapidJSON)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_discovery>>:find_dependency(LibXml2)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::bonjour_shell>>:find_dependency(LibXml2)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::celix_pubsub_admin_zmq>>:find_dependency(ZeroMQ)>