Skip to content

Commit

Permalink
update pom.xml, separate shade-plugin to dl and spark-version
Browse files Browse the repository at this point in the history
  • Loading branch information
@qiuxin2012 @yiheng-wang-intel
qiuxin2012 authored and yiheng-wang-intel committed Jun 13, 2017
1 parent a87143a commit c9a3c54
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 40 deletions.
37 changes: 37 additions & 0 deletions spark/dl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,43 @@
</executions>
</plugin>

<plugin>
<!--Please don't merge this shade plugin with spark-version's shade plugin to spark/pom.xml,
or shade plugin will be executed after assembly plugin. -->
<groupId>org.apache.maven.plugins</groupId>
<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>
<excludes>
<exclude>META-INF/maven/com.google.protobuf/protobuf-java/*</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>com.intel.analytics.bigdl.shaded.protobuf</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down
40 changes: 0 additions & 40 deletions spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,44 +36,4 @@
<version>1.0.0</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<artifactSet>
<includes>
<include>org.spark-project.spark:unused</include>
<include>com.google.protobuf</include>
</includes>
</artifactSet>
<filters>
<filter>
<artifact>com.google.protobuf</artifact>
<excludes>
<exclude>META-INF/maven/com.google.protobuf/protobuf-java/*</exclude>
</excludes>
</filter>
</filters>
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
<shadedPattern>com.intel.analytics.bigdl.shaded.protobuf</shadedPattern>
</relocation>
</relocations>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
25 changes: 25 additions & 0 deletions spark/spark-version/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,29 @@
<modules>
<module>${spark-version.project}</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<artifactSet>
<includes>
<include>org.spark-project.spark:unused</include>
</includes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit c9a3c54

Please sign in to comment.