Skip to content

GitLab

Commit e5fe34f9 authored by Tomas Norre Mikkelsen's avatar Tomas Norre Mikkelsen
Browse files

Merge branch '51-remove-composer-lock-for-instantly-updates' into 'master' 

[TASK] Removes composer.lock

Closes #51

See merge request !41
parents 6b6b5ee4 4e05ef1e
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ e5fe34f9
......@@ -2,6 +2,7 @@
.idea
typo3_src
bin/*
composer.lock
!bin/scripts/
vendor
html/fileadmin
......@@ -10,6 +11,9 @@ html/uploads
html/typo3
html/index.php
html/typo3conf/ext/*
html/typo3conf/AdditionalConfiguration.php
html/typo3conf/deprecation_*
html/typo3conf/ENABLE_INSTALL_TOOL
html/typo3conf/PackageStates.php
!html/typo3conf/ext/ter*
data/etc/solr/server/solr/mycores/t3o/data
composer.json
View file @ e5fe34f9
......@@ -33,6 +33,9 @@
"bin-dir": "bin"
},
"scripts": {
"pre-install-cmd": [
"rm -f composer.lock"
],
"post-install-cmd": [
"./bin/typo3cms install:generatepackagestates 0 1"
],
......
composer.lock
View file @ e5fe34f9
......@@ -123,21 +123,21 @@
},
{
"name": "dmitryd/typo3-realurl",
"version": "2.1.5",
"version": "2.1.8",
"source": {
"type": "git",
"url": "https://github.com/dmitryd/typo3-realurl.git",
"reference": "9a233f2b891cc1fd5c8baeba2df63b6915497821"
"reference": "5283341b56ec9f4212c6cdd4c54e82d06c0401dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/9a233f2b891cc1fd5c8baeba2df63b6915497821",
"reference": "9a233f2b891cc1fd5c8baeba2df63b6915497821",
"url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/5283341b56ec9f4212c6cdd4c54e82d06c0401dd",
"reference": "5283341b56ec9f4212c6cdd4c54e82d06c0401dd",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"typo3/cms-core": ">=6.2.0,<8.5.0"
"typo3/cms-core": ">=6.2.0,<8.7.0"
},
"conflict": {
"bednee/cooluri": ">0.0.1",
......@@ -184,7 +184,7 @@
"cms",
"typo3"
],
"time": "2016-11-03T00:00:00+00:00"
"time": "2017-02-13T00:00:00+00:00"
},
{
"name": "doctrine/instantiator",
......@@ -327,16 +327,16 @@
},
{
"name": "helhum/typo3-console-plugin",
"version": "1.6.0",
"version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/typo3-console-plugin.git",
"reference": "6b964fb572692c2ada04979aeb2a2faf16ca60c0"
"reference": "9d79c0a271f1d6a4d51c74936b9325ad1a1a698e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/6b964fb572692c2ada04979aeb2a2faf16ca60c0",
"reference": "6b964fb572692c2ada04979aeb2a2faf16ca60c0",
"url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/9d79c0a271f1d6a4d51c74936b9325ad1a1a698e",
"reference": "9d79c0a271f1d6a4d51c74936b9325ad1a1a698e",
"shasum": ""
},
"require": {
......@@ -378,7 +378,7 @@
"plugin",
"typo3 console"
],
"time": "2017-01-17T09:36:15+00:00"
"time": "2017-01-26T11:55:03+00:00"
},
{
"name": "mso/idna-convert",
......@@ -704,16 +704,16 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.5",
"version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "cd142238a339459b10da3d8234220963f392540c"
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/cd142238a339459b10da3d8234220963f392540c",
"reference": "cd142238a339459b10da3d8234220963f392540c",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"shasum": ""
},
"require": {
......@@ -754,20 +754,20 @@
"mail",
"mailer"
],
"time": "2016-12-29T10:02:40+00:00"
"time": "2017-02-13T07:52:53+00:00"
},
{
"name": "symfony/console",
"version": "v2.8.16",
"version": "v2.8.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912"
"reference": "f3c234cd8db9f7e520a91d695db7d8bb5daeb7a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
"reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
"url": "https://api.github.com/repos/symfony/console/zipball/f3c234cd8db9f7e520a91d695db7d8bb5daeb7a4",
"reference": "f3c234cd8db9f7e520a91d695db7d8bb5daeb7a4",
"shasum": ""
},
"require": {
......@@ -815,7 +815,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2017-01-08T20:43:03+00:00"
"time": "2017-02-06T12:04:06+00:00"
},
{
"name": "symfony/debug",
......@@ -876,7 +876,7 @@
},
{
"name": "symfony/finder",
"version": "v2.8.16",
"version": "v2.8.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
......@@ -984,16 +984,16 @@
},
{
"name": "symfony/process",
"version": "v3.2.2",
"version": "v3.2.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893"
"reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893",
"reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893",
"url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
"reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
"shasum": ""
},
"require": {
......@@ -1029,7 +1029,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2017-01-02T20:32:22+00:00"
"time": "2017-02-16T14:07:22+00:00"
},
{
"name": "t3o/t3olayout",
......@@ -1037,12 +1037,12 @@
"source": {
"type": "git",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
"reference": "a243e576bf338183b1ed9a000239a1477f24ad4c"
"reference": "433079e18b86f8fa63ae547c202c9b58efc1757e"
},
"type": "typo3-cms-extension",
"autoload": {
"psr-4": {
"t3o\\t3olayout\\": "Classes/"
"T3o\\T3olayout\\": "Classes"
}
},
"license": [
......@@ -1053,7 +1053,7 @@
"keywords": [
"TYPO3 CMS"
],
"time": "2017-02-10 14:36:05"
"time": "2017-03-02 11:41:14"
},
{
"name": "typo3/class-alias-loader",
......@@ -1115,16 +1115,16 @@
},
{
"name": "typo3/cms",
"version": "7.6.15",
"version": "7.6.16",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/TYPO3.CMS.git",
"reference": "83c94ad5ee39aa4faeebfdd8d0eb66a7450f2ab1"
"reference": "4cf10b1d32c1c4c074d14cacba64890640937015"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/83c94ad5ee39aa4faeebfdd8d0eb66a7450f2ab1",
"reference": "83c94ad5ee39aa4faeebfdd8d0eb66a7450f2ab1",
"url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/4cf10b1d32c1c4c074d14cacba64890640937015",
"reference": "4cf10b1d32c1c4c074d14cacba64890640937015",
"shasum": ""
},
"require": {
......@@ -1202,6 +1202,7 @@
"typo3/cms-workspaces": "self.version"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
"mikey179/vfsstream": "1.6.0",
"phpunit/phpunit": "~4.8.0",
"symfony/polyfill-mbstring": "~1.0"
......@@ -1309,7 +1310,7 @@
"extbase",
"typo3"
],
"time": "2017-01-03T11:24:12+00:00"
"time": "2017-02-28T10:42:40+00:00"
},
{
"name": "typo3/cms-composer-installers",
......
Markdown is supported
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