You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/01/31 14:13:35 UTC

[flink-shaded] 39/47: [FLINK-9817] Update sub-module versions to 5.0

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git

commit 8c88fdb9e7a51f81e641b8aed4c7bf05fd18832f
Author: Nico Kruber <ni...@gmail.com>
AuthorDate: Mon Jul 16 14:16:17 2018 +0200

    [FLINK-9817] Update sub-module versions to 5.0
---
 flink-shaded-asm-5/pom.xml                                              | 2 +-
 flink-shaded-guava-18/pom.xml                                           | 2 +-
 flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml              | 2 +-
 .../flink-shaded-jackson-module-jsonSchema-2/pom.xml                    | 2 +-
 flink-shaded-jackson-parent/pom.xml                                     | 2 +-
 flink-shaded-netty-4/pom.xml                                            | 2 +-
 tools/releasing/update_branch_version.sh                                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flink-shaded-asm-5/pom.xml b/flink-shaded-asm-5/pom.xml
index b8d6d00..50da34a 100644
--- a/flink-shaded-asm-5/pom.xml
+++ b/flink-shaded-asm-5/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
     <artifactId>flink-shaded-asm</artifactId>
     <name>flink-shaded-asm-5</name>
-    <version>${asm.version}-4.0</version>
+    <version>${asm.version}-5.0</version>
 
     <packaging>jar</packaging>
 
diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml
index 747642c..daedcf0 100644
--- a/flink-shaded-guava-18/pom.xml
+++ b/flink-shaded-guava-18/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
     <artifactId>flink-shaded-guava</artifactId>
     <name>flink-shaded-guava-18</name>
-    <version>${guava.version}-4.0</version>
+    <version>${guava.version}-5.0</version>
 
     <packaging>jar</packaging>
 
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 4a7c753..611fb18 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
     <parent>
         <groupId>org.apache.flink</groupId>
         <artifactId>flink-shaded-jackson-parent</artifactId>
-        <version>2.7.9-4.0</version>
+        <version>2.7.9-5.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index e723489..7b5a9a5 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -25,7 +25,7 @@ under the License.
     <parent>
         <groupId>org.apache.flink</groupId>
         <artifactId>flink-shaded-jackson-parent</artifactId>
-        <version>2.7.9-4.0</version>
+        <version>2.7.9-5.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index fa12f54..1c3e3d0 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -32,7 +32,7 @@ under the License.
     <artifactId>flink-shaded-jackson-parent</artifactId>
     <name>flink-shaded-jackson-parent</name>
     <packaging>pom</packaging>
-    <version>2.7.9-4.0</version>
+    <version>2.7.9-5.0</version>
 
     <properties>
         <jackson.version>2.7.9</jackson.version>
diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml
index 8b5c65e..9c43a59 100644
--- a/flink-shaded-netty-4/pom.xml
+++ b/flink-shaded-netty-4/pom.xml
@@ -31,7 +31,7 @@ under the License.
 
     <artifactId>flink-shaded-netty</artifactId>
     <name>flink-shaded-netty-4</name>
-    <version>${netty.version}-4.0</version>
+    <version>${netty.version}-5.0</version>
 
     <properties>
         <netty.version>4.1.24.Final</netty.version>
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
index ef89fe2..429dfd3 100644
--- a/tools/releasing/update_branch_version.sh
+++ b/tools/releasing/update_branch_version.sh
@@ -53,7 +53,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'</version>#' {} \;
+find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#; s#-'$OLD_VERSION'</version>#-'$NEW_VERSION'</version>#' {} \;
 
 git commit -am "Update version to $NEW_VERSION"