You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2020/06/15 03:16:35 UTC
[flink] branch release-1.11 updated: [FLINK-18173][build] Bundle
flink-csv and flink-json jars in lib
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new f55b23c [FLINK-18173][build] Bundle flink-csv and flink-json jars in lib
f55b23c is described below
commit f55b23cde9cef5489d137c80fdcfcd39f138835e
Author: Jingsong Lee <ji...@gmail.com>
AuthorDate: Mon Jun 15 11:14:46 2020 +0800
[FLINK-18173][build] Bundle flink-csv and flink-json jars in lib
This closes #12527
---
docs/dev/table/connect.md | 6 ++----
docs/dev/table/connect.zh.md | 6 ++----
docs/dev/table/connectors/formats/avro.md | 3 ++-
docs/dev/table/connectors/formats/avro.zh.md | 3 ++-
flink-dist/src/main/assemblies/bin.xml | 15 +++++++++++++++
flink-end-to-end-tests/flink-sql-client-test/pom.xml | 14 --------------
flink-end-to-end-tests/test-scripts/test_sql_client.sh | 4 ----
7 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/docs/dev/table/connect.md b/docs/dev/table/connect.md
index 5b6973d..0519752 100644
--- a/docs/dev/table/connect.md
+++ b/docs/dev/table/connect.md
@@ -54,11 +54,9 @@ The following tables list all available connectors and formats. Their mutual com
| Name | Maven dependency | SQL Client JAR |
| :------------------------- | :--------------------------- | :--------------------- |
| Old CSV (for files) | Built-in | Built-in |
-| CSV (for Kafka) | `flink-csv` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-csv/{{site.version}}/flink-csv-{{site.version}}-sql-jar.jar) |
-| JSON | `flink-json` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-json/{{site.version}}/flink-json-{{site.version}}-sql-jar.jar) |
+| CSV (for Kafka) | `flink-csv` | Built-in |
+| JSON | `flink-json` | Built-in |
| Apache Avro | `flink-avro` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-avro/{{site.version}}/flink-avro-{{site.version}}-sql-jar.jar) |
-| Apache ORC | `flink-orc` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-orc{{site.scala_version_suffix}}/{{site.version}}/flink-orc{{site.scala_version_suffix}}-{{site.version}}-jar-with-dependencies.jar) |
-| Apache Parquet | `flink-parquet` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-parquet{{site.scala_version_suffix}}/{{site.version}}/flink-parquet{{site.scala_version_suffix}}-{{site.version}}-jar-with-dependencies.jar) |
{% else %}
diff --git a/docs/dev/table/connect.zh.md b/docs/dev/table/connect.zh.md
index f71aa3f..41d87a1 100644
--- a/docs/dev/table/connect.zh.md
+++ b/docs/dev/table/connect.zh.md
@@ -54,11 +54,9 @@ The following tables list all available connectors and formats. Their mutual com
| Name | Maven dependency | SQL Client JAR |
| :------------------------- | :--------------------------- | :--------------------- |
| Old CSV (for files) | Built-in | Built-in |
-| CSV (for Kafka) | `flink-csv` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-csv/{{site.version}}/flink-csv-{{site.version}}-sql-jar.jar) |
-| JSON | `flink-json` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-json/{{site.version}}/flink-json-{{site.version}}-sql-jar.jar) |
+| CSV (for Kafka) | `flink-csv` | Built-in |
+| JSON | `flink-json` | Built-in |
| Apache Avro | `flink-avro` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-avro/{{site.version}}/flink-avro-{{site.version}}-sql-jar.jar) |
-| Apache ORC | `flink-orc` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-orc{{site.scala_version_suffix}}/{{site.version}}/flink-orc{{site.scala_version_suffix}}-{{site.version}}-jar-with-dependencies.jar) |
-| Apache Parquet | `flink-parquet` | [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-parquet{{site.scala_version_suffix}}/{{site.version}}/flink-parquet{{site.scala_version_suffix}}-{{site.version}}-jar-with-dependencies.jar) |
{% else %}
diff --git a/docs/dev/table/connectors/formats/avro.md b/docs/dev/table/connectors/formats/avro.md
index a68a6f1..017c96c 100644
--- a/docs/dev/table/connectors/formats/avro.md
+++ b/docs/dev/table/connectors/formats/avro.md
@@ -38,7 +38,8 @@ In order to setup the Avro format, the following table provides dependency infor
<div class="codetabs" markdown="1">
<div data-lang="SQL Client JAR" markdown="1">
-Avro format is part of the binary distribution, but requires additional [Hadoop dependency]({% link ops/deployment/hadoop.md %}) for cluster execution.
+You can download flink-avro from [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-avro/{{site.version}}/flink-avro-{{site.version}}-sql-jar.jar),
+and requires additional [Hadoop dependency]({% link ops/deployment/hadoop.md %}) for cluster execution.
</div>
<div data-lang="Maven dependency" markdown="1">
{% highlight xml %}
diff --git a/docs/dev/table/connectors/formats/avro.zh.md b/docs/dev/table/connectors/formats/avro.zh.md
index a3ed0ba..ee8f1ea 100644
--- a/docs/dev/table/connectors/formats/avro.zh.md
+++ b/docs/dev/table/connectors/formats/avro.zh.md
@@ -38,7 +38,8 @@ In order to setup the Avro format, the following table provides dependency infor
<div class="codetabs" markdown="1">
<div data-lang="SQL Client JAR" markdown="1">
-Avro format is part of the binary distribution, but requires additional [Hadoop dependency]({% link ops/deployment/hadoop.zh.md %}) for cluster execution.
+You can download flink-avro from [Download](https://repo.maven.apache.org/maven2/org/apache/flink/flink-avro/{{site.version}}/flink-avro-{{site.version}}-sql-jar.jar),
+and requires additional [Hadoop dependency]({% link ops/deployment/hadoop.md %}) for cluster execution.
</div>
<div data-lang="Maven dependency" markdown="1">
{% highlight xml %}
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index c68f9d6..a547556 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -84,6 +84,21 @@ under the License.
<fileMode>0644</fileMode>
</file>
+ <!-- Built-in formats -->
+ <file>
+ <source>../flink-formats/flink-csv/target/flink-csv-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>flink-csv-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
+ <file>
+ <source>../flink-formats/flink-json/target/flink-json-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>flink-json-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
<!-- copy the config file -->
<file>
<source>src/main/resources/flink-conf.yaml</source>
diff --git a/flink-end-to-end-tests/flink-sql-client-test/pom.xml b/flink-end-to-end-tests/flink-sql-client-test/pom.xml
index 6d83393..00103d8 100644
--- a/flink-end-to-end-tests/flink-sql-client-test/pom.xml
+++ b/flink-end-to-end-tests/flink-sql-client-test/pom.xml
@@ -162,20 +162,6 @@ under the License.
</artifactItem>
<artifactItem>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-json</artifactId>
- <version>${project.version}</version>
- <classifier>sql-jar</classifier>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-csv</artifactId>
- <version>${project.version}</version>
- <classifier>sql-jar</classifier>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.flink</groupId>
<artifactId>flink-sql-connector-kafka-0.10_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>jar</type>
diff --git a/flink-end-to-end-tests/test-scripts/test_sql_client.sh b/flink-end-to-end-tests/test-scripts/test_sql_client.sh
index 9872980..f75c92e 100755
--- a/flink-end-to-end-tests/test-scripts/test_sql_client.sh
+++ b/flink-end-to-end-tests/test-scripts/test_sql_client.sh
@@ -142,7 +142,6 @@ start_taskmanagers 2
echo "Testing SQL statements..."
-JSON_SQL_JAR=$(find "$SQL_JARS_DIR" | grep "json" )
KAFKA_SQL_JAR=$(find "$SQL_JARS_DIR" | grep "kafka_" )
ELASTICSEARCH_SQL_JAR=$(find "$SQL_JARS_DIR" | grep "elasticsearch$ELASTICSEARCH_VERSION" )
@@ -224,7 +223,6 @@ EOF
JOB_ID=$($FLINK_DIR/bin/sql-client.sh embedded \
--jar $KAFKA_SQL_JAR \
- --jar $JSON_SQL_JAR \
--jar $ELASTICSEARCH_SQL_JAR \
--jar $SQL_TOOLBOX_JAR \
--environment $SQL_CONF \
@@ -253,7 +251,6 @@ EOF
JOB_ID=$($FLINK_DIR/bin/sql-client.sh embedded \
--jar $KAFKA_SQL_JAR \
- --jar $JSON_SQL_JAR \
--jar $ELASTICSEARCH_SQL_JAR \
--jar $SQL_TOOLBOX_JAR \
--environment $SQL_CONF \
@@ -286,7 +283,6 @@ EOF
JOB_ID=$($FLINK_DIR/bin/sql-client.sh embedded \
--jar $KAFKA_SQL_JAR \
- --jar $JSON_SQL_JAR \
--jar $ELASTICSEARCH_SQL_JAR \
--jar $SQL_TOOLBOX_JAR \
--environment $SQL_CONF \