X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=composer.json;h=e0cece565002d4b63ccb945702e1c837fa7555b5;hb=9fbb5b9ea8f9e83ac2d5d3bb7fd3cee38b2eeff6;hp=62090173ac612e77764b8ede321af83908559c87;hpb=176e19e26cf94edec92797c9672806dc13635820;p=lhc%2Fweb%2Fwiklou.git

diff --git a/composer.json b/composer.json
index 62090173ac..e0cece5650 100644
--- a/composer.json
+++ b/composer.json
@@ -16,21 +16,23 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
-		"composer/semver": "1.0.0",
+		"composer/semver": "1.2.0",
 		"cssjanus/cssjanus": "1.1.1",
 		"ext-iconv": "*",
-		"liuggio/statsd-php-client": "1.0.16",
+		"liuggio/statsd-php-client": "1.0.18",
 		"mediawiki/at-ease": "1.1.0",
-		"oojs/oojs-ui": "0.12.12",
+		"oojs/oojs-ui": "0.14.1",
 		"oyejorge/less.php": "1.7.0.9",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
 		"wikimedia/assert": "0.2.2",
+		"wikimedia/base-convert": "1.0.1",
 		"wikimedia/cdb": "1.3.0",
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
-		"wikimedia/composer-merge-plugin": "1.2.1",
+		"wikimedia/composer-merge-plugin": "1.3.0",
 		"wikimedia/ip-set": "1.0.1",
 		"wikimedia/relpath": "1.0.3",
+		"wikimedia/running-stat": "1.1.0",
 		"wikimedia/utfnormal": "1.0.3",
 		"wikimedia/wrappedstring": "2.0.0",
 		"zordius/lightncandy": "0.21"
@@ -39,7 +41,7 @@
 		"jakub-onderka/php-parallel-lint": "0.9",
 		"justinrainbow/json-schema": "~1.3",
 		"mediawiki/mediawiki-codesniffer": "0.4.0",
-		"monolog/monolog": "1.14.0",
+		"monolog/monolog": "~1.17.2",
 		"nmred/kafka-php": "0.1.4",
 		"phpunit/phpunit": "3.7.37",
 		"wikimedia/avro": "1.7.7"
@@ -80,7 +82,8 @@
 		"merge-plugin": {
 			"include": [
 				"composer.local.json"
-			]
+			],
+			"merge-dev": false
 		}
 	}
 }