Merge remote-tracking branch 'fork/master'

* fork/master: (107 commits)
  copy-edited (confluentinc#2299)
  copy-edited (confluentinc#2299)
  remove unused map from command store `getRestoreCommands` (confluentinc#2296)
  Speed up integration tests. (confluentinc#2288)
  Move KSQL Clickstream demo to Examples repo (confluentinc#2270)
  Bump Confluent to 5.1.1-SNAPSHOT, Kafka to 2.1.1-SNAPSHOT
  Set Confluent to 5.1.0, Kafka to 2.1.0-cp1.
  Add ServiceContext (confluentinc#2243)
  Update to use CCL (confluentinc#2278)
  Remove redundant intro sentence in README.md (confluentinc#2277)
  Switch to use CCL (confluentinc#2275)
  Update readme for CCL (confluentinc#2276)
  Minor: add Hamcrest matchers for KsqlRestException and KsqlErrorMessage (confluentinc#2273)
  Update per relicensing (confluentinc#2274)
  CP-584: 5.1.0 changelog (confluentinc#2267)
  add null checks to min, max, and count aggregates; call Math.min/max for consistency (confluentinc#2246)
  Return and accept command topic offsets via REST API (confluentinc#2159)
  MINOR: Fix bug encountered when restoring RUN SCRIPT command. (again) (confluentinc#2265)
  More improvements to the way the CLI handles inline comments in multi-line statements. (confluentinc#2241)
  Fix issue where Avro subject does not exist (confluentinc#2260)
  ...

README.md

@@ -2,9 +2,7 @@
 
 > **KSQL is now GA and officially supported by Confluent Inc. [Get started with KSQL today](#getting-started).**
 
-KSQL is the streaming SQL engine for Apache Kafka.
-
-KSQL is an open source streaming SQL engine for Apache Kafka. It provides a simple and completely interactive SQL interface for stream processing on Kafka; no need to write code in a programming language such as Java or Python. KSQL is open-source (Apache 2.0 licensed), distributed, scalable, reliable, and real-time. It supports a wide range of powerful stream processing operations including aggregations, joins, windowing, sessionization, and much more. You can find [more KSQL tutorials and resources here](https://confluent.io/ksql) if you are interested.
+KSQL is the streaming SQL engine for Apache Kafka. It provides a simple and completely interactive SQL interface for stream processing on Kafka; no need to write code in a programming language such as Java or Python. KSQL is distributed, scalable, reliable, and real-time. It supports a wide range of powerful stream processing operations including aggregations, joins, windowing, sessionization, and much more. You can find [more KSQL tutorials and resources here](https://confluent.io/ksql) if you are interested.
 
 Click here to watch a screencast of the KSQL demo on YouTube.
 <a href="https://www.youtube.com/watch?v=illEpCOcCVg" target="_blank"><img src="screencast.jpg" alt="KSQL screencast"></a></p>
@@ -17,8 +15,7 @@ Click here to watch a screencast of the KSQL demo on YouTube.
 
 Stable releases are published every four months and are officially supported by [Confluent](http://www.confluent.io/).
 
-1. [Download latest stable KSQL](https://www.confluent.io/download/), which is included in the Enterprise and
-   Open Source editions of Confluent Platform.
+1. [Download latest stable KSQL](https://www.confluent.io/download/), which is included in Confluent Platform.
 2. Follow the [Quick Start](https://docs.confluent.io/current/quickstart.html).
 3. Read the [KSQL Documentation](https://docs.confluent.io/current/ksql/docs/), notably the
    [KSQL Tutorials and Examples](https://docs.confluent.io/current/ksql/docs/tutorials/), which include Docker-based
@@ -130,6 +127,6 @@ Contributions to the code, examples, documentation, etc. are very much appreciat
 
 # License
 
-The project is [licensed](LICENSE) under the Apache License, version 2.0.
+The project is licensed under the [Confluent Community License](LICENSE).
 
 *Apache, Apache Kafka, Kafka, and associated open source project names are trademarks of the [Apache Software Foundation](https://www.apache.org/).*

build-tools/pom.xml

@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~
-  ~ Copyright 2017 Confluent Inc.
+<!--
+  ~ Copyright 2018 Confluent Inc.
   ~
-  ~ 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
+  ~ Licensed under the Confluent Community 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
+  ~ http://www.confluent.io/confluent-community-license
   ~
   ~ 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.
-  ~-->
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES 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">

checkstyle/checkstyle.properties

@@ -2,17 +2,15 @@
 #
 # Copyright 2018 Confluent Inc.
 #
-# 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
+# Licensed under the Confluent Community 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
+# http://www.confluent.io/confluent-community-license
 #
 # 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.
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
 #
 
 checkstyle.hideutilityclassconstructor.severity=error

checkstyle/suppressions.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0"?>
 
+<!--
+  ~ Copyright 2018 Confluent Inc.
+  ~
+  ~ Licensed under the Confluent Community License; you may not use this file
+  ~ except in compliance with the License.  You may obtain a copy of the License at
+  ~
+  ~ http://www.confluent.io/confluent-community-license
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations under the License.
+  -->
+
 <!DOCTYPE suppressions PUBLIC
   "-//Puppy Crawl//DTD Suppressions 1.1//EN"
   "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

config/datagen.properties

@@ -1,2 +1,16 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 # This properties file should ONLY be used when you run KSQL with Confluent Enterprise Platform.
 interceptor.classes=io.confluent.monitoring.clients.interceptor.MonitoringProducerInterceptor

config/ksql-server.properties

@@ -1,2 +1,16 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 bootstrap.servers=localhost:9092
 listeners=http://localhost:8088

config/log4j-file.properties

@@ -1,3 +1,17 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 # For the general syntax of property based configuration files see
 # the documentation of org.apache.log4j.PropertyConfigurator.
 

config/log4j-rolling.properties

@@ -1,3 +1,17 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 # this is a sample log4j config that will roll log files
 # lines with `File=` may need to be updated for your environment
 

config/log4j-silent.properties

@@ -1 +1,15 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 log4j.rootLogger=OFF

config/log4j.properties

@@ -1,3 +1,17 @@
+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Confluent Community License; you may not use this file
+# except in compliance with the License.  You may obtain a copy of the License at
+#
+# http://www.confluent.io/confluent-community-license
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+#
+
 log4j.rootLogger=INFO, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

debian/confluent-ksql.spec.in

@@ -3,7 +3,7 @@ Name: confluent-ksql
 Version: ##RPMVERSION##
 Release: ##RPMRELEASE##
 Group: Applications/Internet
-License: Apache (v2)
+License: Confluent Community License
 Source0: confluent-ksql-%{version}.tar.gz
 URL: http://confluent.io
 BuildRoot: %{_tmppath}/%{name}-%{version}-root

debian/copyright

@@ -3,25 +3,20 @@ Upstream-Name: ksql
 Source: https://github.com/confluentinc/ksql
 
 Files: *
-Copyright: 2014 Confluent, Inc.
-License: Apache-2
+Copyright: 2018 Confluent, Inc.
+License: Confluent Community License
 
 Files: debian/*
-Copyright: 2014 Confluent, Inc.
-License: Apache-2
+Copyright: 2018 Confluent, Inc.
+License: Confluent Community License
 
-License: Apache-2
- 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
+License: Confluent Community License
+ Licensed under the Confluent Community 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
+ http://www.confluent.io/confluent-community-license
  .
  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 overning permissions and limitations under
- the License.
- .
- On Debian systems, the Apache 2.0 license can be found in
- /usr/share/common-licenses/Apache-2.0.
+ WARRANTIES OF ANY KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations under the License.

debian/rules

@@ -8,3 +8,7 @@ override_dh_systemd_enable:
 
 override_dh_systemd_start:
 	dh_systemd_start --no-start
+
+override_jh_manifest:
+	# Disable jh_manifest target, which is unneccessary and fails against Scala 2.12.
+	# See https://manpages.debian.org/testing/debhelper/dh.1.en.html#OVERRIDE_TARGETS

docs/capacity-planning.rst

@@ -70,10 +70,15 @@ Some queries require that the input stream be repartitioned so that all messages
     To determine if your query needs a repartition, you can use the ``DESCRIBE EXTENDED`` and ``EXPLAIN`` statements.
     For example, consider the following table created from the quickstart:
 
-    .. code:: bash
+    .. code:: sql
+
+        CREATE TABLE pageviews_by_page AS SELECT pageid, COUNT(*) FROM pageviews_original GROUP BY pageid;
+        DESCRIBE EXTENDED pageviews_by_page;
+        
+    Your output should resemble:
+
+    ::
 
-        ksql> CREATE TABLE pageviews_by_page AS SELECT pageid, COUNT(*) FROM pageviews_original GROUP BY pageid;
-        ksql> DESCRIBE EXTENDED pageviews_by_page;
         ...
         Queries that write into this TABLE
         -----------------------------------
@@ -83,9 +88,13 @@ Some queries require that the input stream be repartitioned so that all messages
 
     The DESCRIBE EXTENDED output includes the Query ID for the query populating the table. You can run EXPLAIN against the query to print the underlying streams topology:
 
-    .. code:: bash
+    .. code:: text
+
+        EXPLAIN CTAS_PAGEVIEWS_BY_PAGE;
+
+    Your output should resemble:
 
-        ksql> EXPLAIN CTAS_PAGEVIEWS_BY_PAGE;
+    ::
 
         Type                 : QUERY
         SQL                  : CREATE TABLE pageviews_by_page AS SELECT pageid, COUNT(*) FROM pageviews_original GROUP BY pageid;