Repository: ambari Updated Branches: refs/heads/trunk cbcc93327 -> 4b565a706
AMBARI-5755. Views: Pig and Files view no longer need to include dependency classes. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b565a70 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b565a70 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b565a70 Branch: refs/heads/trunk Commit: 4b565a706fa7184e4735d233bced94ed1416a947 Parents: cbcc933 Author: Jaimin Jetly <[email protected]> Authored: Wed May 14 10:50:16 2014 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed May 14 10:52:25 2014 -0700 ---------------------------------------------------------------------- contrib/views/files/pom.xml | 42 ++++++++++++++++++++++------------------ contrib/views/pig/pom.xml | 41 +++++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4b565a70/contrib/views/files/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 18232c4..9a817d2 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -183,23 +183,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <outputDirectory>${basedir}/target</outputDirectory> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> @@ -208,6 +191,21 @@ <target>1.6</target> </configuration> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> </plugins> <resources> <resource> @@ -222,6 +220,12 @@ <include>view.xml</include> </includes> </resource> + + <resource> + <targetPath>WEB-INF/lib</targetPath> + <filtering>false</filtering> + <directory>target/lib</directory> + </resource> </resources> <pluginManagement> <plugins> @@ -295,7 +299,7 @@ <version>2.6</version> <executions> <execution> - <id>copy-amabri-views</id> + <id>copy-ambari-views</id> <phase>package</phase> <goals> <goal>copy-resources</goal> @@ -307,7 +311,7 @@ <resource> <directory>${basedir}/target/</directory> <includes> - <include>*-dependencies.jar</include> + <include>*.jar</include> </includes> <filtering>true</filtering> </resource> http://git-wip-us.apache.org/repos/asf/ambari/blob/4b565a70/contrib/views/pig/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index 4a0b29b..389cf54 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -176,23 +176,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <outputDirectory>${basedir}/target</outputDirectory> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> @@ -201,6 +184,21 @@ <target>1.6</target> </configuration> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> </plugins> <resources> <resource> @@ -215,6 +213,11 @@ <directory>src/main/resources/ui/pig-web/public</directory> <filtering>false</filtering> </resource> + <resource> + <targetPath>WEB-INF/lib</targetPath> + <filtering>false</filtering> + <directory>target/lib</directory> + </resource> </resources> </build> <profiles> @@ -231,7 +234,7 @@ <version>2.6</version> <executions> <execution> - <id>copy-amabri-views</id> + <id>copy-ambari-views</id> <phase>package</phase> <goals> <goal>copy-resources</goal> @@ -243,7 +246,7 @@ <resource> <directory>${basedir}/target/</directory> <includes> - <include>*-dependencies.jar</include> + <include>*.jar</include> </includes> <filtering>true</filtering> </resource>
