Skip to content

Commit

Permalink
[TASK] Update TYPO3 version to 10.0.0-dev
Browse files Browse the repository at this point in the history
In order to distinguish between v10-dev / dev-master,
and 9.5, all dependencies are updated to v10.0.0-dev.

For ext_emconf.php the fixed version 10.0.0 is used
as in all other branches.

Resolves: #87159
Releases: master
Change-Id: Ie1f135663527f8c7d1654e085b874d699b677529
Reviewed-on: https://review.typo3.org/59150
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
  • Loading branch information
bmack committed Dec 14, 2018
1 parent dea762b commit 0f7fbba
Show file tree
Hide file tree
Showing 94 changed files with 210 additions and 210 deletions.
2 changes: 1 addition & 1 deletion Build/bamboo/src/main/java/core/AbstractCoreSpec.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ abstract public class AbstractCoreSpec {
protected static String projectName = "TYPO3 Core";
protected static String projectKey = "CORE";

protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=9.5.0";
protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=10.0.0";

protected String testingFrameworkBuildPath = "vendor/typo3/testing-framework/Resources/Core/Build/";

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
]
},
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions typo3/sysext/about/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
Expand All @@ -24,7 +24,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/about/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
'clearCacheOnLoad' => 0,
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
10 changes: 5 additions & 5 deletions typo3/sysext/adminpanel/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"sort-packages": true
},
"require": {
"typo3/cms-backend": "9.5.*@dev",
"typo3/cms-core": "9.5.*@dev",
"typo3/cms-fluid": "9.5.*@dev",
"typo3/cms-frontend": "9.5.*@dev",
"typo3/cms-backend": "10.0.*@dev",
"typo3/cms-core": "10.0.*@dev",
"typo3/cms-fluid": "10.0.*@dev",
"typo3/cms-frontend": "10.0.*@dev",
"typo3fluid/fluid": "^2.5.2",
"psr/http-message": "~1.0",
"psr/http-server-handler": "^1.0",
Expand All @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/adminpanel/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
6 changes: 3 additions & 3 deletions typo3/sysext/backend/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev",
"typo3/cms-recordlist": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev",
"typo3/cms-recordlist": "10.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
Expand All @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
6 changes: 3 additions & 3 deletions typo3/sysext/backend/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'recordlist' => '9.5.4',
'typo3' => '10.0.0',
'recordlist' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/belog/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
Expand All @@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/belog/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/beuser/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
Expand All @@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/beuser/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'uploadfolder' => 0,
'createDirs' => '',
'clearCacheOnLoad' => 0,
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ protected static function defineBaseConstants()
}

// This version, branch and copyright
define('TYPO3_version', '9.5.4-dev');
define('TYPO3_branch', '9.5');
define('TYPO3_version', '10.0.0-dev');
define('TYPO3_branch', '10.0');
define('TYPO3_copyright_year', '1998-2018');

// TYPO3 external links
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'title' => 'test extension',
'description' => '',
'category' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
Expand All @@ -13,7 +13,7 @@
'author_company' => '',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'title' => 'ExpressionBuilder Test',
'description' => 'ExpressionBuilder Test',
'category' => 'example',
'version' => '9.5.4',
'version' => '10.0.0',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
Expand All @@ -12,7 +12,7 @@
'author_email' => 'lolli@schwarzbu.ch',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'title' => 'Fixture extension for functional tests for Inline Relational Record Editing IRRE',
'description' => 'based on irre_tutorial extension created by Oliver Hader, see http://forge.typo3.org/projects/extension-irre_tutorial',
'category' => 'example',
'version' => '9.5.4',
'version' => '10.0.0',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
Expand All @@ -13,8 +13,8 @@
'author_company' => '',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'workspaces' => '9.5.4',
'typo3' => '10.0.0',
'workspaces' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'title' => 'DataHandler Test',
'description' => 'DataHandler Test',
'category' => 'example',
'version' => '9.5.4',
'version' => '10.0.0',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
Expand All @@ -13,8 +13,8 @@
'author_company' => '',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'workspaces' => '9.5.4',
'typo3' => '10.0.0',
'workspaces' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'title' => 'Test Resources',
'description' => 'Test Resources',
'category' => 'example',
'version' => '9.5.4',
'version' => '10.0.0',
'state' => 'beta',
'uploadfolder' => 0,
'createDirs' => '',
Expand All @@ -13,7 +13,7 @@
'author_company' => '',
'constraints' => [
'depends' => [
'typo3' => '9.5.4'
'typo3' => '10.0.0'
],
'conflicts' => [],
'suggests' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'author' => '',
'author_email' => '',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [],
'conflicts' => [],
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [],
'conflicts' => [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'uploadfolder' => 0,
'createDirs' => '',
'clearCacheOnLoad' => 1,
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/extbase/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev"
},
"suggest": {
"typo3/cms-scheduler": "Additional scheduler tasks"
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/extbase/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'uploadfolder' => 0,
'createDirs' => '',
'clearCacheOnLoad' => 1,
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/extensionmanager/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "9.5.*@dev"
"typo3/cms-core": "10.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
Expand All @@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "9.5.x-dev"
"dev-master": "10.0.x-dev"
},
"typo3/cms": {
"Package": {
Expand Down
4 changes: 2 additions & 2 deletions typo3/sysext/extensionmanager/ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '9.5.4',
'version' => '10.0.0',
'constraints' => [
'depends' => [
'typo3' => '9.5.4',
'typo3' => '10.0.0',
],
'conflicts' => [],
'suggests' => [],
Expand Down
Loading

0 comments on commit 0f7fbba

Please sign in to comment.