diff --git a/docs/dev/batch/connectors.md b/docs/dev/batch/connectors.md
index 388b59925f3c1..23917448f39c7 100644
--- a/docs/dev/batch/connectors.md
+++ b/docs/dev/batch/connectors.md
@@ -92,7 +92,7 @@ Also, the serialization framework of Flink is able to handle classes generated f
~~~xml
org.apache.flink
- flink-avro{{ site.scala_version_suffix }}
+ flink-avro
{{site.version }}
~~~
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 12a151ee8f9ee..7efe68e8cf24b 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -59,7 +59,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index 33575912a60f8..a01431abd5390 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -84,7 +84,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
@@ -95,7 +95,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
test
test-jar
diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml
index 4f6be1dce27b0..f66a31dbda9e9 100644
--- a/flink-connectors/flink-connector-kafka-0.11/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -84,7 +84,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
@@ -104,7 +104,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
test
test-jar
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index b96274a47bc32..c9a177009299a 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -75,21 +75,13 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
true
-
- org.apache.flink
- flink-avro_${scala.binary.version}
- ${project.version}
- test
- test-jar
-
-
org.apache.kafka
kafka_${scala.binary.version}
@@ -144,6 +136,14 @@ under the License.
test-jar
+
+ org.apache.flink
+ flink-avro
+ ${project.version}
+ test
+ test-jar
+
+
org.apache.curator
curator-test
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index c711c5fbc56a3..ed322d3f053f5 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -74,7 +74,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
@@ -91,7 +91,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
test
test-jar
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
index 4f2fb45cebd66..9743a0181bc88 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -68,7 +68,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
provided
@@ -177,7 +177,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
test-jar
test
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 29f28ff10a75a..b2af9e8a898b9 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -81,7 +81,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml
index 5080b8262773a..8732a2178e59e 100644
--- a/flink-formats/flink-avro/pom.xml
+++ b/flink-formats/flink-avro/pom.xml
@@ -29,7 +29,7 @@ under the License.
..
- flink-avro_${scala.binary.version}
+ flink-avro
flink-avro
jar
@@ -45,13 +45,6 @@ under the License.
provided
-
- org.apache.flink
- flink-streaming-java_${scala.binary.version}
- ${project.version}
- provided
-
-
org.apache.avro
avro
@@ -67,28 +60,16 @@ under the License.
test
-
- org.apache.flink
- flink-test-utils_${scala.binary.version}
- ${project.version}
- test
-
+
org.apache.flink
- flink-clients_${scala.binary.version}
+ flink-test-utils_2.11
${project.version}
test
-
- org.apache.flink
- flink-streaming-java_${scala.binary.version}
- ${project.version}
- test-jar
- test
-
-
org.apache.flink
flink-core
@@ -158,6 +139,7 @@ under the License.
+
org.apache.avro
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index 446d167eb8473..3ac62dff589e2 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -60,7 +60,7 @@ under the License.
org.apache.flink
- flink-avro_${scala.binary.version}
+ flink-avro
${project.version}
test
diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
index 740e64a2fb899..34e2abbfe8956 100644
--- a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -205,7 +205,7 @@ under the License.
org.apache.flink:flink-runtime_${scala.binary.version}
org.apache.flink:flink-optimizer_${scala.binary.version}
org.apache.flink:flink-clients_${scala.binary.version}
- org.apache.flink:flink-avro_${scala.binary.version}
+ org.apache.flink:flink-avro
org.apache.flink:flink-examples-batch_${scala.binary.version}
org.apache.flink:flink-examples-streaming_${scala.binary.version}
org.apache.flink:flink-streaming-java_${scala.binary.version}
diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
index e5f682132a4eb..d705e8c137da9 100644
--- a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
+++ b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -207,7 +207,7 @@ under the License.
org.apache.flink:flink-runtime_${scala.binary.version}
org.apache.flink:flink-optimizer_${scala.binary.version}
org.apache.flink:flink-clients_${scala.binary.version}
- org.apache.flink:flink-avro_${scala.binary.version}
+ org.apache.flink:flink-avro
org.apache.flink:flink-examples-batch_${scala.binary.version}
org.apache.flink:flink-examples-streaming_${scala.binary.version}
org.apache.flink:flink-streaming-java_${scala.binary.version}