Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	pom.xml
  • Loading branch information
jlinn committed Feb 16, 2017
2 parents bf6bb87 + 9cbc3ba commit f5da1a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This plugin enables URL tokenization and token filtering by URL part.

| Elasticsearch Version | Plugin Version |
|-----------------------|----------------|
| 5.1.2 | 5.1.2.0 |
| 5.2.1 | 5.2.1.0 |
| 5.1.1 | 5.1.1.0 |
| 5.0.0 | 5.0.0.1 |
| 2.4.3 | 2.4.3.0 |
Expand All @@ -34,7 +34,7 @@ This plugin enables URL tokenization and token filtering by URL part.

## Installation
```bash
bin/plugin install https://github.com/jlinn/elasticsearch-analysis-url/releases/download/v5.1.2.0/elasticsearch-analysis-url-5.1.2.0.zip
bin/plugin install https://github.com/jlinn/elasticsearch-analysis-url/releases/download/v5.2.1.0/elasticsearch-analysis-url-5.2.1.0.zip
```

## Usage
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-analysis-url</artifactId>
<version>5.1.2.0</version>
<version>5.2.1.0</version>
<packaging>jar</packaging>
<description>Elasticsearch URL token filter plugin</description>

Expand All @@ -18,7 +18,7 @@

<properties>
<project.build.sourceEncodint>UTF-8</project.build.sourceEncodint>
<elasticsearch.version>5.1.2</elasticsearch.version>
<elasticsearch.version>5.2.1</elasticsearch.version>
<lucene.version>6.2.0</lucene.version>
<hamcrest.version>1.3</hamcrest.version>
<guava.version>19.0</guava.version>
Expand Down

0 comments on commit f5da1a9

Please sign in to comment.