Merge pull request #362 from confluentinc/revert-361-KSQL-388-fix-400…

…-build-issues Revert "Ksql 388 fix 400 build issues"
confluentinc · Oct 11, 2017 · d6acef8 · d6acef8
2 parents a834761 + 99cc5ac
commit d6acef8
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 29 deletions.
diff --git a/ksql-cli/pom.xml b/ksql-cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-cli</artifactId>
@@ -207,4 +207,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/ksql-cli/src/main/java/io/confluent/ksql/cli/StandaloneExecutor.java b/ksql-cli/src/main/java/io/confluent/ksql/cli/StandaloneExecutor.java
@@ -23,6 +23,7 @@
 import io.confluent.ksql.util.Pair;
 import io.confluent.ksql.util.PersistentQueryMetadata;
 import io.confluent.ksql.util.QueryMetadata;
+import org.apache.kafka.clients.admin.AdminClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/ksql-clickstream-demo/pom.xml b/ksql-clickstream-demo/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>io.confluent.ksql</groupId>

diff --git a/ksql-common/pom.xml b/ksql-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-common</artifactId>
@@ -111,4 +111,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java b/ksql-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
@@ -23,6 +23,7 @@
 import org.apache.kafka.streams.StreamsConfig;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 

diff --git a/ksql-engine/pom.xml b/ksql-engine/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-engine</artifactId>
@@ -65,6 +65,11 @@
             <artifactId>connect-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>connect-json</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-streams</artifactId>
@@ -194,4 +199,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/ksql-engine/src/main/java/io/confluent/ksql/KsqlContext.java b/ksql-engine/src/main/java/io/confluent/ksql/KsqlContext.java
@@ -19,6 +19,7 @@
 import io.confluent.ksql.metastore.MetaStore;
 import io.confluent.ksql.util.KafkaTopicClientImpl;
 import io.confluent.ksql.util.KsqlConfig;
+import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.streams.StreamsConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/ksql-examples/pom.xml b/ksql-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-examples</artifactId>
@@ -156,4 +156,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/ksql-metastore/pom.xml b/ksql-metastore/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-metastore</artifactId>
@@ -102,4 +102,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/ksql-parser/pom.xml b/ksql-parser/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-parser</artifactId>
@@ -127,4 +127,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/ksql-rest-app/pom.xml b/ksql-rest-app/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-rest-app</artifactId>
@@ -25,20 +25,11 @@
             <artifactId>ksql-engine</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-
-
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-json-serializer</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>rest-utils</artifactId>
@@ -154,4 +145,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/ksql-serde/pom.xml b/ksql-serde/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.confluent.ksql</groupId>
         <artifactId>ksql-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>ksql-serde</artifactId>
@@ -105,4 +105,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedDeserializer.java b/ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedDeserializer.java
@@ -34,6 +34,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.sql.rowset.serial.SerialException;
+
 public class KsqlDelimitedDeserializer implements Deserializer<GenericRow> {
 
   private static final Logger log = LoggerFactory.getLogger(KsqlDelimitedDeserializer.class);

diff --git a/pom.xml b/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>common</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>3.3.0</version>
     </parent>
 
     <groupId>io.confluent.ksql</groupId>
     <artifactId>ksql-parent</artifactId>
     <packaging>pom</packaging>
-
+    <version>0.1-SNAPSHOT</version>
     <modules>
         <module>ksql-common</module>
         <module>ksql-serde</module>
@@ -33,6 +33,8 @@
     </repositories>
 
     <properties>
+        <!-- remove the version control when confluent-common updates to 11.0.1 -->
+        <!--<kafka.version>0.11.0.1</kafka.version>-->
         <airlift.version>0.29</airlift.version>
         <airline.version>2.2.0</airline.version>
         <antlr.version>4.7</antlr.version>
@@ -266,4 +268,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>