Merge branch 'solr-include' into 'master'

[TASK] Add ext:solr

See merge request !8

data/typo3/composer.json

@@ -17,7 +17,8 @@
   "require": {
     "typo3/cms": "^7.6",
     "helhum/typo3-console": "4.0.0",
-    "dmitryd/typo3-realurl": "^2.1"
+    "dmitryd/typo3-realurl": "^2.1",
+    "apache-solr-for-typo3/solr": "^5.1"
   },
   "config": {
     "bin-dir": "bin"

data/typo3/composer.lock

@@ -4,9 +4,73 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "74d512c446a170bb294c6549c017b8bd",
-    "content-hash": "d086de9814a6bf144c1c0dda56e1d380",
+    "hash": "cd8e9547c40b6db9e216cb3f27fa7c40",
+    "content-hash": "1409e039bfa6165a6398d5056e9054c3",
     "packages": [
+        {
+            "name": "apache-solr-for-typo3/solr",
+            "version": "5.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TYPO3-Solr/ext-solr.git",
+                "reference": "7c12f8e02d5dd7657f9c38adb1ccdbb2c64a2d56"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TYPO3-Solr/ext-solr/zipball/7c12f8e02d5dd7657f9c38adb1ccdbb2c64a2d56",
+                "reference": "7c12f8e02d5dd7657f9c38adb1ccdbb2c64a2d56",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0",
+                "typo3/cms": ">=7.6.0"
+            },
+            "replace": {
+                "solr": "self.version",
+                "typo3-ter/solr": "self.version"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8.0 <6.0.0"
+            },
+            "type": "typo3-cms-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1.x-dev"
+                },
+                "typo3/cms": {
+                    "cms-package-dir": "{$vendor-dir}/typo3/cms",
+                    "web-dir": ".Build/Web"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "Resources/Private/Php/"
+                ],
+                "psr-4": {
+                    "ApacheSolrForTypo3\\Solr\\": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Ingo Renner",
+                    "email": "ingo@typo3.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Apache Solr for TYPO3",
+            "homepage": "http://www.typo3-solr.com",
+            "keywords": [
+                "TYPO3 CMS",
+                "search",
+                "solr",
+                "typo3"
+            ],
+            "time": "2016-11-01 13:36:42"
+        },
         {
             "name": "cogpowered/finediff",
             "version": "0.3.1",
@@ -264,16 +328,16 @@
         },
         {
             "name": "helhum/typo3-console-plugin",
-            "version": "1.5.1",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-Console/typo3-console-plugin.git",
-                "reference": "e438a7bdca3b1f6f640a4b3bef156520c6d6190f"
+                "reference": "6b964fb572692c2ada04979aeb2a2faf16ca60c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/e438a7bdca3b1f6f640a4b3bef156520c6d6190f",
-                "reference": "e438a7bdca3b1f6f640a4b3bef156520c6d6190f",
+                "url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/6b964fb572692c2ada04979aeb2a2faf16ca60c0",
+                "reference": "6b964fb572692c2ada04979aeb2a2faf16ca60c0",
                 "shasum": ""
             },
             "require": {
@@ -315,7 +379,7 @@
                 "plugin",
                 "typo3 console"
             ],
-            "time": "2017-01-10 17:24:14"
+            "time": "2017-01-17 09:36:15"
         },
         {
             "name": "mso/idna-convert",