Merge pull request #9 from data-integrations/feature/update-6.0.0

yaojiefeng · web-flow · commit f822a0ef23c2 · 2019-04-10T14:38:58.000-07:00
update to 6.0.0
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch Plugins
 
-[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cask.co/cdap/current/en/integrations/cask-market.html)
+[![cm-available](https://cdap-users.herokuapp.com/assets/cm-available.svg)](https://docs.cdap.io/cdap/current/en/integrations/cask-market.html)
 ![cdap-batch-source](https://cdap-users.herokuapp.com/assets/cdap-batch-source.svg)
 ![cdap-batch-sink](https://cdap-users.herokuapp.com/assets/cdap-batch-sink.svg)
 ![cdap-realtime-sink](https://cdap-users.herokuapp.com/assets/cdap-realtime-sink.svg)
@@ -46,7 +46,7 @@ You can build without running tests: ``mvn clean install -DskipTests``
 
 Limitations
 -----------
-- UI doesn't support schema's with hyphens (-), so the plugin currently transforms all the schemas with - into underscores (_). This change will be reverted after this is fixed: https://issues.cask.co/browse/HYDRATOR-1125
+- UI doesn't support schema's with hyphens (-), so the plugin currently transforms all the schemas with - into underscores (_). This change will be reverted after this is fixed: https://issues.cask.co/browse/CDAP-10099
 
 Mailing Lists
 -------------
@@ -84,4 +84,4 @@ Cask is a trademark of Cask Data, Inc. All rights reserved.
 Apache, Apache HBase, and HBase are trademarks of The Apache Software Foundation. Used with
 permission. No endorsement by The Apache Software Foundation is implied by the use of these marks.
 
-.. |(Hydrator)| image:: http://cask.co/wp-content/uploads/hydrator_logo_cdap1.png
+.. |(Hydrator)| image:: http://cdap.io/wp-content/uploads/hydrator_logo_cdap1.png
diff --git a/pom.xml b/pom.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2019 CDAP
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License. You may obtain a copy of
+  the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  License for the specific language governing permissions and limitations under
+  the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>co.cask.hydrator</groupId>
+  <groupId>io.cdap.plugins</groupId>
   <artifactId>elasticsearch-plugins</artifactId>
-  <version>1.8.1</version>
+  <version>1.9.0</version>
 
   <licenses>
     <license>
@@ -19,9 +34,9 @@
 
   <developers>
     <developer>
-      <name>Cask Data</name>
-      <email>cask-dev@googlegroups.com</email>
-      <organization>Cask Data, Inc.</organization>
+      <name>CDAP</name>
+      <email>cdap-dev@googlegroups.com</email>
+      <organization>CDAP</organization>
       <organizationUrl>http://www.cdap.io</organizationUrl>
     </developer>
   </developers>
@@ -34,7 +49,7 @@
   </scm>
 
   <issueManagement>
-    <url>https://issues.cask.co/browse/HYDRATOR</url>
+    <url>https://issues.cask.co/browse/CDAP</url>
   </issueManagement>
 
   <distributionManagement>
@@ -47,8 +62,8 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <site>
-      <id>cask</id>
-      <url>http://cask.co</url>
+      <id>cdap</id>
+      <url>http://cdap.io</url>
     </site>
   </distributionManagement>
 
@@ -65,10 +80,10 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdap.version>5.1.2</cdap.version>
+    <cdap.version>6.0.0-SNAPSHOT</cdap.version>
     <hadoop.version>2.3.0</hadoop.version>
     <junit.version>4.11</junit.version>
-    <hydrator.version>2.1.2</hydrator.version>
+    <hydrator.version>2.2.0-SNAPSHOT</hydrator.version>
     <es.version>5.4.0</es.version>
     <es-hadoop.version>5.4.0</es-hadoop.version>
     <slf4j.version>1.7.5</slf4j.version>
@@ -86,30 +101,30 @@
 
   <dependencies>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-etl-api</artifactId>
       <version>${cdap.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-formats</artifactId>
       <version>${cdap.version}</version>
     </dependency>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>hydrator-test</artifactId>
       <version>${cdap.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>co.cask.cdap</groupId>
+      <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-data-pipeline</artifactId>
       <version>${cdap.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>co.cask.hydrator</groupId>
+      <groupId>io.cdap.plugin</groupId>
       <artifactId>hydrator-common</artifactId>
       <version>${hydrator.version}</version>
     </dependency>
@@ -311,9 +326,9 @@
           <extensions>true</extensions>
           <configuration>
             <instructions>
-              <_exportcontents>co.cask.hydrator.plugin.batch.*;org.elasticsearch.hadoop.mr.*;
+              <_exportcontents>io.cdap.plugin.batch.*;org.elasticsearch.hadoop.mr.*;
                 org.apache.commons.lang;org.apache.commons.*;org.apache.commons.logging.*;
-                org.codehaus.jackson.*;co.cask.hydrator.plugin.realtime.*;io.netty.*</_exportcontents>
+                org.codehaus.jackson.*;io.netty.*</_exportcontents>
               <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
               <Embed-Transitive>true</Embed-Transitive>
               <Embed-Directory>lib</Embed-Directory>
@@ -329,9 +344,9 @@
           </executions>
         </plugin>
         <plugin>
-          <groupId>co.cask</groupId>
+          <groupId>io.cdap</groupId>
           <artifactId>cdap-maven-plugin</artifactId>
-          <version>1.0.1</version>
+          <version>1.1.0</version>
           <configuration>
             <cdapArtifacts>
               <parent>system:cdap-data-pipeline[5.0.0,6.0.0-SNAPSHOT)</parent>
diff --git a/src/main/java/io/cdap/plugin/batch/ESProperties.java b/src/main/java/io/cdap/plugin/batch/ESProperties.java
@@ -1,4 +1,4 @@
-package co.cask.hydrator.plugin.batch;
+package io.cdap.plugin.batch;
 
 /**
  * Constants for ElasticSearch plugins.
diff --git a/src/main/java/io/cdap/plugin/batch/RecordWritableConverter.java b/src/main/java/io/cdap/plugin/batch/RecordWritableConverter.java
@@ -1,7 +1,7 @@
-package co.cask.hydrator.plugin.batch;
+package io.cdap.plugin.batch;
 
-import co.cask.cdap.api.data.format.StructuredRecord;
-import co.cask.cdap.api.data.schema.Schema;
+import io.cdap.cdap.api.data.format.StructuredRecord;
+import io.cdap.cdap.api.data.schema.Schema;
 import org.apache.hadoop.io.ArrayWritable;
 import org.apache.hadoop.io.BooleanWritable;
 import org.apache.hadoop.io.BytesWritable;
diff --git a/src/main/java/io/cdap/plugin/batch/sink/BatchElasticsearchSink.java b/src/main/java/io/cdap/plugin/batch/sink/BatchElasticsearchSink.java
@@ -1,21 +1,21 @@
-package co.cask.hydrator.plugin.batch.sink;
+package io.cdap.plugin.batch.sink;
 
-import co.cask.hydrator.plugin.batch.ESProperties;
-import co.cask.cdap.api.annotation.Description;
-import co.cask.cdap.api.annotation.Macro;
-import co.cask.cdap.api.annotation.Name;
-import co.cask.cdap.api.annotation.Plugin;
-import co.cask.cdap.api.data.batch.Output;
-import co.cask.cdap.api.data.format.StructuredRecord;
-import co.cask.cdap.api.dataset.lib.KeyValue;
-import co.cask.cdap.etl.api.Emitter;
-import co.cask.cdap.etl.api.batch.BatchSink;
-import co.cask.cdap.etl.api.batch.BatchSinkContext;
-import co.cask.cdap.format.StructuredRecordStringConverter;
-import co.cask.hydrator.common.ReferenceBatchSink;
-import co.cask.hydrator.common.ReferencePluginConfig;
-import co.cask.hydrator.common.batch.JobUtils;
-import co.cask.hydrator.common.batch.sink.SinkOutputFormatProvider;
+import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Macro;
+import io.cdap.cdap.api.annotation.Name;
+import io.cdap.cdap.api.annotation.Plugin;
+import io.cdap.cdap.api.data.batch.Output;
+import io.cdap.cdap.api.data.format.StructuredRecord;
+import io.cdap.cdap.api.dataset.lib.KeyValue;
+import io.cdap.cdap.etl.api.Emitter;
+import io.cdap.cdap.etl.api.batch.BatchSink;
+import io.cdap.cdap.etl.api.batch.BatchSinkContext;
+import io.cdap.cdap.format.StructuredRecordStringConverter;
+import io.cdap.plugin.batch.ESProperties;
+import io.cdap.plugin.common.ReferenceBatchSink;
+import io.cdap.plugin.common.ReferencePluginConfig;
+import io.cdap.plugin.common.batch.JobUtils;
+import io.cdap.plugin.common.batch.sink.SinkOutputFormatProvider;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
diff --git a/src/main/java/io/cdap/plugin/batch/source/ElasticsearchSource.java b/src/main/java/io/cdap/plugin/batch/source/ElasticsearchSource.java
@@ -1,24 +1,24 @@
-package co.cask.hydrator.plugin.batch.source;
-
-import co.cask.hydrator.plugin.batch.ESProperties;
-import co.cask.hydrator.plugin.batch.RecordWritableConverter;
-import co.cask.cdap.api.annotation.Description;
-import co.cask.cdap.api.annotation.Macro;
-import co.cask.cdap.api.annotation.Name;
-import co.cask.cdap.api.annotation.Plugin;
-import co.cask.cdap.api.data.batch.Input;
-import co.cask.cdap.api.data.format.StructuredRecord;
-import co.cask.cdap.api.data.schema.Schema;
-import co.cask.cdap.api.dataset.lib.KeyValue;
-import co.cask.cdap.etl.api.Emitter;
-import co.cask.cdap.etl.api.PipelineConfigurer;
-import co.cask.cdap.etl.api.batch.BatchRuntimeContext;
-import co.cask.cdap.etl.api.batch.BatchSource;
-import co.cask.cdap.etl.api.batch.BatchSourceContext;
-import co.cask.hydrator.common.ReferenceBatchSource;
-import co.cask.hydrator.common.ReferencePluginConfig;
-import co.cask.hydrator.common.SourceInputFormatProvider;
-import co.cask.hydrator.common.batch.JobUtils;
+package io.cdap.plugin.batch.source;
+
+import io.cdap.cdap.api.annotation.Description;
+import io.cdap.cdap.api.annotation.Macro;
+import io.cdap.cdap.api.annotation.Name;
+import io.cdap.cdap.api.annotation.Plugin;
+import io.cdap.cdap.api.data.batch.Input;
+import io.cdap.cdap.api.data.format.StructuredRecord;
+import io.cdap.cdap.api.data.schema.Schema;
+import io.cdap.cdap.api.dataset.lib.KeyValue;
+import io.cdap.cdap.etl.api.Emitter;
+import io.cdap.cdap.etl.api.PipelineConfigurer;
+import io.cdap.cdap.etl.api.batch.BatchRuntimeContext;
+import io.cdap.cdap.etl.api.batch.BatchSource;
+import io.cdap.cdap.etl.api.batch.BatchSourceContext;
+import io.cdap.plugin.batch.ESProperties;
+import io.cdap.plugin.batch.RecordWritableConverter;
+import io.cdap.plugin.common.ReferenceBatchSource;
+import io.cdap.plugin.common.ReferencePluginConfig;
+import io.cdap.plugin.common.SourceInputFormatProvider;
+import io.cdap.plugin.common.batch.JobUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.MapWritable;
 import org.apache.hadoop.io.Text;
diff --git a/src/test/java/io/cdap/plugin/batch/RecordWritableConverterTest.java b/src/test/java/io/cdap/plugin/batch/RecordWritableConverterTest.java
@@ -14,13 +14,12 @@
  * the License.
  */
 
-package plugin.batch;
+package io.cdap.plugin.batch;
 
-import co.cask.hydrator.plugin.batch.RecordWritableConverter;
-import co.cask.cdap.api.data.format.StructuredRecord;
-import co.cask.cdap.api.data.schema.Schema;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
+import io.cdap.cdap.api.data.format.StructuredRecord;
+import io.cdap.cdap.api.data.schema.Schema;
 import org.apache.hadoop.io.MapWritable;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
@@ -34,7 +34,7 @@
     </encoder>
   </appender>
 
-  <logger name="co.cask.hydrator" level="INFO" />
+  <logger name="io.cdap.plugin" level="INFO" />
   <logger name="org.elasticsearch" level="DEBUG" />
 
   <root level="WARN">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package co.cask.hydrator.plugin.batch;`
	`1`	`+package io.cdap.plugin.batch;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Constants for ElasticSearch plugins.`