From f74ad0c65221665a7f73c932bbc1bb50d75ee2db Mon Sep 17 00:00:00 2001
From: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Date: Thu, 28 Feb 2019 12:09:39 +0100
Subject: [PATCH] [FLINK-11780] Change version scheme of Hadoop-based modules
 to conform to SNAPSHOT guidelines

This also adadpts update_branch_version.sh to correctly update versions
that have a prefix.
---
 flink-connectors/flink-connector-filesystem/pom.xml      | 2 +-
 flink-connectors/flink-hadoop-compatibility/pom.xml      | 2 +-
 flink-connectors/flink-hbase/pom.xml                     | 2 +-
 flink-connectors/flink-hcatalog/pom.xml                  | 2 +-
 flink-connectors/flink-orc/pom.xml                       | 2 +-
 flink-dist/pom.xml                                       | 2 +-
 flink-dist/src/main/assemblies/hadoop.xml                | 2 +-
 flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml | 2 +-
 flink-filesystems/flink-hadoop-fs/pom.xml                | 2 +-
 flink-formats/flink-parquet/pom.xml                      | 2 +-
 flink-formats/flink-sequence-file/pom.xml                | 2 +-
 flink-fs-tests/pom.xml                                   | 2 +-
 flink-runtime/pom.xml                                    | 2 +-
 flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml    | 2 +-
 flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml         | 2 +-
 flink-tests/pom.xml                                      | 2 +-
 flink-yarn-tests/pom.xml                                 | 6 +++---
 flink-yarn/pom.xml                                       | 2 +-
 tools/releasing/update_branch_version.sh                 | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 99903f201a24d..a0e88007d6096 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -53,7 +53,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index da63b79675754..988fddf01e279 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -63,7 +63,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 7bdf6d9dd4d9f..dd3589ab5296a 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -111,7 +111,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
index ea0ded49e411c..4165c4f10727b 100644
--- a/flink-connectors/flink-hcatalog/pom.xml
+++ b/flink-connectors/flink-hcatalog/pom.xml
@@ -69,7 +69,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-connectors/flink-orc/pom.xml b/flink-connectors/flink-orc/pom.xml
index ce22b94c76203..217074d4dc076 100644
--- a/flink-connectors/flink-orc/pom.xml
+++ b/flink-connectors/flink-orc/pom.xml
@@ -80,7 +80,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 0f15f740a8ed0..80ac2280634a5 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -408,7 +408,7 @@ under the License.
 				<dependency>
 					<groupId>org.apache.flink</groupId>
 					<artifactId>flink-shaded-hadoop2-uber</artifactId>
-					<version>${project.version}-${hadoop.version}</version>
+					<version>${hadoop.version}-${project.version}</version>
 					<!--
                         Exclusion of flink-shaded-hadoop2 not necessary, dependencies
                         are shaded away properly by flink-shaded-hadoop2-uber.
diff --git a/flink-dist/src/main/assemblies/hadoop.xml b/flink-dist/src/main/assemblies/hadoop.xml
index 0a66d19ae5884..deca87fb1e5d5 100644
--- a/flink-dist/src/main/assemblies/hadoop.xml
+++ b/flink-dist/src/main/assemblies/hadoop.xml
@@ -31,7 +31,7 @@ under the License.
 	<files>
 		<!-- copy the Hadoop uber jar -->
 		<file>
-			<source>../flink-shaded-hadoop/flink-shaded-hadoop2-uber/target/flink-shaded-hadoop2-uber-${project.version}-${hadoop.version}.jar</source>
+			<source>../flink-shaded-hadoop/flink-shaded-hadoop2-uber/target/flink-shaded-hadoop2-uber-${hadoop.version}-${project.version}.jar</source>
 			<outputDirectory>lib/</outputDirectory>
 			<destName>flink-shaded-hadoop2-uber-${project.version}-${hadoop.version}.jar</destName>
 			<fileMode>0644</fileMode>
diff --git a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
index dc96250f341c0..7b015f7a3b9e8 100644
--- a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
+++ b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 			<exclusions>
 				<!-- Needed for proper dependency convergence -->
diff --git a/flink-filesystems/flink-hadoop-fs/pom.xml b/flink-filesystems/flink-hadoop-fs/pom.xml
index 6b34455dd7cb4..23c6e3be0dd6a 100644
--- a/flink-filesystems/flink-hadoop-fs/pom.xml
+++ b/flink-filesystems/flink-hadoop-fs/pom.xml
@@ -45,7 +45,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml
index 4f1c1df0ff1af..379ecaf6a761a 100644
--- a/flink-formats/flink-parquet/pom.xml
+++ b/flink-formats/flink-parquet/pom.xml
@@ -61,7 +61,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-formats/flink-sequence-file/pom.xml b/flink-formats/flink-sequence-file/pom.xml
index 701e501f1cb58..aa842151d57a3 100644
--- a/flink-formats/flink-sequence-file/pom.xml
+++ b/flink-formats/flink-sequence-file/pom.xml
@@ -47,7 +47,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index 706c52ac5e753..fa3aeb8179543 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -39,7 +39,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index bdb34a98569a0..0cbaed3da78c7 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -70,7 +70,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
index de2890a182182..970d390bff5c2 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
@@ -34,7 +34,7 @@ under the License.
 	<name>flink-shaded-hadoop2-uber</name>
 
 	<packaging>jar</packaging>
-	<version>1.9-SNAPSHOT-${hadoop.version}</version>
+	<version>${hadoop.version}-1.9-SNAPSHOT</version>
 
 	<!--
 		the only dependency of the 'flink-shaded-hadoop2' artifact, out
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 722151dba4efd..766d3e0a3f1e7 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -33,7 +33,7 @@ under the License.
 	<name>flink-shaded-hadoop2</name>
 
 	<packaging>jar</packaging>
-	<version>1.9-SNAPSHOT-${hadoop.version}</version>
+	<version>${hadoop.version}-1.9-SNAPSHOT</version>
 
 	<dependencies>
 
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 2ed6e7edb8aa3..9fa652d06b97d 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -55,7 +55,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 8019efde81967..7613e1d65ee84 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -119,14 +119,14 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2-uber</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -392,7 +392,7 @@ under the License.
 						<artifactItem>
 							<groupId>org.apache.flink</groupId>
 							<artifactId>flink-shaded-hadoop2-uber</artifactId>
-							<version>${project.version}-${hadoop.version}</version>
+							<version>${hadoop.version}-${project.version}</version>
 							<type>jar</type>
 							<overWrite>true</overWrite>
 							<outputDirectory>${project.build.directory}/shaded-hadoop</outputDirectory>
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index 761c2a2ab48d9..15ef508da9747 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -56,7 +56,7 @@ under the License.
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2</artifactId>
-			<version>${project.version}-${hadoop.version}</version>
+			<version>${hadoop.version}-${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
index 61da1a50e1a63..10290d90d3cef 100755
--- a/tools/releasing/update_branch_version.sh
+++ b/tools/releasing/update_branch_version.sh
@@ -49,7 +49,7 @@ fi
 cd ..
 
 #change version in all pom files
-find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'(.*)</version>#<version>'$NEW_VERSION'\1</version>#' {} \;
+find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>(.*)'$OLD_VERSION'(.*)</version>#<version>\1'$NEW_VERSION'\2</version>#' {} \;
 
 #change version of documentation
 cd docs