Security update Drupal core to 9.0.14.

acquia · May 26, 2021 · 12b6d93 · 12b6d93
1 parent b948f84
commit 12b6d93
Show file tree

Hide file tree

Showing 3 changed files with 800 additions and 797 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,8 +55,8 @@ matrix:
     # - { env: ORCA_JOB=LOOSE_DEPRECATED_CODE_SCAN, name: "Loose deprecated code scan" }
     # - { env: ORCA_JOB=STRICT_DEPRECATED_CODE_SCAN, name: "Strict deprecated code scan" }
     - { env: ORCA_JOB=DEPRECATED_CODE_SCAN_W_CONTRIB, name: "Deprecated code scan w/ contrib" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR, name: "Isolated test on next minor Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR, name: "Integrated test on next minor Drupal core version" }
+    # - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR, name: "Isolated test on next minor Drupal core version" }
+    # - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR, name: "Integrated test on next minor Drupal core version" }
     # - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR_DEV, name: "Isolated test on next minor dev Drupal core version" }
     # - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR_DEV, name: "Integrated test on next minor dev Drupal core version" }
     # Uncomment the following four lines to enable the corresponding tests once
@@ -79,7 +79,6 @@ matrix:
     - env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV
 
 before_install:
-  - composer self-update 1.10.16
   - composer create-project --no-dev acquia/orca ../orca "$ORCA_VERSION"
   - ../orca/bin/travis/before_install.sh
 

diff --git a/composer.json b/composer.json
@@ -6,8 +6,8 @@
     "require": {
         "ext-dom": "*",
         "cweagans/composer-patches": "^1.7",
-        "drupal/acquia_connector": "^2.0-rc1",
-        "drupal/core": "~9.0.11",
+        "drupal/acquia_connector": "^1.24-rc3 || ^2.0-rc1 || ^3",
+        "drupal/core": "~9.0.14",
         "drupal/inline_entity_form": "^1.0-rc7",
         "drupal/lightning_api": "^4.6",
         "drupal/lightning_core": "^5",
@@ -39,21 +39,21 @@
         },
         "composer-exit-on-patch-failure": "true",
         "drupal-scaffold": {
-            "locations": {
-                "web-root": "docroot/"
-            },
             "file-mapping": {
-                "[project-root]/.gitattributes": false,
                 "[project-root]/.editorconfig": false,
-                "[web-root]/example.gitignore": false,
+                "[project-root]/.gitattributes": false,
                 "[web-root]/.csslintrc": false,
+                "[web-root]/INSTALL.txt": false,
+                "[web-root]/example.gitignore": false,
                 "[web-root]/modules/README.txt": false,
                 "[web-root]/profiles/README.txt": false,
+                "[web-root]/robots.txt": false,
                 "[web-root]/sites/README.txt": false,
                 "[web-root]/themes/README.txt": false,
-                "[web-root]/INSTALL.txt": false,
-                "[web-root]/robots.txt": false,
                 "[web-root]/web.config": false
+            },
+            "locations": {
+                "web-root": "docroot/"
             }
         },
         "drush": {