Skip to content

Commit

Permalink
VACMS-19496: Swapping content sync for default content deploy. (#19857)
Browse files Browse the repository at this point in the history 
* VACMS-19496: Installing, enabling, and settings for default content sync. Removing content sync.

* VACMS-19496: updating composer lock after conflicts.

* VACMS-19496: undoing config changes

* VACMS-19496: Updating composer lock file after conflicts.
  • Loading branch information
@JakeBapple
JakeBapple authored Nov 12, 2024
1 parent 61f789f commit bfce989
Show file tree
Hide file tree
Showing 8 changed files with 789 additions and 293 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
"drupal/consumers": "^1.17.0",
"drupal/content_lock": "^2.3",
"drupal/content_model_documentation": "^1.0.19",
"drupal/content_sync": "^4.0@RC",
"drupal/core-composer-scaffold": "^10.2.0",
"drupal/core-recommended": "^10.2.0",
"drupal/crop": "^2.0",
"drupal/csv_serialization": "^4.0",
"drupal/ctools_block": "^4.0",
"drupal/danse": "^2.2",
"drupal/danse_content_moderation": "^2.0@beta",
"drupal/default_content_deploy": "^2.0",
"drupal/devel_entity_updates": "^4.1",
"drupal/diff": "^1.0",
"drupal/dropzonejs": "^2.0",
Expand Down
242 changes: 162 additions & 80 deletions composer.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ee62fce148618949bab1fc8e4a438044",
"content-hash": "ec44d38f6316eb88b8afe9f0c1666cca",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -4120,84 +4120,6 @@
"issues": "http://drupal.org/project/issues/content_model_documentation"
}
},
{
"name": "drupal/content_sync",
"version": "4.0.0-rc2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/content_sync.git",
"reference": "4.0.0-rc2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/content_sync-4.0.0-rc2.zip",
"reference": "4.0.0-rc2",
"shasum": "1308846e9f1cd149784a4dfdf0c40aaa2b6b3a92"
},
"require": {
"drupal/core": "^9.4 || ^10.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "4.0.0-rc2",
"datestamp": "1727240381",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
}
},
"drush": {
"services": {
"drush.services.yml": "^10 || ^11"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Blanca.Esqueda",
"homepage": "https://www.drupal.org/u/blancaesqueda",
"role": "Maintainer"
},
{
"name": "David Gil Hidalgo",
"homepage": "https://www.drupal.org/u/dabito",
"role": "Maintainer"
},
{
"name": "David Nova",
"homepage": "https://www.drupal.org/u/david4lim",
"role": "Maintainer"
},
{
"name": "Andrés Moncada",
"homepage": "https://www.drupal.org/u/acmoncadab4",
"role": "Contributor"
},
{
"name": "See contributors",
"homepage": "https://www.drupal.org/node/2865869/committers"
},
{
"name": "ridefree",
"homepage": "https://www.drupal.org/user/49148"
},
{
"name": "tobias märz",
"homepage": "https://www.drupal.org/user/1776082"
}
],
"description": "Content Sync functionality.",
"homepage": "http://drupal.org/project/content_sync",
"support": {
"source": "https://git.drupalcode.org/project/content_sync",
"issues": "http://drupal.org/project/content_sync"
}
},
{
"name": "drupal/core",
"version": "10.3.2",
Expand Down Expand Up @@ -4993,6 +4915,70 @@
"source": "https://git.drupalcode.org/project/decoupled_router"
}
},
{
"name": "drupal/default_content_deploy",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/default_content_deploy.git",
"reference": "2.0.0"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/default_content_deploy-2.0.0.zip",
"reference": "2.0.0",
"shasum": "b382dd658965a37bbe6b95788209843f0bb1fd43"
},
"require": {
"drupal/core": "^9.2 || ^10.0",
"drupal/hal": "*",
"php": ">=7.3",
"rogervila/array-diff-multidimensional": "^2.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "2.0.0",
"datestamp": "1640711736",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
},
"drush": {
"services": {
"drush.services.yml": "^9 || ^10"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Martin Klíma",
"homepage": "https://www.drupal.org/user/2784335",
"email": "[email protected]"
},
{
"name": "Jakub Hnilička",
"homepage": "https://www.drupal.org/user/3289357"
},
{
"name": "Radoslav Terezka",
"homepage": "https://www.drupal.org/user/124705"
},
{
"name": "Markus Kalkbrenner"
}
],
"description": "Drupal 9 module for exporting and deploying content in *.json files.",
"homepage": "https://www.drupal.org/project/default_content_deploy",
"support": {
"source": "https://git.drupalcode.org/project/default_content_deploy"
}
},
{
"name": "drupal/devel",
"version": "5.3.1",
Expand Down Expand Up @@ -7850,6 +7836,60 @@
"source": "https://git.drupalcode.org/project/graphql_metatag"
}
},
{
"name": "drupal/hal",
"version": "2.0.3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/hal.git",
"reference": "2.0.3"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/hal-2.0.3.zip",
"reference": "2.0.3",
"shasum": "81bc4b0bfdc6c3b7c2ec50f5eb4739451ff5c2ae"
},
"require": {
"drupal/core": "^10 || ^11"
},
"require-dev": {
"drupal/aggregator": "2.x-dev",
"drupal/entity_reference_revisions": "1.x-dev",
"drupal/rdf": "^2.1 || 3.0.x-dev",
"drupal/tour": "^1"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "2.0.3",
"datestamp": "1721252595",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "bbrala",
"homepage": "https://www.drupal.org/user/3366066"
},
{
"name": "larowlan",
"homepage": "https://www.drupal.org/user/395439"
}
],
"description": "Hypermedia Application Language (HAL)",
"homepage": "https://www.drupal.org/project/hal",
"support": {
"source": "https://git.drupalcode.org/project/hal"
}
},
{
"name": "drupal/health_check_url",
"version": "3.2.0",
Expand Down Expand Up @@ -21071,6 +21111,49 @@
},
"time": "2020-09-05T13:00:25+00:00"
},
{
"name": "rogervila/array-diff-multidimensional",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/rogervila/array-diff-multidimensional.git",
"reference": "d5afb18bfc256bf9d792594fa998f7af68179db0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rogervila/array-diff-multidimensional/zipball/d5afb18bfc256bf9d792594fa998f7af68179db0",
"reference": "d5afb18bfc256bf9d792594fa998f7af68179db0",
"shasum": ""
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
},
"type": "library",
"autoload": {
"files": [
"src/helpers.php"
],
"psr-4": {
"Rogervila\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Roger Vilà",
"email": "[email protected]"
}
],
"description": "Compare the difference between two multidimensional arrays",
"support": {
"issues": "https://github.com/rogervila/array-diff-multidimensional/issues",
"source": "https://github.com/rogervila/array-diff-multidimensional/tree/2.1.0"
},
"time": "2021-10-28T08:07:19+00:00"
},
{
"name": "sebastian/cli-parser",
"version": "1.0.2",
Expand Down Expand Up @@ -27799,7 +27882,6 @@
"drupal/ckeditor_abbreviation": 15,
"drupal/codit_menu_tools": 15,
"drupal/components": 10,
"drupal/content_sync": 5,
"drupal/danse_content_moderation": 10,
"drupal/entity_block": 10,
"drupal/entity_clone": 15,
Expand Down
2 changes: 2 additions & 0 deletions config/sync/core.extension.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ module:
datetime_range: 0
dblog: 0
decoupled_router: 0
default_content_deploy: 0
diff: 0
dropzonejs: 0
dynamic_entity_reference: 0
Expand Down Expand Up @@ -111,6 +112,7 @@ module:
graphql_core: 0
graphql_menu: 0
graphql_metatag: 0
hal: 0
health_check_url: 0
help: 0
hierarchy_manager: 0
Expand Down
3 changes: 3 additions & 0 deletions config/sync/hal.settings.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_core:
default_config_hash: YD6v6hkrHtj51mcZHn6s2HulUJHWVZ_D7Y_SllXF6WE
link_domain: null
Loading

0 comments on commit bfce989

Please sign in to comment.