Author: kwright
Date: Tue Aug 30 21:29:45 2016
New Revision: 1758479
URL: http://svn.apache.org/viewvc?rev=1758479&view=rev
Log:
Update to ES 2.0.2. Doesn't yet build.
Modified:
manifoldcf/integration/elasticsearch-2.0/trunk/CHANGES.txt
manifoldcf/integration/elasticsearch-2.0/trunk/README.txt
manifoldcf/integration/elasticsearch-2.0/trunk/pom.xml
Modified: manifoldcf/integration/elasticsearch-2.0/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-2.0/trunk/CHANGES.txt?rev=1758479&r1=1758478&r2=1758479&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-2.0/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/elasticsearch-2.0/trunk/CHANGES.txt Tue Aug 30
21:29:45 2016
@@ -3,11 +3,5 @@ $Id$
======================= 2.1-SNAPSHOT =====================
-======================= Release 2.0 =====================
-
-CONNECTORS-1314: Use ":" as mcf user name / mcf domain name separator instead
of "@".
-
-CONNECTORS-1228: Fix default values so they are correct.
-
Initial commit.
-(Karl Wright, on behalf of BartÅomiej Superson)
+(Karl Wright)
Modified: manifoldcf/integration/elasticsearch-2.0/trunk/README.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-2.0/trunk/README.txt?rev=1758479&r1=1758478&r2=1758479&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-2.0/trunk/README.txt (original)
+++ manifoldcf/integration/elasticsearch-2.0/trunk/README.txt Tue Aug 30
21:29:45 2016
@@ -17,7 +17,7 @@ Compatibility
------------
This version of this component is fully functional with Apache ManifoldCF 1.6
and
-above and with Elasticsearch 1.5.x.
+above and with Elasticsearch 2.x.
Instructions for Building Apache ManifoldCF Plugin for Elastic Search from
Source
-----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ mvn clean install
The JAR packages can be found in the target folder:
-target/elasticsearch-1.5-plugin-mcf-<VERSION>-jar-with-dependencies.jar
+target/elasticsearch-2.0-plugin-mcf-<VERSION>-jar-with-dependencies.jar
... where <VERSION> is the release version
@@ -141,7 +141,7 @@ public class SearchService {
Licensing
---------
-Apache ManifoldCF Plugin for Elastic Search 1.5 is licensed under the
+Apache ManifoldCF Plugin for Elastic Search 2.0 is licensed under the
Apache License 2.0. See the files called LICENSE.txt and NOTICE.txt
for more information.
Modified: manifoldcf/integration/elasticsearch-2.0/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-2.0/trunk/pom.xml?rev=1758479&r1=1758478&r2=1758479&view=diff
==============================================================================
--- manifoldcf/integration/elasticsearch-2.0/trunk/pom.xml (original)
+++ manifoldcf/integration/elasticsearch-2.0/trunk/pom.xml Tue Aug 30 21:29:45
2016
@@ -30,11 +30,11 @@
<groupId>org.apache.manifoldcf.elasticsearch</groupId>
<name>ManifoldCF ElasticSearch Plugin</name>
- <artifactId>elasticsearch-1.5-plugin-mcf</artifactId>
+ <artifactId>elasticsearch-2.0-plugin-mcf</artifactId>
<version>2.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <description>ManifoldCF Plugin for ElasticSearch 1.5</description>
- <inceptionYear>2015</inceptionYear>
+ <description>ManifoldCF Plugin for ElasticSearch 2.0</description>
+ <inceptionYear>2016</inceptionYear>
<organization>
<name>The Apache Software Foundation</name>
@@ -43,7 +43,7 @@
<!-- Move these to the parent pom, when I create a parent pom -->
<properties>
- <elasticsearch.version>1.5.2</elasticsearch.version>
+ <elasticsearch.version>2.0.2</elasticsearch.version>
<junit.version>4.8.2</junit.version>
<log4j.version>1.2.16</log4j.version>
<httpcomponent.version>4.4.1</httpcomponent.version>