Merge remote-tracking branch 'origin/2.4-develop' into AC-13306

Author: glo71317

app/code/Magento/Ups/etc/config.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
@@ -21,13 +21,13 @@
                 <free_method>GND</free_method>
                 <gateway_url>https://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
-                <gateway_rest_url>https://wwwcie.ups.com/api/rating/</gateway_rest_url>
+                <gateway_rest_url>https://onlinetools.ups.com/api/rating/</gateway_rest_url>
                 <handling>0</handling>
                 <model>Magento\Ups\Model\Carrier</model>
                 <pickup>CC</pickup>
                 <title>United Parcel Service</title>
                 <tracking_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_url>
-                <tracking_rest_url>https://wwwcie.ups.com/api/track/</tracking_rest_url>
+                <tracking_rest_url>https://onlinetools.ups.com/api/track/</tracking_rest_url>
                 <unit_of_measure>LBS</unit_of_measure>
                 <username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />

composer.json

@@ -48,6 +48,9 @@
         "colinmollenhour/php-redis-session-abstract": "^2.0",
         "composer/composer": "^2.0, !=2.2.16",
         "magento/elasticsearch": "^1.0.0",
+        "duosecurity/duo_api_php": "^1.1",
+        "duosecurity/duo_universal_php": "^1.0",
+        "elasticsearch/elasticsearch": "^7.17 || ^8.15",
         "ezyang/htmlpurifier": "^4.17",
         "guzzlehttp/guzzle": "^7.5",
         "laminas/laminas-captcha": "^2.18",