From 1ce2a28110d921492033f716642f7ecbd2b000dd Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Fri, 17 Apr 2020 11:54:45 -0500 Subject: [PATCH 1/2] Set 1.0.0 version for packaging --- ReCaptchaAdminUi/composer.json | 1 + ReCaptchaCheckout/composer.json | 1 + ReCaptchaContact/composer.json | 1 + ReCaptchaCustomer/composer.json | 1 + ReCaptchaFrontendUi/composer.json | 1 + ReCaptchaMigration/composer.json | 1 + ReCaptchaNewsletter/composer.json | 1 + ReCaptchaPaypal/composer.json | 1 + ReCaptchaReview/composer.json | 1 + ReCaptchaSendFriend/composer.json | 1 + ReCaptchaUi/composer.json | 1 + ReCaptchaUser/composer.json | 1 + ReCaptchaValidation/composer.json | 1 + ReCaptchaValidationApi/composer.json | 1 + ReCaptchaVersion2Checkbox/composer.json | 1 + ReCaptchaVersion2Invisible/composer.json | 1 + ReCaptchaVersion3Invisible/composer.json | 1 + Securitytxt/composer.json | 1 + _metapackage/composer.json | 37 ++++++++++++------------ 19 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json index 005a9b9a..92454e41 100644 --- a/ReCaptchaAdminUi/composer.json +++ b/ReCaptchaAdminUi/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-admin-ui", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json index 33c10ffc..cd4e00b3 100644 --- a/ReCaptchaCheckout/composer.json +++ b/ReCaptchaCheckout/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-checkout", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json index 1e25f817..db8ccdfc 100644 --- a/ReCaptchaContact/composer.json +++ b/ReCaptchaContact/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-contact", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json index c7df22e4..3efbd2b4 100644 --- a/ReCaptchaCustomer/composer.json +++ b/ReCaptchaCustomer/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-customer", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json index 102a88c2..59ce87af 100644 --- a/ReCaptchaFrontendUi/composer.json +++ b/ReCaptchaFrontendUi/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-frontend-ui", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json index 40b3277a..c3ca9e84 100644 --- a/ReCaptchaMigration/composer.json +++ b/ReCaptchaMigration/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-migration", "description": "Google reCAPTCHA config migration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json index c70c2f0a..c2175098 100644 --- a/ReCaptchaNewsletter/composer.json +++ b/ReCaptchaNewsletter/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-newsletter", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json index 4429c6ed..bc65ef05 100644 --- a/ReCaptchaPaypal/composer.json +++ b/ReCaptchaPaypal/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-paypal", "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json index 73d8795c..6d82fc8a 100644 --- a/ReCaptchaReview/composer.json +++ b/ReCaptchaReview/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-review", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json index 68f59315..d23ce36c 100644 --- a/ReCaptchaSendFriend/composer.json +++ b/ReCaptchaSendFriend/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-send-friend", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json index 3ad26a8c..1f7c1b4c 100644 --- a/ReCaptchaUi/composer.json +++ b/ReCaptchaUi/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-ui", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json index 8dfff32b..fe4f2420 100644 --- a/ReCaptchaUser/composer.json +++ b/ReCaptchaUser/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-user", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json index 3a76b6c9..8f246669 100644 --- a/ReCaptchaValidation/composer.json +++ b/ReCaptchaValidation/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-validation", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json index c06f316c..872e374c 100644 --- a/ReCaptchaValidationApi/composer.json +++ b/ReCaptchaValidationApi/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-validation-api", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*" diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json index 8acd468d..6b723625 100644 --- a/ReCaptchaVersion2Checkbox/composer.json +++ b/ReCaptchaVersion2Checkbox/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-version-2-checkbox", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json index 5f95f3b5..6ec110ee 100644 --- a/ReCaptchaVersion2Invisible/composer.json +++ b/ReCaptchaVersion2Invisible/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-version-2-invisible", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json index 3a39ea00..70b95740 100644 --- a/ReCaptchaVersion3Invisible/composer.json +++ b/ReCaptchaVersion3Invisible/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-re-captcha-version-3-invisible", "description": "Google reCAPTCHA integration for Magento2", + "version": "1.0.0", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "magento/framework": "*", diff --git a/Securitytxt/composer.json b/Securitytxt/composer.json index 4a22e423..bca93c04 100644 --- a/Securitytxt/composer.json +++ b/Securitytxt/composer.json @@ -1,6 +1,7 @@ { "name": "magento/module-securitytxt", "description": "Security.txt file for Magento 2 websites", + "version": "1.0.0", "type": "magento2-module", "require": { "php": "~7.1.3||~7.2.0||~7.3.0", diff --git a/_metapackage/composer.json b/_metapackage/composer.json index c169aafd..7d7d6cf4 100644 --- a/_metapackage/composer.json +++ b/_metapackage/composer.json @@ -1,26 +1,27 @@ { "name": "magento/security-package", "description": "Magento Security Package", + "version": "1.0.0", "type": "metapackage", "require": { - "magento/module-re-captcha-admin-ui": "*", - "magento/module-re-captcha-checkout": "*", - "magento/module-re-captcha-contact": "*", - "magento/module-re-captcha-customer": "*", - "magento/module-re-captcha-frontend-ui": "*", - "magento/module-re-captcha-migration": "*", - "magento/module-re-captcha-newsletter": "*", - "magento/module-re-captcha-paypal": "*", - "magento/module-re-captcha-review": "*", - "magento/module-re-captcha-send-friend": "*", - "magento/module-re-captcha-ui": "*", - "magento/module-re-captcha-user": "*", - "magento/module-re-captcha-validation": "*", - "magento/module-re-captcha-validation-api": "*", - "magento/module-re-captcha-version-2-checkbox": "*", - "magento/module-re-captcha-version-2-invisible": "*", - "magento/module-re-captcha-version-3-invisible": "*", - "magento/module-securitytxt": "*", + "magento/module-re-captcha-admin-ui": "1.0.0", + "magento/module-re-captcha-checkout": "1.0.0", + "magento/module-re-captcha-contact": "1.0.0", + "magento/module-re-captcha-customer": "1.0.0", + "magento/module-re-captcha-frontend-ui": "1.0.0", + "magento/module-re-captcha-migration": "1.0.0", + "magento/module-re-captcha-newsletter": "1.0.0", + "magento/module-re-captcha-paypal": "1.0.0", + "magento/module-re-captcha-review": "1.0.0", + "magento/module-re-captcha-send-friend": "1.0.0", + "magento/module-re-captcha-ui": "1.0.0", + "magento/module-re-captcha-user": "1.0.0", + "magento/module-re-captcha-validation": "1.0.0", + "magento/module-re-captcha-validation-api": "1.0.0", + "magento/module-re-captcha-version-2-checkbox": "1.0.0", + "magento/module-re-captcha-version-2-invisible": "1.0.0", + "magento/module-re-captcha-version-3-invisible": "1.0.0", + "magento/module-securitytxt": "1.0.0", "google/recaptcha": "^1.2" } } From 8e61c2e1e008180aff8a1b6d7406536d277b479b Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Fri, 17 Apr 2020 12:39:56 -0500 Subject: [PATCH 2/2] magento/security-package#206: PHP 7.4 support --- ReCaptchaAdminUi/composer.json | 2 +- ReCaptchaCheckout/composer.json | 2 +- ReCaptchaContact/composer.json | 2 +- ReCaptchaCustomer/composer.json | 2 +- ReCaptchaFrontendUi/composer.json | 2 +- ReCaptchaMigration/composer.json | 2 +- ReCaptchaNewsletter/composer.json | 2 +- ReCaptchaPaypal/composer.json | 2 +- ReCaptchaReview/composer.json | 2 +- ReCaptchaSendFriend/composer.json | 2 +- ReCaptchaUi/composer.json | 2 +- ReCaptchaUser/composer.json | 2 +- ReCaptchaValidation/composer.json | 2 +- ReCaptchaValidationApi/composer.json | 2 +- ReCaptchaVersion2Checkbox/composer.json | 2 +- ReCaptchaVersion2Invisible/composer.json | 2 +- ReCaptchaVersion3Invisible/composer.json | 2 +- Securitytxt/composer.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json index 92454e41..9060968f 100644 --- a/ReCaptchaAdminUi/composer.json +++ b/ReCaptchaAdminUi/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json index cd4e00b3..352d4be8 100644 --- a/ReCaptchaCheckout/composer.json +++ b/ReCaptchaCheckout/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-checkout": "*", "magento/module-re-captcha-ui": "*" diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json index db8ccdfc..7a99a61f 100644 --- a/ReCaptchaContact/composer.json +++ b/ReCaptchaContact/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json index 3efbd2b4..63f07f6e 100644 --- a/ReCaptchaCustomer/composer.json +++ b/ReCaptchaCustomer/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-customer": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json index 59ce87af..f7b5abe4 100644 --- a/ReCaptchaFrontendUi/composer.json +++ b/ReCaptchaFrontendUi/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*" diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json index c3ca9e84..c5479034 100644 --- a/ReCaptchaMigration/composer.json +++ b/ReCaptchaMigration/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA config migration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-config": "*" }, diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json index c2175098..13ae1f45 100644 --- a/ReCaptchaNewsletter/composer.json +++ b/ReCaptchaNewsletter/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json index bc65ef05..5b3fc9a1 100644 --- a/ReCaptchaPaypal/composer.json +++ b/ReCaptchaPaypal/composer.json @@ -3,7 +3,7 @@ "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*", "magento/module-re-captcha-validation-api": "*", diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json index 6d82fc8a..ca82a738 100644 --- a/ReCaptchaReview/composer.json +++ b/ReCaptchaReview/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json index d23ce36c..e3f4c939 100644 --- a/ReCaptchaSendFriend/composer.json +++ b/ReCaptchaSendFriend/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json index 1f7c1b4c..f5875016 100644 --- a/ReCaptchaUi/composer.json +++ b/ReCaptchaUi/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-validation-api": "*" }, diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json index fe4f2420..240c4e45 100644 --- a/ReCaptchaUser/composer.json +++ b/ReCaptchaUser/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*", "magento/module-re-captcha-validation-api": "*" diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json index 8f246669..add8d23c 100644 --- a/ReCaptchaValidation/composer.json +++ b/ReCaptchaValidation/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-validation-api": "*", "google/recaptcha": "^1.2" diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json index 872e374c..2c28c1a8 100644 --- a/ReCaptchaValidationApi/composer.json +++ b/ReCaptchaValidationApi/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*" }, "type": "magento2-module", diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json index 6b723625..f99e0a2c 100644 --- a/ReCaptchaVersion2Checkbox/composer.json +++ b/ReCaptchaVersion2Checkbox/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json index 6ec110ee..b66fcaef 100644 --- a/ReCaptchaVersion2Invisible/composer.json +++ b/ReCaptchaVersion2Invisible/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json index 70b95740..c3163bdf 100644 --- a/ReCaptchaVersion3Invisible/composer.json +++ b/ReCaptchaVersion3Invisible/composer.json @@ -3,7 +3,7 @@ "description": "Google reCAPTCHA integration for Magento2", "version": "1.0.0", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/Securitytxt/composer.json b/Securitytxt/composer.json index bca93c04..4cb41c9a 100644 --- a/Securitytxt/composer.json +++ b/Securitytxt/composer.json @@ -4,7 +4,7 @@ "version": "1.0.0", "type": "magento2-module", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-config": "*", "magento/module-store": "*"