From 60301e5d1dc2833a1f8ca2b22f0e17861e1826e7 Mon Sep 17 00:00:00 2001
From: qiuxin2012 <qiuxin2012cs@gmail.com>
Date: Tue, 7 Nov 2017 14:18:42 +0800
Subject: [PATCH 1/2] use shade to package jar-with-dependencies

---
 spark/dl/pom.xml | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/spark/dl/pom.xml b/spark/dl/pom.xml
index 6fe0819aea5..d7e30dd63ca 100644
--- a/spark/dl/pom.xml
+++ b/spark/dl/pom.xml
@@ -167,11 +167,6 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.0.0</version>
                 <configuration>
-                    <artifactSet>
-                        <includes>
-                            <include>com.google.protobuf</include>
-                        </includes>
-                    </artifactSet>
                     <filters>
                         <filter>
                             <artifact>com.google.protobuf</artifact>
@@ -189,30 +184,36 @@
                 </configuration>
                 <executions>
                     <execution>
+			            <id>shade</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>com.google.protobuf</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                    <execution>
+			            <id>without-spark</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+			                <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>without-spark</id>
-                        <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
                     <execution>
                         <id>with-spark</id>
                         <configuration>

From 9dd4f4ddb921ef8c018fc3b99360faa07ae23c4e Mon Sep 17 00:00:00 2001
From: qiuxin2012 <qiuxin2012cs@gmail.com>
Date: Tue, 7 Nov 2017 14:37:07 +0800
Subject: [PATCH 2/2] ajust incident

---
 spark/dl/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spark/dl/pom.xml b/spark/dl/pom.xml
index d7e30dd63ca..8a4db06d7e4 100644
--- a/spark/dl/pom.xml
+++ b/spark/dl/pom.xml
@@ -184,7 +184,7 @@
                 </configuration>
                 <executions>
                     <execution>
-			            <id>shade</id>
+                        <id>shade</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
@@ -198,13 +198,13 @@
                         </configuration>
                     </execution>
                     <execution>
-			            <id>without-spark</id>
+                        <id>without-spark</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-			                <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
                         </configuration>
                     </execution>