falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject git commit: FALCON-100 Build error with mvn 3.0.4. Contributed by Shwetha GS
Date Wed, 28 Aug 2013 07:29:10 GMT
Updated Branches:
  refs/heads/master b96042419 -> 16972af86


FALCON-100 Build error with mvn 3.0.4. Contributed by Shwetha GS


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/16972af8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/16972af8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/16972af8

Branch: refs/heads/master
Commit: 16972af8620e653208521aa8d4b5abc8b9234b32
Parents: b960424
Author: Shwetha GS <shwetha.gs@inmobi.com>
Authored: Wed Aug 28 13:03:56 2013 +0530
Committer: Shwetha GS <shwetha.gs@inmobi.com>
Committed: Wed Aug 28 13:03:56 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt           |  2 ++
 hadoop-webapp/pom.xml |  7 +------
 webapp/pom.xml        | 24 +++++++++---------------
 3 files changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/16972af8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 00d2cd4..12188bb 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@ Trunk (Unreleased)
     Srikanth Sundarrajan)
 
   BUG FIXES
+    FALCON-100 Build error with mvn 3.0.4. (Shwetha GS)
+
     FALCON-43 Add Falcon to Sonar for Analysis. (Srikanth Sundarrajan via
     Shwetha GS)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/16972af8/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-webapp/pom.xml b/hadoop-webapp/pom.xml
index 0d175dc..312a71b 100644
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@ -117,12 +117,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
-                <executions>
                     <execution>
                         <id>add-jars</id>
                         <phase>prepare-package</phase>
@@ -135,6 +129,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/16972af8/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2e698f0..2b3622b 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -180,21 +180,6 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/dependency</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1.1</version>
@@ -237,6 +222,15 @@
                 <version>2.8</version>
                 <executions>
                     <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>copy-dependencies</id>
                         <phase>prepare-package</phase>
                         <goals>


Mime
View raw message