Commit 93de790c authored by Robert Yokota's avatar Robert Yokota
Browse files

Downgrade Jest and ES test libs (for Java 7)

parent 64bb4402

pom.xml

+10 −9
Original line number Diff line number Diff line
@@ -39,16 +39,16 @@ 
    </scm>



    <properties>

        <!--

        <es.version>6.0.0</es.version>

        <lucene.version>7.0.1</lucene.version>

        <!--

        <es.version>5.0.0</es.version>

        <lucene.version>6.2.0</lucene.version>

        -->

        <es.version>2.4.1</es.version>

        <lucene.version>5.5.2</lucene.version>

        -->

        <hamcrest.version>1.3</hamcrest.version>

        <jest.version>5.3.3</jest.version>

        <jest.version>2.4.0</jest.version>

        <confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>

    </properties>
@@ -113,7 +113,6 @@ 
            <scope>test</scope>

        </dependency>

        <!-- For ES 2.x -->

        <!--

        <dependency>

            <groupId>org.elasticsearch</groupId>

            <artifactId>elasticsearch</artifactId>
@@ -121,7 +120,8 @@ 
            <scope>test</scope>

            <type>test-jar</type>

        </dependency>

        -->

        <!-- For ES 5.x (requires Java 8) -->

        <!--

        <dependency>

            <groupId>org.elasticsearch.test</groupId>

            <artifactId>framework</artifactId>
@@ -129,14 +129,15 @@ 
            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>org.elasticsearch</groupId>

            <artifactId>elasticsearch</artifactId>

            <groupId>org.elasticsearch.plugin</groupId>

            <artifactId>transport-netty4-client</artifactId>

            <version>${es.version}</version>

            <scope>test</scope>

        </dependency>

        -->

        <dependency>

            <groupId>org.elasticsearch.plugin</groupId>

            <artifactId>transport-netty4-client</artifactId>

            <groupId>org.elasticsearch</groupId>

            <artifactId>elasticsearch</artifactId>

            <version>${es.version}</version>

            <scope>test</scope>

        </dependency>

src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java

+1 −5
Original line number Diff line number Diff line
@@ -308,10 +308,6 @@ public class JestElasticsearchClient implements ElasticsearchClient { 
  }



  public void shutdown() {

    try {

      client.close();

    } catch (IOException e) {

      LOG.warn("Could not close client");

    }

    client.shutdownClient();

  }

}

src/test/java/io/confluent/connect/elasticsearch/ElasticsearchSinkTestBase.java

+16 −4
Original line number Diff line number Diff line
@@ -25,12 +25,10 @@ import org.apache.kafka.connect.data.Schema; 
import org.apache.kafka.connect.data.SchemaBuilder;

import org.apache.kafka.connect.data.Struct;

import org.apache.kafka.connect.sink.SinkRecord;

import org.elasticsearch.common.network.NetworkModule;

import org.elasticsearch.cluster.metadata.IndexMetaData;

import org.elasticsearch.common.settings.Settings;

import org.elasticsearch.http.HttpTransportSettings;

import org.elasticsearch.plugins.Plugin;

import org.elasticsearch.node.Node;

import org.elasticsearch.test.ESIntegTestCase;

import org.elasticsearch.transport.Netty4Plugin;

import org.junit.After;

import org.junit.Before;
@@ -134,6 +132,19 @@ public class ElasticsearchSinkTestBase extends ESIntegTestCase { 
    }

  }



  /* For ES 2.x */

  @Override

  protected Settings nodeSettings(int nodeOrdinal) {

    return Settings.settingsBuilder()

        .put(super.nodeSettings(nodeOrdinal))

        .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)

        .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1)

        .put(Node.HTTP_ENABLED, true)

        .build();

  }



  /* For ES 5.x (requires Java 8) */

  /*

  @Override

  protected Settings nodeSettings(int nodeOrdinal) {

    int randomPort = randomIntBetween(49152, 65525);
@@ -152,5 +163,6 @@ public class ElasticsearchSinkTestBase extends ESIntegTestCase { 
    al.add(Netty4Plugin.class);

    return al;

  }

  */



}