Merge pull request #3772 from conan-io/release/2.4

Release/2.4 to develop2 branch

Author: czoido

changelog.rst

@@ -3,6 +3,14 @@ Changelog
 
 For a more detailed description of the major changes that Conan 2 brings, compared with Conan 1.X, please read :ref:`whatsnew`
 
+2.4.1 (10-Jun-2024)
+-------------------
+
+- Fix: Avoid `find_package`'s of transitive dependencies on `test_package` generated by `cmake_lib` template. `#16451 <https://github.com/conan-io/conan/pull/16451>`_
+- Fix: Fix back migration of default compatibility.py from a clean install. `#16417 <https://github.com/conan-io/conan/pull/16417>`_
+- Bugfix: Solve issue with setuptools (distributed Conan packages in Python) packaging the "test" folder. `#16446 <https://github.com/conan-io/conan/pull/16446>`_
+- Bugfix: Fixed regression in ``CMakeToolchain`` with ``--deployer=full_deploy`` creating wrong escaping. `#16434 <https://github.com/conan-io/conan/pull/16434>`_
+
 2.4.0 (05-Jun-2024)
 -------------------
 

conf.py

@@ -65,7 +65,7 @@
 # The short X.Y version.
 version = "2.4"
 # The full version, including alpha/beta/rc tags.
-release = u'2.4.0'
+release = u'2.4.1'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

reference/config_files/profiles.rst

@@ -36,7 +36,7 @@ They have this structure:
     tools.build:jobs=2
 
     [replace_requires]
-    zlib/1.2.123: zlib/*
+    zlib/1.2.12: zlib/[*]
 
     [replace_tool_requires]
     7zip/*: 7zip/system
@@ -626,7 +626,7 @@ Some of the capabilities of the profile templates are:
 
     **Stability Guarantees**: The detect_api, similar to ``conan profile detect``, does not
     offer strong stability guarantees.
-    
+
     **Usage Recommendations**: The detect_api is not a regular API meant for creating new
     commands or similar functionalities. While auto-detection can be convenient, it's not
     the recommended approach for all scenarios. This API is internal to Conan and is only
@@ -645,7 +645,7 @@ detect the operating system and architecture, you can use:
     [settings]
     os={{detect_api.detect_os()}}
     arch={{detect_api.detect_arch()}}
-  
+
 Similarly, for more advanced detections like determining the compiler, its version, and
 the associated runtime, you can use:
 

tutorial/conan_repositories/setting_up_conan_remotes/artifactory/artifactory_ce_cpp.rst

@@ -21,7 +21,7 @@ There are several ways to run Artifactory CE:
 
 .. code-block:: bash
     
-    $ docker run --name artifactory -d -p 8081:8081 -p 8082:8082 releases-docker.jfrog.io/jfrog/artifactory-cpp-ce:latest
+    $ docker run --name artifactory -d -p 8081:8081 -p 8082:8082 releases-docker.jfrog.io/jfrog/artifactory-cpp-ce:7.63.12
 
 * **Download and run from zip file**. The `Download Page <https://conan.io/downloads.html>`_ has
   a link for you to follow. When the file is unzipped, launch Artifactory by double clicking