From 0707a528721f09b27d3f7dc9e753275ce2bb5fa7 Mon Sep 17 00:00:00 2001
From: birdstorm <samuelwyf@hotmail.com>
Date: Thu, 6 Sep 2018 19:25:24 +0800
Subject: [PATCH] Test publish 1.1 (#439)

---
 core/pom.xml                         |  2 +-
 core/scripts/start-tithriftserver.sh |  2 +-
 core/scripts/tispark-sql             |  2 +-
 core/scripts/version.sh              |  2 +-
 pom.xml                              |  2 +-
 tikv-client/pom.xml                  | 25 +++++++++++++++++--------
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 2a4615d858..1ed105d377 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/scripts/start-tithriftserver.sh b/core/scripts/start-tithriftserver.sh
index ca18336a5b..410c017353 100755
--- a/core/scripts/start-tithriftserver.sh
+++ b/core/scripts/start-tithriftserver.sh
@@ -23,7 +23,7 @@
 # Enter posix mode for bash
 set -o posix
 
-TISPARK_JAR=tispark-core-1.1-SNAPSHOT-jar-with-dependencies.jar
+TISPARK_JAR=tispark-core-1.1-jar-with-dependencies.jar
 
 if [ -z "${SPARK_HOME}" ]; then
   export SPARK_HOME="$(cd "`dirname "$0"`"/..; pwd)"
diff --git a/core/scripts/tispark-sql b/core/scripts/tispark-sql
index 02066b873a..959b1825c3 100755
--- a/core/scripts/tispark-sql
+++ b/core/scripts/tispark-sql
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-TISPARK_JAR=tispark-1.1-SNAPSHOT-jar-with-dependencies.jar
+TISPARK_JAR=tispark-1.1-jar-with-dependencies.jar
 
 if [ -z "${SPARK_HOME}" ]; then
   source "$(dirname "$0")"/find-spark-home
diff --git a/core/scripts/version.sh b/core/scripts/version.sh
index d6d110a8d3..9a60997004 100755
--- a/core/scripts/version.sh
+++ b/core/scripts/version.sh
@@ -15,7 +15,7 @@
 #
 
 
-TiSparkReleaseVersion=1.1-SNAPSHOT
+TiSparkReleaseVersion=1.1
 TiSparkBuildTS=`date -u '+%Y-%m-%d %I:%M:%S'`
 TiSparkGitHash=`git rev-parse HEAD`
 TiSparkGitBranch=`git rev-parse --abbrev-ref HEAD`
diff --git a/pom.xml b/pom.xml
index 7fb1c64805..e1acd947f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.pingcap.tispark</groupId>
     <artifactId>tispark-parent</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.1</version>
     <packaging>pom</packaging>
     <name>TiSpark Project Parent POM</name>
     <url>http://github.copm/pingcap/tispark</url>
diff --git a/tikv-client/pom.xml b/tikv-client/pom.xml
index a425483d5f..eff2263edd 100644
--- a/tikv-client/pom.xml
+++ b/tikv-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pingcap.tispark</groupId>
         <artifactId>tispark-parent</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <slf4j.version>1.7.16</slf4j.version>
         <grpc.version>1.7.0</grpc.version>
         <powermock.version>1.6.6</powermock.version>
-        <jackson.version>2.6.6</jackson.version>
+        <jackson.version>2.6.5</jackson.version>
         <trove4j.version>3.0.1</trove4j.version>
         <joda-time.version>2.9.9</joda-time.version>
         <joda-convert.version>1.9.2</joda-convert.version>
@@ -327,22 +327,31 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
                             <relocations>
                                 <relocation>
-                                    <pattern>io.netty</pattern>
-                                    <shadedPattern>io.netty.netty4pingcap</shadedPattern>
+                                    <pattern>com.fasterxml</pattern>
+                                    <shadedPattern>shade.com.fasterxml.jackson</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.grpc</pattern>
+                                    <shadedPattern>shade.io.grpc</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.google.protobuf</pattern>
-                                    <shadedPattern>com.google.proto4pingcap</shadedPattern>
+                                    <shadedPattern>shade.com.google.protobuf</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.netty</pattern>
+                                    <shadedPattern>shade.io.netty</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
-                                    <shadedPattern>com.google.guava4pingcap</shadedPattern>
+                                    <shadedPattern>shade.com.google.common</shadedPattern>
                                 </relocation>
                             </relocations>
-                            <createSourcesJar>true</createSourcesJar>
-                            <shadeSourcesContent>true</shadeSourcesContent>
                         </configuration>
                     </execution>
                 </executions>