From ece3771dbd952d3103755f1b2f836f456cd9fb81 Mon Sep 17 00:00:00 2001
From: Jeremy Custenborder <jcustenborder@gmail.com>
Date: Wed, 7 Sep 2016 16:28:34 -0500
Subject: [PATCH] Cleanup

---
 pom.xml                                       | 23 ++++++++++---------
 src/assembly/development.xml                  | 17 --------------
 .../solr/sink/CloudSolrSinkConnector.java     | 14 +++++++++++
 .../solr/sink/HttpSolrSinkConnector.java      |  6 +++++
 4 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 src/assembly/development.xml

diff --git a/pom.xml b/pom.xml
index 8608e58..a98f5b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,14 @@
     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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
+    <prerequisites>
+        <maven>3.3.0</maven>
+    </prerequisites>
+
   <groupId>io.confluent</groupId>
   <artifactId>kafka-connect-solr</artifactId>
   <packaging>jar</packaging>
@@ -52,12 +54,12 @@
   </scm>
 
   <properties>
-    <confluent.version>2.0.1</confluent.version>
-    <kafka.version>0.9.0.0</kafka.version>
+    <confluent.version>3.0.0</confluent.version>
+    <kafka.version>0.10.0.0-cp1</kafka.version>
     <junit.version>4.12</junit.version>
     <easymock.version>3.0</easymock.version>
     <powermock.version>1.6.2</powermock.version>
-    <solr.version>5.3.1</solr.version>
+    <solr.version>6.2.0</solr.version>
     <commons-io.version>2.4</commons-io.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <confluent.maven.repo>http://packages.confluent.io/maven/</confluent.maven.repo>
@@ -127,7 +129,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>3.5.1</version>
         <inherited>true</inherited>
         <configuration>
           <source>1.7</source>
@@ -136,10 +138,9 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>2.6</version>
         <configuration>
           <descriptors>
-            <descriptor>src/assembly/development.xml</descriptor>
             <descriptor>src/assembly/package.xml</descriptor>
           </descriptors>
         </configuration>
@@ -156,7 +157,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
+        <version>2.19.1</version>
         <configuration>
           <argLine>-Djava.awt.headless=true</argLine>
         </configuration>
@@ -164,7 +165,7 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>2.11</version>
+        <version>3.0</version>
         <configuration>
           <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
           <properties>
diff --git a/src/assembly/development.xml b/src/assembly/development.xml
deleted file mode 100644
index 095b498..0000000
--- a/src/assembly/development.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-          http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <!-- Assembles all dependencies in target/ directory so scripts can easily run in a development
-         environment -->
-    <id>development</id>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>share/java/${project.name}/</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>
diff --git a/src/main/java/io/confluent/connect/solr/sink/CloudSolrSinkConnector.java b/src/main/java/io/confluent/connect/solr/sink/CloudSolrSinkConnector.java
index 6d8296a..720ea95 100644
--- a/src/main/java/io/confluent/connect/solr/sink/CloudSolrSinkConnector.java
+++ b/src/main/java/io/confluent/connect/solr/sink/CloudSolrSinkConnector.java
@@ -1,5 +1,6 @@
 package io.confluent.connect.solr.sink;
 
+import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 public class CloudSolrSinkConnector extends SolrSinkConnector {
@@ -7,4 +8,17 @@ public class CloudSolrSinkConnector extends SolrSinkConnector {
   public Class<? extends Task> taskClass() {
     return CloudSolrSinkTask.class;
   }
+
+  @Override
+  public ConfigDef config() {
+
+    ConfigDef def = new ConfigDef();
+
+//    def.
+
+
+
+
+    return null;
+  }
 }
diff --git a/src/main/java/io/confluent/connect/solr/sink/HttpSolrSinkConnector.java b/src/main/java/io/confluent/connect/solr/sink/HttpSolrSinkConnector.java
index 6c60017..980263d 100644
--- a/src/main/java/io/confluent/connect/solr/sink/HttpSolrSinkConnector.java
+++ b/src/main/java/io/confluent/connect/solr/sink/HttpSolrSinkConnector.java
@@ -1,5 +1,6 @@
 package io.confluent.connect.solr.sink;
 
+import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;
 
 public class HttpSolrSinkConnector extends SolrSinkConnector {
@@ -7,4 +8,9 @@ public class HttpSolrSinkConnector extends SolrSinkConnector {
   public Class<? extends Task> taskClass() {
     return HttpSolrSinkTask.class;
   }
+
+  @Override
+  public ConfigDef config() {
+    return null;
+  }
 }