Merge branch 'es-6.5.4-mvn' of

https://github.com/JULIELab/elasticsearch-mapper-preanalyzed.git into
HEAD

Conflicts:
	README.md
	pom.xml
	src/main/java/org/elasticsearch/index/mapper/preanalyzed/PreAnalyzedMapper.java
	src/main/java/org/elasticsearch/index/plugin/mapper/preanalyzed/MapperPreAnalyzedPlugin.java
	src/test/java/org/elasticsearch/index/mapper/preanalyzed/PreAnalyzedFieldMapperTests.java
	src/test/java/org/elasticsearch/index/mapper/preanalyzed/PreanalyzedInternalIntegrationTests.java
	src/test/resources/simpleMapping.json

NOTICE

@@ -1,2 +1,2 @@
 elasticsearch-mapper-preanalyzed
-Copyright 2009-2018 JULIE Lab
+Copyright 2009-2019 JULIE Lab

README.md

@@ -7,19 +7,40 @@ ElasticSearch compatibility table:
 
 | elasticsearch |  Preanalyzed Mapper Plugin | Docs
 |---------------|----------------------------|------
-| es-6.1.4      |  6.1.4 | [6.1.4] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-6.1.4)
-| es-6.0.1      |  6.0.1 | [6.0.1] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-6.0.1)
-| es-5.4.1      |  5.4.1 | [5.4.1] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.4.1)
-| es-5.4.0      |  5.4.0 | [5.4.0] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.4.0)
-| es-5.3.2      |  5.3.2 | [5.3.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.2)
-| es-5.3.1      |  5.3.1 | [5.3.1] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.1)
-| es-5.3.0      |  5.3.0 | [5.3.0] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.3.0)
-| es-5.2.2      |  5.2.2 | [5.2.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-5.2.2)
-| es-2.1.2      |  2.1.2 | [2.1.2] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-2.1.2)
-| es-2.1.1      |  2.1.1 | [2.1.1] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-2.1.1)
-| es-1.7		|  0.1.0 | [0.1.0] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-1.7)
-| es-1.5        |  0.0.5 | [0.0.5] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-1.5)
-| es-1.4        |  0.0.4 | [0.0.4] (https://github.com/khituras/elasticsearch-mapper-preanalyzed/tree/es-1.4)
+| es-6.5.4      |  6.5.4  | [6.5.4-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.5.4-mvn)
+| es-6.5.0      |  6.5.0  | [6.5.0-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.5.0-mvn)
+| es-6.2.4      |  6.2.4  | [6.2.4-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.2.4-mvn)
+| es-6.1.4      |  6.1.4  | [6.1.4-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.1.4-mvn)
+| es-6.1.4      |  6.1.4  | [6.1.4](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.1.4)
+| es-6.1.0      |  6.1.0  | [6.1.0-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.1.0-mvn)
+| es-6.0.1      |  6.0.1  | [6.0.1-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.0.1-mvn)
+| es-6.0.1      |  6.0.1  | [6.0.1](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-6.0.1)
+| es-5.6.14     |  5.6.14 | [5.6.14-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.6.14-mvn)
+| es-5.6.0      |  5.6.0  | [5.6.0-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.6.0-mvn)
+| es-5.5.3      |  5.5.3  | [5.5.3-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.5.3-mvn)
+| es-5.5.0      |  5.5.0  | [5.5.0-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.5.0-mvn)
+| es-5.4.3      |  5.4.3  | [5.4.3-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.4.3-mvn)
+| es-5.4.3      |  5.4.3  | [5.4.3](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.4.3)
+| es-5.4.1      |  5.4.1  | [5.4.1](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.4.1)
+| es-5.4.0      |  5.4.0  | [5.4.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.4.0)
+| es-5.3.3      |  5.3.3  | [5.3.3-mvn](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.3.3-mvn)
+| es-5.3.2      |  5.3.2  | [5.3.2](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.3.2)
+| es-5.3.1      |  5.3.1  | [5.3.1](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.3.1)
+| es-5.3.0      |  5.3.0  | [5.3.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.3.0)
+| es-5.2.2      |  5.2.2  | [5.2.2](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.2.2)
+| es-5.0.2      |  5.0.2  | [5.0.2](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.0.2)
+| es-5.0.0      |  5.0.0  | [5.0.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-5.0.0)
+| es-2.4.6      |  2.4.6  | [2.4.6](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.4.6)
+| es-2.4.0      |  2.4.0  | [2.4.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.4.0)
+| es-2.3.5      |  2.3.5  | [2.3.5](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.3.5)
+| es-2.3.0      |  2.3.0  | [2.3.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.3.0)
+| es-2.2.2      |  2.2.2  | [2.2.2](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.2.2)
+| es-2.2.0      |  2.2.0  | [2.2.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.2.0)
+| es-2.1.2      |  2.1.2  | [2.1.2](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.1.2)
+| es-2.1.1      |  2.1.1  | [2.1.1](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-2.1.1)
+| es-1.7		|  0.1.0  | [0.1.0](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-1.7)
+| es-1.5        |  0.0.5  | [0.0.5](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-1.5)
+| es-1.4        |  0.0.4  | [0.0.4](https://github.com/JULIELab/elasticsearch-mapper-preanalyzed/tree/es-1.4)
 
 This can be useful if a stand-alone text analysis engine is available, for instance a UIMA or GATE pipeline, and you would like to transfer the analysis results one to one into the ElasticSearch index.
 For example, a named entity recognizer in the natural language processing (NLP) pipeline might classify ranges of text as being the mention of a company. This kind of logic is typically too complicated for the default use of a Lucene or ElasticSearch analyzer on the one hand, and the recognition engine might not be easily integratable into an analyzer. However, it might be desired to store the named entity mentions - e.g. in the form of a special term 'COMP' - in the index just like one would to with synonyms: With the same offset as the original text and with position increment 0. This would cause highlighting to work as expected: When the term 'COMP' is searched for, all the recognized text ranges would be highlighted by the ElasticSearch built-in highlighting features, just like with synonyms.