From e94726d67f2155f13b0450063370c6c03c319393 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Wed, 8 May 2024 10:19:28 +0200 Subject: [PATCH] use SPDX format for licenses (#4395) Signed-off-by: Mikael Arguedas (cherry picked from commit faca85481fd1606dd9bb8fa7de48bb1f74efdbec) --- .../Migrating-from-ROS1/Migrating-CPP-Packages.rst | 4 ++-- source/How-To-Guides/Using-Variants.rst | 2 +- .../Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst | 2 +- .../Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst | 4 ++-- .../Creating-Your-First-ROS2-Package.rst | 4 ++-- .../Using-Parameters-In-A-Class-CPP.rst | 2 +- .../Using-Parameters-In-A-Class-Python.rst | 4 ++-- .../Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst | 2 +- .../Writing-A-Simple-Cpp-Service-And-Client.rst | 2 +- .../Writing-A-Simple-Py-Publisher-And-Subscriber.rst | 4 ++-- .../Writing-A-Simple-Py-Service-And-Client.rst | 4 ++-- .../Intermediate/Monitoring-For-Parameter-Changes-CPP.rst | 2 +- .../Intermediate/Monitoring-For-Parameter-Changes-Python.rst | 4 ++-- .../Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst | 2 +- .../Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Packages.rst b/source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Packages.rst index ef3083e9e62..dcb9e71ac5f 100644 --- a/source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Packages.rst +++ b/source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Packages.rst @@ -317,7 +317,7 @@ Here is the content of those three files: 0.0.0 talker Brian Gerkey - Apache 2.0 + Apache-2.0 catkin roscpp std_msgs @@ -617,7 +617,7 @@ Putting it all together, our ``package.xml`` now looks like this: 0.0.0 talker Brian Gerkey - Apache License 2.0 + Apache-2.0 ament_cmake diff --git a/source/How-To-Guides/Using-Variants.rst b/source/How-To-Guides/Using-Variants.rst index daee0f4f40d..485d957f56e 100644 --- a/source/How-To-Guides/Using-Variants.rst +++ b/source/How-To-Guides/Using-Variants.rst @@ -34,7 +34,7 @@ To do so you need only create two files: 1.0.0 A package to aggregate all packages in my_project. Maintainer Name - Apache License 2.0 + Apache-2.0 my_project_msgs my_project_services diff --git a/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst b/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst index f2626826789..0c8131e08a5 100644 --- a/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst +++ b/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst @@ -69,7 +69,7 @@ As always, though, make sure to add the description, maintainer email and name, C++ bag writing tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the C++ node ^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst b/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst index eed3d6638f2..e477fd498ad 100644 --- a/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst +++ b/source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst @@ -73,7 +73,7 @@ As always, though, make sure to add the description, maintainer email and name, Python bag writing tutorial Your Name - Apache License 2.0 + Apache-2.0 Also be sure to add this information to the ``setup.py`` file as well. @@ -82,7 +82,7 @@ Also be sure to add this information to the ``setup.py`` file as well. maintainer='Your Name', maintainer_email='you@email.com', description='Python bag writing tutorial', - license='Apache License 2.0', + license='Apache-2.0', 2 Write the Python node ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Tutorials/Beginner-Client-Libraries/Creating-Your-First-ROS2-Package.rst b/source/Tutorials/Beginner-Client-Libraries/Creating-Your-First-ROS2-Package.rst index dfae1690740..a55681e6aed 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Creating-Your-First-ROS2-Package.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Creating-Your-First-ROS2-Package.rst @@ -461,11 +461,11 @@ Then, edit the ``description`` line to summarize the package: Then, update the ``license`` line. You can read more about open source licenses `here `__. Since this package is only for practice, it's safe to use any license. -We'll use ``Apache License 2.0``: +We'll use ``Apache-2.0``: .. code-block:: xml - Apache License 2.0 + Apache-2.0 Don't forget to save once you're done editing. diff --git a/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst b/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst index 0653bfc8b92..20102288586 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst @@ -62,7 +62,7 @@ As always, though, make sure to add the description, maintainer email and name, C++ parameter tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the C++ node ^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst b/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst index e3571a8699e..f5ffe7c9fa7 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst @@ -62,7 +62,7 @@ As always, though, make sure to add the description, maintainer email and name, Python parameter tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the Python node ^^^^^^^^^^^^^^^^^^^^^^^ @@ -194,7 +194,7 @@ Again, match the ``maintainer``, ``maintainer_email``, ``description`` and ``lic maintainer='YourName', maintainer_email='you@email.com', description='Python parameter tutorial', - license='Apache License 2.0', + license='Apache-2.0', Add the following line within the ``console_scripts`` brackets of the ``entry_points`` field: diff --git a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst index 53858fb8d08..7db3934b660 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst @@ -224,7 +224,7 @@ As mentioned in the :doc:`previous tutorial <./Creating-Your-First-ROS2-Package> Examples of minimal publisher/subscriber using rclcpp Your Name - Apache License 2.0 + Apache-2.0 Add a new line after the ``ament_cmake`` buildtool dependency and paste the following dependencies corresponding to your node's include statements: diff --git a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst index 96475d2b385..75cb8021cae 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst @@ -73,7 +73,7 @@ As always, though, make sure to add the description, maintainer email and name, C++ client server tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the service node diff --git a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Publisher-And-Subscriber.rst b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Publisher-And-Subscriber.rst index ea45df288e0..75a1382e811 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Publisher-And-Subscriber.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Publisher-And-Subscriber.rst @@ -221,7 +221,7 @@ As mentioned in the :doc:`previous tutorial <./Creating-Your-First-ROS2-Package> Examples of minimal publisher/subscriber using rclpy Your Name - Apache License 2.0 + Apache-2.0 After the lines above, add the following dependencies corresponding to your node's import statements: @@ -245,7 +245,7 @@ Again, match the ``maintainer``, ``maintainer_email``, ``description`` and ``lic maintainer='YourName', maintainer_email='you@email.com', description='Examples of minimal publisher/subscriber using rclpy', - license='Apache License 2.0', + license='Apache-2.0', Add the following line within the ``console_scripts`` brackets of the ``entry_points`` field: diff --git a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst index 10a06c8a93a..3f9706dbe76 100644 --- a/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst +++ b/source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst @@ -72,7 +72,7 @@ As always, though, make sure to add the description, maintainer email and name, Python client server tutorial Your Name - Apache License 2.0 + Apache-2.0 1.2 Update ``setup.py`` ~~~~~~~~~~~~~~~~~~~~~~~ @@ -84,7 +84,7 @@ Add the same information to the ``setup.py`` file for the ``maintainer``, ``main maintainer='Your Name', maintainer_email='you@email.com', description='Python client server tutorial', - license='Apache License 2.0', + license='Apache-2.0', 2 Write the service node ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst b/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst index 7910b2ff07d..a0344295627 100644 --- a/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst +++ b/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst @@ -64,7 +64,7 @@ As always, though, make sure to add the description, maintainer email and name, C++ parameter events client tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the C++ node ^^^^^^^^^^^^^^^^^^^^ diff --git a/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-Python.rst b/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-Python.rst index ef5fd7546ce..a53eb7d8b15 100644 --- a/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-Python.rst +++ b/source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-Python.rst @@ -60,7 +60,7 @@ As always, though, make sure to add the description, maintainer email and name, Python parameter events client tutorial Your Name - Apache License 2.0 + Apache-2.0 2 Write the Python node ^^^^^^^^^^^^^^^^^^^^^^^ @@ -172,7 +172,7 @@ Again, match the ``maintainer``, ``maintainer_email``, ``description`` and ``lic maintainer='YourName', maintainer_email='you@email.com', description='Python parameter tutorial', - license='Apache License 2.0', + license='Apache-2.0', Add the following line within the ``console_scripts`` brackets of the ``entry_points`` field: diff --git a/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst b/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst index afcc20fd95b..db71cf84dc1 100644 --- a/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst +++ b/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst @@ -251,7 +251,7 @@ As mentioned in the :doc:`Create a package <../../Beginner-Client-Libraries/Crea Learning tf2 with rclcpp Your Name - Apache License 2.0 + Apache-2.0 Make sure to save the file. diff --git a/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst b/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst index 4ad22e592d6..6618a2c62e2 100644 --- a/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst +++ b/source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst @@ -271,7 +271,7 @@ As mentioned in the :doc:`Create a package <../../Beginner-Client-Libraries/Crea Learning tf2 with rclpy Your Name - Apache License 2.0 + Apache-2.0 After the lines above, add the following dependencies corresponding to your node’s import statements: