From 65fb49bb41f852375b278c9057d52c9472f0cb3a Mon Sep 17 00:00:00 2001
From: "James Z.M. Gao" <gaozhiming@360.cn>
Date: Wed, 6 Jan 2021 11:51:41 +0800
Subject: THRIFT-5334 change version of thrift-maven-plugin to 0.14.0 Client:
 Java Patch: James Z.M. Gao

---
 build/veralign.sh                   | 15 ++++++++++++++-
 contrib/thrift-maven-plugin/pom.xml |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/build/veralign.sh b/build/veralign.sh
index 422da8507..9a0d88340 100755
--- a/build/veralign.sh
+++ b/build/veralign.sh
@@ -57,6 +57,7 @@ FILES[configure.ac]=configureReplace
 FILES[contrib/Rebus/Properties/AssemblyInfo.cs]=simpleReplace
 FILES[contrib/thrift.spec]=simpleReplace
 FILES[contrib/zeromq/csharp/AssemblyInfo.cs]=simpleReplace
+FILES[contrib/thrift-maven-plugin/pom.xml]=pomReplace
 FILES[doc/specs/idl.md]=simpleReplace
 FILES[lib/as3/gradle.properties]=simpleReplace
 FILES[lib/d/src/thrift/base.d]=simpleReplace
@@ -154,7 +155,7 @@ validateVersion "${NEWVERSION}" || exit $?
 #
 function escapeVersion
 {
-    echo "$(echo $1 | sed 's/\./\\./g' | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g')"
+    echo "$(echo "$1" | sed 's/\./\\./g' | sed 's/\[/\\\[/g' | sed 's/\]/\\\]/g')"
 }
 
 # Set up verbose hilighting if running interactive
@@ -237,6 +238,18 @@ function pubspecReplace
     replace "$1" "version: ${OLDVERSION}" "version: ${NEWVERSION}"
 }
 
+#
+# pomReplace: replace a specific version field in a maven pom file
+#   must be a top level "version" field in the xml structure
+# \param $1 filename to do replacements on
+# \returns 0 on success
+#
+
+function pomReplace
+{
+    replace "$1" "^  <version>${OLDVERSION}<\/version>" "  <version>${NEWVERSION}<\/version>"
+}
+
 #
 # replace: replace occurrences of one string with another
 #     the file specified must contain the old string at least once
diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml
index b18162257..064f0cc41 100644
--- a/contrib/thrift-maven-plugin/pom.xml
+++ b/contrib/thrift-maven-plugin/pom.xml
@@ -32,7 +32,7 @@
   <artifactId>thrift-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>thrift-maven-plugin</name>
-  <version>1.0.0</version>
+  <version>0.14.0</version>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
-- 
cgit v1.2.1