Merge pull request magento#1845 from magento-helix/MAGETWO-85590

[Helix] merge 2.2 into 2.2-develop

Author: vzabaznov

.htaccess

@@ -346,6 +346,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
     <Files magento_umask>
         <IfVersion < 2.4>
             order allow,deny

.htaccess.sample

@@ -323,6 +323,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
     <Files magento_umask>
         <IfVersion < 2.4>
             order allow,deny

CHANGELOG.md

@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/composer.json

@@ -4,10 +4,10 @@
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-backend": "100.2.*",
-        "magento/module-config": "100.2.*",
+        "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",
         "magento/module-store": "100.2.*",
-        "magento/framework": "100.2.*"
+        "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0",

app/code/Magento/Analytics/composer.json

@@ -24,7 +24,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.1",
+    "version": "100.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -9,7 +9,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/composer.json

@@ -48,7 +48,7 @@ public function __construct($merchantId, $publicKey, $privateKey, $environment)
      * Initializes credentials.
      *
      * @return void
-     * @deprecated is not used anymore
+     * @deprecated 100.2.2 is not used anymore
      */
     protected function initCredentials()
     {

app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php

@@ -18,14 +18,14 @@
         "magento/module-quote": "101.0.*",
         "magento/module-paypal": "100.2.*",
         "magento/module-ui": "101.0.*",
-        "braintree/braintree_php": "3.22.0"
+        "braintree/braintree_php": "3.25.0"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.2.*",
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.1",
+    "version": "100.2.2",
     "license": [
         "proprietary"
     ],

app/code/Magento/Braintree/composer.json

@@ -25,7 +25,7 @@
         "magento/module-bundle-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.1",
+    "version": "100.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"