Skip to content

Commit

Permalink
4.0-beta release preparation (#23217)
Browse files Browse the repository at this point in the history
* Removed unused .gitignore, composer.cson and LICENSE files from bundles and components that are not distributed as separate packages
* Generated incompatibilities-4-0-beta.md.
* Updated dev.json and dev.lock to reference 4.0.x-dev version of oro packages
  • Loading branch information
anyt authored Mar 28, 2019
1 parent 99361a7 commit 9704669
Show file tree
Hide file tree
Showing 104 changed files with 303 additions and 1,732 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ Please refer first to [UPGRADE.md](UPGRADE.md) for the most important items that

The current file describes significant changes in the code that may affect the upgrade of your customizations.

## 4.0.0-beta
## 4.0.0-beta (2019-03-28)
[Show detailed list of changes](incompatibilities-4-0-beta.md)

### Changed
#### UserBundle
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"doctrine/annotations": "1.6.*",
"doctrine/data-fixtures": "1.3.*",
"doctrine/doctrine-fixtures-bundle": "2.4.*",
"doctrine/collections": "1.5.*",
"twig/extensions": "1.5.*",
"symfony/swiftmailer-bundle": "2.6.*",
"symfony/monolog-bundle": "3.3.*",
Expand Down Expand Up @@ -107,7 +108,7 @@
"npm-asset/xregexp": "3.2.*",
"robloach/component-installer": "0.2.*",
"jms/cg": "1.2.*",
"oro/redis-config": "3.1.*",
"oro/redis-config": "4.0.*",
"brick/math": "0.8.*",
"bower-asset/fuse": "3.2.*"
},
Expand Down Expand Up @@ -143,7 +144,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
"dev-master": "4.0-dev"
}
},
"autoload": {
Expand Down
6 changes: 3 additions & 3 deletions dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"npm-asset/xregexp": "3.2.*",
"robloach/component-installer": "0.2.*",
"jms/cg": "1.2.*",
"oro/redis-config": "3.1-dev",
"oro/redis-config": "4.0.x-dev",
"brick/math": "0.8.*",
"bower-asset/fuse": "3.2.*"
},
Expand All @@ -127,7 +127,7 @@
"phpunit/phpcov": "4.0.*",
"symfony/phpunit-bridge": "3.4.*",
"friendsofphp/php-cs-fixer": "2.12.*",
"oro/twig-inspector": "3.1-dev"
"oro/twig-inspector": "1.0.*"
},
"repositories": {
"monorepo": {
Expand All @@ -147,7 +147,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
"dev-master": "4.0-dev"
}
},
"autoload": {
Expand Down
295 changes: 295 additions & 0 deletions incompatibilities-4-0-beta.md

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions src/Oro/Bundle/AddressBundle/composer.json

This file was deleted.

22 changes: 0 additions & 22 deletions src/Oro/Bundle/ApiBundle/composer.json

This file was deleted.

22 changes: 0 additions & 22 deletions src/Oro/Bundle/AttachmentBundle/composer.json

This file was deleted.

22 changes: 0 additions & 22 deletions src/Oro/Bundle/BatchBundle/composer.json

This file was deleted.

1 change: 0 additions & 1 deletion src/Oro/Bundle/CacheBundle/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions src/Oro/Bundle/CacheBundle/LICENSE

This file was deleted.

20 changes: 0 additions & 20 deletions src/Oro/Bundle/CacheBundle/composer.json

This file was deleted.

27 changes: 0 additions & 27 deletions src/Oro/Bundle/ChartBundle/composer.json

This file was deleted.

4 changes: 0 additions & 4 deletions src/Oro/Bundle/ConfigBundle/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion src/Oro/Bundle/DashboardBundle/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions src/Oro/Bundle/DashboardBundle/composer.json

This file was deleted.

4 changes: 0 additions & 4 deletions src/Oro/Bundle/DataAuditBundle/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions src/Oro/Bundle/DataGridBundle/composer.json

This file was deleted.

2 changes: 0 additions & 2 deletions src/Oro/Bundle/EmailBundle/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions src/Oro/Bundle/EmailBundle/LICENSE

This file was deleted.

25 changes: 0 additions & 25 deletions src/Oro/Bundle/EmailBundle/composer.json

This file was deleted.

29 changes: 0 additions & 29 deletions src/Oro/Bundle/EntityBundle/composer.json

This file was deleted.

Loading

0 comments on commit 9704669

Please sign in to comment.