Commit a3f486da authored by Benni Mack's avatar Benni Mack Committed by Oliver Hader
Browse files

[TASK] Raise version to 11.0.0-dev

This change reflects the master branch to be targeted to v11.

Testing framework is raised as well to support v11.

This also means that all bugfixes now need to target "master, 10.4"
or "master, 10.4, 9.5" for critical bugfixes.

All features go into master branch again.

Resolves: #91469
Releases: master
Change-Id: Ife0f9d0fcf5ff13d55acb89dee5138e0e0b781e9
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64573

Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Oliver Hader's avatarOliver Hader <oliver.hader@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Oliver Hader's avatarOliver Hader <oliver.hader@typo3.org>
parent 3fa9d7be
......@@ -44,7 +44,7 @@ abstract class AbstractCoreSpec {
static String projectName = "TYPO3 Core";
static String projectKey = "CORE";
private String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=10.2.0";
private String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=11.0.0";
private String testingFrameworkBuildPath = "vendor/typo3/testing-framework/Resources/Core/Build/";
......
......@@ -89,7 +89,7 @@
"phpstan/phpstan": "^0.12.13",
"rector/rector": "^0.7.14",
"typo3/cms-styleguide": "~10.0.2",
"typo3/testing-framework": "^6.2.5"
"typo3/testing-framework": "^6.3.0"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
......@@ -118,7 +118,7 @@
"always-add-alias-loader": true
},
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
}
},
"scripts": {
......
This diff is collapsed.
......@@ -19,14 +19,14 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "10.4.*@dev"
"typo3/cms-core": "11.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
},
"extra": {
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -8,10 +8,10 @@ $EM_CONF[$_EXTKEY] = [
'clearCacheOnLoad' => 0,
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -19,10 +19,10 @@
"sort-packages": true
},
"require": {
"typo3/cms-backend": "10.4.*@dev",
"typo3/cms-core": "10.4.*@dev",
"typo3/cms-fluid": "10.4.*@dev",
"typo3/cms-frontend": "10.4.*@dev",
"typo3/cms-backend": "11.0.*@dev",
"typo3/cms-core": "11.0.*@dev",
"typo3/cms-fluid": "11.0.*@dev",
"typo3/cms-frontend": "11.0.*@dev",
"typo3fluid/fluid": "^2.6.8 || ^3",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
......@@ -34,7 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -9,10 +9,10 @@ $EM_CONF[$_EXTKEY] = [
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -10,10 +10,10 @@ $EM_CONF[$_EXTKEY] = [
'state' => 'stable',
'uploadfolder' => 0,
'clearCacheOnLoad' => 1,
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -10,11 +10,11 @@ $EM_CONF[$_EXTKEY] = [
'state' => 'stable',
'uploadfolder' => 0,
'clearCacheOnLoad' => 1,
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'a' => '10.4.4',
'typo3' => '11.0.0',
'a' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -20,8 +20,8 @@
},
"require": {
"psr/event-dispatcher": "^1.0",
"typo3/cms-core": "10.4.*@dev",
"typo3/cms-recordlist": "10.4.*@dev"
"typo3/cms-core": "11.0.*@dev",
"typo3/cms-recordlist": "11.0.*@dev"
},
"suggest": {
"typo3/cms-install": "To generate url to install tool in environment toolbar"
......@@ -38,7 +38,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -9,11 +9,11 @@ $EM_CONF[$_EXTKEY] = [
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'recordlist' => '10.4.4',
'typo3' => '11.0.0',
'recordlist' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -19,14 +19,14 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "10.4.*@dev"
"typo3/cms-core": "11.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
},
"extra": {
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -9,10 +9,10 @@ $EM_CONF[$_EXTKEY] = [
'author' => 'TYPO3 Core Team',
'author_email' => 'typo3cms@typo3.org',
'author_company' => '',
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -19,14 +19,14 @@
"sort-packages": true
},
"require": {
"typo3/cms-core": "10.4.*@dev"
"typo3/cms-core": "11.0.*@dev"
},
"conflict": {
"typo3/cms": "*"
},
"extra": {
"branch-alias": {
"dev-master": "10.4.x-dev"
"dev-master": "11.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -9,10 +9,10 @@ $EM_CONF[$_EXTKEY] = [
'author_company' => '',
'state' => 'stable',
'clearCacheOnLoad' => 0,
'version' => '10.4.4',
'version' => '11.0.0',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
......@@ -19,8 +19,8 @@ namespace TYPO3\CMS\Core\Information;
class Typo3Version
{
protected const VERSION = '10.4.4-dev';
protected const BRANCH = '10.4';
protected const VERSION = '11.0.0-dev';
protected const BRANCH = '11.0';
/**
* Define constants used up until TYPO3 v10, this constructor can be removed in TYPO3 v11.
......
......@@ -29,6 +29,7 @@ class IntroductionPackageCest extends AbstractIntroductionPackage
/**
* @env mysql
* @param InstallTester $I
* @skip
*/
public function installTypo3OnMysql(InstallTester $I, Scenario $scenario)
{
......
......@@ -30,6 +30,7 @@ class IntroductionPackageCest extends AbstractIntroductionPackage
* @param InstallTester $I
* @param Scenario $scenario
* @env postgresql
* @skip
*/
public function installTypo3OnPgSql(InstallTester $I, Scenario $scenario)
{
......
......@@ -30,6 +30,7 @@ class IntroductionPackageCest extends AbstractIntroductionPackage
* @param InstallTester $I
* @param Scenario $scenario
* @env sqlite
* @skip
*/
public function installTypo3OnSqlite(InstallTester $I, Scenario $scenario)
{
......
......@@ -4,7 +4,7 @@ $EM_CONF[$_EXTKEY] = [
'title' => 'test extension',
'description' => '',
'category' => '',
'version' => '10.4.4',
'version' => '11.0.0',
'state' => 'beta',
'clearCacheOnLoad' => 0,
'author' => 'Christian Kuhn',
......@@ -12,7 +12,7 @@ $EM_CONF[$_EXTKEY] = [
'author_company' => '',
'constraints' => [
'depends' => [
'typo3' => '10.4.4',
'typo3' => '11.0.0',
],
'conflicts' => [],
'suggests' => [],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment