Version updates from latest release synced to main (#72)

* Add find_package/find_dependency for vendored project. The vendor package for nlohmann_json_schema_validator was previously exporting dependency info for that package, however that is not the recommended workflow for vendor packages which are ideally as transparent as possible. Signed-off-by: Steven! Ragnarök <[email protected]> * 2.1.1 Signed-off-by: Esteban Martinena <[email protected]>
open-rmf · Nov 10, 2022 · 4e3fcc0 · 4e3fcc0
1 parent 8c1cd09
commit 4e3fcc0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/rmf_task/CHANGELOG.md b/rmf_task/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog for package rmf_task
 
+2.1.1 (2022-10-11)
+------------------
+* Allow GoToPlace to know about expected future destinations [#61](https://github.com/open-rmf/rmf_task/issues/61)
+* Contributors: Grey, Marco A. Gutiérrez
+
 2.1.0 (2022-05-19)
 ------------------
 * Fix undefined behavior in log: [#62](https://github.com/open-rmf/rmf_task/pull/62)

diff --git a/rmf_task/package.xml b/rmf_task/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>rmf_task</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>Package for managing tasks in the Robotics Middleware Framework</description>
   <maintainer email="[email protected]">Yadunund</maintainer>
   <maintainer email="[email protected]">Marco A. Gutiérrez</maintainer>

diff --git a/rmf_task_sequence/CHANGELOG.md b/rmf_task_sequence/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Changelog for package rmf_task_sequence
 
+2.1.1 (2022-10-11)
+------------------
+* Add find_package/find_dependency for vendored project.
+  The vendor package for nlohmann_json_schema_validator was previously
+  exporting dependency info for that package, however that is not the
+  recommended workflow for vendor packages which are ideally as
+  transparent as possible.
+* Allow GoToPlace to know about expected future destinations (`#61 <https://github.com/open-rmf/rmf_task/issues/61>`_)
+* Contributors: Grey, Marco A. Gutiérrez, Steven! Ragnarök
+
 2.1.0 (2022-05-19)
 ------------------
 *  Allow GoToPlace to know about expected future destinations [#61](https://github.com/open-rmf/rmf_task/pull/61)

diff --git a/rmf_task_sequence/CMakeLists.txt b/rmf_task_sequence/CMakeLists.txt
@@ -24,6 +24,7 @@ find_package(rmf_api_msgs REQUIRED)
 find_package(rmf_task REQUIRED)
 find_package(nlohmann_json REQUIRED)
 find_package(nlohmann_json_schema_validator_vendor REQUIRED)
+find_package(nlohmann_json_schema_validator REQUIRED)
 
 find_package(ament_cmake_catch2 QUIET)
 find_package(ament_cmake_uncrustify QUIET)

diff --git a/rmf_task_sequence/cmake/rmf_task_sequence-config.cmake.in b/rmf_task_sequence/cmake/rmf_task_sequence-config.cmake.in
@@ -7,6 +7,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(rmf_task)
 find_dependency(nlohmann_json)
 find_dependency(nlohmann_json_schema_validator_vendor)
+find_dependency(nlohmann_json_schema_validator)
 
 if(NOT TARGET rmf_task_sequence::rmf_task_sequence)
     include("${rmf_task_sequence_CMAKE_DIR}/rmf_task_sequence-targets.cmake")

diff --git a/rmf_task_sequence/package.xml b/rmf_task_sequence/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>rmf_task_sequence</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>Implementation of phase-sequence tasks for the Robotics Middleware Framework</description>
   <maintainer email="[email protected]">Grey</maintainer>
   <maintainer email="[email protected]">Marco A. Gutiérrez</maintainer>