Skip to content

Commit

Permalink
Update the 1.9.3 release docs re: MFA again
Browse files Browse the repository at this point in the history
MFA 3.0.0 release included a conflicts directive with Subsites 1.4.1,
where the previous advice in the release docs was to alias 1.4.2 as 1.4.1
this saw the dependency resolve, but then also triggered the confliction.

The best way around this was decided to provide a more detailed alteration
to the project composer.json - as this will only last for 2 months (next
CWP relase will resolve this need), and any other constraint relaxation
would be unfair to other consumers of the MFA product with subsites.
  • Loading branch information
Dylan Wagstaff committed Sep 27, 2019
1 parent 2039b93 commit 9ba147a
Showing 1 changed file with 42 additions and 7 deletions.
49 changes: 42 additions & 7 deletions docs/en/05_Releases_and_changelogs/cwp_recipe_basic_1.9.3.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,51 @@ To upgrade, adjust your projects composer.json to reflect the new constraints:

This version has been released with a minor issue preventing MFA from operating in conjunction with the subsites module. Releases for both Framework and Subsites have been made since in order to rectify this, however as these were not included in the security audit for the 1.9.3 release agencies are encouraged to evaluate the decision to install these, and the impacts for them in deviating from the security audited CWP release.

In addition to following the installation steps of the [MFA module](https://github.com/silverstripe/silverstripe-mfa/tree/3.0), you will need to make the following amendments to the site's composer.json:
In addition to following the installation steps of the [MFA module](https://github.com/silverstripe/silverstripe-mfa/tree/3.0.0), you will first need to inline the `cwp/cwp-recipe-basic` if it is in use.

```json
"require": {
[...]
"silverstripe/framework": "3.7.4 as 3.7.3",
"silverstripe/subsites": "1.4.2 as 1.4.1"
},
the following amendments to the site's composer.json:

```diff
- "cwp/cwp-recipe-basic": "~1.9.3@stable",
+ "cwp/cwp": "1.9.3@stable",
+ "cwp/cwp-core": "1.9.3@stable",
+ "silverstripe/cms": "3.7.3@stable",
+ "silverstripe/framework": "3.7.3@stable",
+ "silverstripe/siteconfig": "3.7.3@stable",
+ "silverstripe/reports": "3.7.3@stable",
+ "symbiote/silverstripe-advancedworkflow": "4.2.0@stable",
+ "silverstripe/contentreview": "3.0.8@stable",
+ "silverstripe/documentconverter": "1.0.15@stable",
+ "silverstripe/externallinks": "1.1.0@stable",
+ "silverstripe/fulltextsearch": "2.5.0@stable",
+ "symbiote/silverstripe-gridfieldextensions": "2.1.0@stable",
+ "silverstripe/html5": "1.0.6@stable",
+ "silverstripe/iframe": "1.0.16@stable",
+ "silverstripe/mimevalidator": "1.0.12@stable",
+ "symbiote/silverstripe-multivaluefield": "3.1.1@stable",
+ "symbiote/silverstripe-queuedjobs": "3.1.3@stable",
+ "silverstripe/registry": "1.0.15@stable",
+ "silverstripe/restfulserver": "1.0.8@stable",
+ "silverstripe/secureassets": "1.2.0@stable",
+ "silverstripe/securityreport": "1.0.10@stable",
+ "silverstripe/selectupload": "1.0.7@stable",
+ "silverstripe/sharedraftcontent": "1.4.0@stable",
+ "silverstripe/sitewidecontent-report": "2.0.4@stable",
+ "undefinedoffset/sortablegridfield": "~1.0.3",
+ "silverstripe/spellcheck": "1.1.0@stable",
+ "silverstripe/subsites": "1.4.1@stable",
+ "silverstripe/taxonomy": "1.3.1@stable",
+ "silverstripe/translatable": "2.3.2@stable",
+ "silverstripe/userforms": "4.6.1@stable",
+ "symbiote/silverstripe-versionedfiles": "2.0.2@stable",
+ "silverstripe/versionfeed": "1.2.6@stable",
+ "bringyourownideas/silverstripe-maintenance": "1.1.0@stable",
+ "bringyourownideas/silverstripe-composer-update-checker": "1.1.0@stable",
+ "bringyourownideas/silverstripe-composer-security-checker": "1.1.0@stable"
```

Then change the requirement of `silverstripe/framework` to `3.7.4` and `silverstripe/subsites` to `1.4.2`.

<!--- Changes below this line will be automatically regenerated -->

## Change Log
Expand Down

0 comments on commit 9ba147a

Please sign in to comment.