diff --git a/composer.json b/composer.json index d4f095271943..a06933ad616a 100644 --- a/composer.json +++ b/composer.json @@ -339,34 +339,12 @@ "magento/framework-amqp": "*", "magento/framework-bulk": "*", "magento/framework-message-queue": "*", - "trentrichardson/jquery-timepicker-addon": "1.4.3", - "components/jquery": "1.11.0", - "components/jqueryui": "1.10.4", - "twbs/bootstrap": "3.1.0", "magento/module-csp": "*", "magento/module-aws-s3": "*", "magento/module-remote-storage": "*", "magento/module-jwt-framework-adapter": "*", "magento/module-jwt-user-token": "*" }, - "conflict": { - "gene/bluefoot": "*" - }, - "extra": { - "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js" - ], - "components/jqueryui": [ - "lib/web/jquery/jquery-ui.js" - ], - "twbs/bootstrap": [ - "lib/web/jquery/jquery.tabs.js" - ] - } - }, "autoload": { "psr-4": { "Magento\\Framework\\": "lib/internal/Magento/Framework/", diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json index 6e027f4e3829..9ba0df46a48e 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json @@ -153,33 +153,13 @@ "magento/language-pt_br": "*", "magento/language-zh_cn": "*", "magento/framework": "*", - "trentrichardson/jquery-timepicker-addon": "1.4.3", "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc", - "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f", - "linkorb/jsmin-php": "1.1.2", - "components/jquery": "1.11.0", - "blueimp/jquery-file-upload": "5.6.14", - "components/jqueryui": "1.10.4", - "twbs/bootstrap": "3.1.0" + "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f" }, "extra": { "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", "colinmollenhour/cache-backend-redis": "lib/internal/Cm/Cache/Backend/Redis.php", - "colinmollenhour/credis": "lib/internal/Credis", - "linkorb/jsmin-php": "lib/internal/JSMin", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js" - ], - "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader", - "components/jqueryui": [ - "lib/web/jquery/jquery-ui.js", - "lib/web/jquery/jquery-ui.min.js" - ], - "twbs/bootstrap": [ - "lib/web/jquery/jquery.tabs.js" - ] + "colinmollenhour/credis": "lib/internal/Credis" } }, "config": { diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock index ab40ec007ef7..50e8bd5ac35d 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock @@ -2310,28 +2310,8 @@ "laminas/laminas-validator": "^2.6.0", "laminas/laminas-view": "~2.10.0" }, - "conflict": { - "gene/bluefoot": "*" - }, - "replace": { - "blueimp/jquery-file-upload": "5.6.14", - "components/jquery": "1.11.0", - "components/jqueryui": "1.10.4", - "trentrichardson/jquery-timepicker-addon": "1.4.3", - "twbs/bootstrap": "3.1.0" - }, "type": "magento2-component", "extra": { - "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js" - ], - "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader", - "components/jqueryui": "lib/web/jquery/jquery-ui.js", - "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js" - }, "map": [ [ ".github", diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock index 684de9dd079e..44672eacc17f 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock +++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock @@ -2310,28 +2310,8 @@ "laminas/laminas-validator": "^2.6.0", "laminas/laminas-view": "~2.10.0" }, - "conflict": { - "gene/bluefoot": "*" - }, - "replace": { - "blueimp/jquery-file-upload": "5.6.14", - "components/jquery": "1.11.0", - "components/jqueryui": "1.10.4", - "trentrichardson/jquery-timepicker-addon": "1.4.3", - "twbs/bootstrap": "3.1.0" - }, "type": "magento2-component", "extra": { - "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js" - ], - "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader", - "components/jqueryui": "lib/web/jquery/jquery-ui.js", - "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js" - }, "map": [ [ ".github", diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock index 5ff12bd40dee..75bed39ecc95 100644 --- a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock +++ b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock @@ -461,36 +461,14 @@ "magento/magento-composer-installer": "*" }, "replace": { - "blueimp/jquery-file-upload": "5.6.14", "colinmollenhour/cache-backend-redis": "dev-master#193d377b7fb2e88595578b282fa01a62d1185abc", - "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f", - "components/jquery": "1.11.0", - "components/jqueryui": "1.10.4", - "linkorb/jsmin-php": "1.1.2", - "trentrichardson/jquery-timepicker-addon": "1.4.3", - "twbs/bootstrap": "3.1.0" + "colinmollenhour/credis": "dev-master#f07bbfd4117294f462f0fb19c49221d350bf396f" }, "type": "magento2-component", "extra": { "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", "colinmollenhour/cache-backend-redis": "lib/internal/Cm/Cache/Backend/Redis.php", - "colinmollenhour/credis": "lib/internal/Credis", - "linkorb/jsmin-php": "lib/internal/JSMin", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js", - "lib/web/jquery/jquery-migrate.js", - "lib/web/jquery/jquery-migrate.min.js" - ], - "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader", - "components/jqueryui": [ - "lib/web/jquery/jquery-ui.js", - "lib/web/jquery/jquery-ui.min.js" - ], - "twbs/bootstrap": [ - "lib/web/jquery/jquery.tabs.js" - ] + "colinmollenhour/credis": "lib/internal/Credis" }, "map": [ [ diff --git a/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json b/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json index 4bf260ba4860..0aa4bad5e826 100644 --- a/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json +++ b/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json @@ -23,22 +23,6 @@ "replace": { "magento/module-marketplace": "100.0.2" }, - "extra": { - "component_paths": { - "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", - "components/jquery": [ - "lib/web/jquery.js", - "lib/web/jquery/jquery.min.js", - ], - "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader", - "components/jqueryui": [ - "lib/web/jquery/jquery-ui.js" - ], - "twbs/bootstrap": [ - "lib/web/jquery/jquery.tabs.js" - ] - } - }, "config": { "use-include-path": true },