LENS-884 : Fix lens-ship-jars.jar to have version in the assembly as well
Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/404d4518 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/404d4518 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/404d4518 Branch: refs/heads/LENS-581 Commit: 404d4518d9cf96d1a2c41a73da598fc27fece992 Parents: 942f071 Author: Rajat Khandelwal <[email protected]> Authored: Fri Nov 27 12:46:54 2015 +0530 Committer: Amareshwari Sriramadasu <[email protected]> Committed: Fri Nov 27 12:46:54 2015 +0530 ---------------------------------------------------------------------- lens-dist/src/main/assembly/bin-dist.xml | 1 - lens-ship-jars/pom.xml | 19 ------------------- pom.xml | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/404d4518/lens-dist/src/main/assembly/bin-dist.xml ---------------------------------------------------------------------- diff --git a/lens-dist/src/main/assembly/bin-dist.xml b/lens-dist/src/main/assembly/bin-dist.xml index 535e991..dede085 100644 --- a/lens-dist/src/main/assembly/bin-dist.xml +++ b/lens-dist/src/main/assembly/bin-dist.xml @@ -411,7 +411,6 @@ <file> <source>../lens-ship-jars/target/lens-ship-jars-${project.version}.jar</source> <outputDirectory>/server/shipjars/</outputDirectory> - <destName>lens-ship-jars.jar</destName> </file> </files> http://git-wip-us.apache.org/repos/asf/lens/blob/404d4518/lens-ship-jars/pom.xml ---------------------------------------------------------------------- diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml index b150980..ece22a1 100644 --- a/lens-ship-jars/pom.xml +++ b/lens-ship-jars/pom.xml @@ -81,26 +81,7 @@ </filter> </filters> </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>log4j.properties</resource> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" /> - </transformers> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/lens/blob/404d4518/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b19857f..732b3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -567,6 +567,28 @@ </tasks> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>log4j.properties</resource> + </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" /> + </transformers> + </configuration> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins>
