Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ksql 388 fix 400 build issues #361

Merged
merged 2 commits into from
Oct 11, 2017
Merged

Ksql 388 fix 400 build issues #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0af3fb8
Bump to common 4.0.0-SNAPSHOT
Oct 11, 2017
ce9e2da
After bumping the dependency to 4.0.0 we encountered some issues that…
hjafarpour Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ksql-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-cli</artifactId>
Expand Down Expand Up @@ -207,4 +207,4 @@
</build>
</profile>
</profiles>
</project>
</project>
1 change: 0 additions & 1 deletion ksql-cli/src/main/java/io/confluent/ksql/cli/StandaloneExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion ksql-clickstream-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<groupId>io.confluent.ksql</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ksql-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-common</artifactId>
Expand Down Expand Up @@ -111,4 +111,4 @@
</resource>
</resources>
</build>
</project>
</project>
1 change: 0 additions & 1 deletion ksql-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.kafka.streams.StreamsConfig;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

Expand Down
9 changes: 2 additions & 7 deletions ksql-engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-engine</artifactId>
Expand Down Expand Up @@ -65,11 +65,6 @@
<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>
Expand Down Expand Up @@ -199,4 +194,4 @@
</resource>
</resources>
</build>
</project>
</project>
1 change: 0 additions & 1 deletion ksql-engine/src/main/java/io/confluent/ksql/KsqlContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions ksql-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-examples</artifactId>
Expand Down Expand Up @@ -156,4 +156,4 @@
</build>
</profile>
</profiles>
</project>
</project>
4 changes: 2 additions & 2 deletions ksql-metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-metastore</artifactId>
Expand Down Expand Up @@ -102,4 +102,4 @@
</resource>
</resources>
</build>
</project>
</project>
4 changes: 2 additions & 2 deletions ksql-parser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-parser</artifactId>
Expand Down Expand Up @@ -127,4 +127,4 @@
</resource>
</resources>
</build>
</project>
</project>
13 changes: 11 additions & 2 deletions ksql-rest-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-rest-app</artifactId>
Expand All @@ -25,11 +25,20 @@
<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>
Expand Down Expand Up @@ -145,4 +154,4 @@
</build>
</profile>
</profiles>
</project>
</project>
4 changes: 2 additions & 2 deletions ksql-serde/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.confluent.ksql</groupId>
<artifactId>ksql-parent</artifactId>
<version>0.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>ksql-serde</artifactId>
Expand Down Expand Up @@ -105,4 +105,4 @@
</resource>
</resources>
</build>
</project>
</project>
2 changes: 0 additions & 2 deletions ksql-serde/src/main/java/io/confluent/ksql/serde/delimited/KsqlDelimitedDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
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);
Expand Down
8 changes: 3 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>io.confluent</groupId>
<artifactId>common</artifactId>
<version>3.3.0</version>
<version>4.0.0-SNAPSHOT</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>
Expand All @@ -33,8 +33,6 @@
</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>
Expand Down Expand Up @@ -268,4 +266,4 @@
</plugin>
</plugins>
</build>
</project>
</project>