You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/08/30 06:12:04 UTC
git commit: FALCON-101 mvn release:prepare fails because of build
order. Contributed by Shwetha GS
Updated Branches:
refs/heads/master 19ba0368e -> 70b8a8e11
FALCON-101 mvn release:prepare fails because of build order. 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/70b8a8e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/70b8a8e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/70b8a8e1
Branch: refs/heads/master
Commit: 70b8a8e11a91fe3682028e18f249afa326d35605
Parents: 19ba036
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Fri Aug 30 09:41:34 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Fri Aug 30 09:41:34 2013 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
oozie-bundle-el-extension.patch | 2 +-
pom.xml | 12 +++++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/70b8a8e1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 675da6c..fbf99d3 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,9 @@ Trunk (Unreleased)
Srikanth Sundarrajan)
BUG FIXES
+ FALCON-101 mvn release:prepare fails because of build order. (Shwetha GS
+ via Srikanth Sundarrajan)
+
FALCON-100 Build error with mvn 3.0.4. (Shwetha GS)
FALCON-43 Add Falcon to Sonar for Analysis. (Srikanth Sundarrajan via
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/70b8a8e1/oozie-bundle-el-extension.patch
----------------------------------------------------------------------
diff --git a/oozie-bundle-el-extension.patch b/oozie-bundle-el-extension.patch
index 1797cb8..4ed64f2 100644
--- a/oozie-bundle-el-extension.patch
+++ b/oozie-bundle-el-extension.patch
@@ -8,7 +8,7 @@ index 38ec438..c3bc9b8 100644
<dependency>
+ <groupId>org.apache.falcon</groupId>
+ <artifactId>falcon-oozie-el-extension</artifactId>
-+ <version>0.4-SNAPSHOT</version>
++ <version>0.4-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/70b8a8e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aeba853..d211e21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
</profiles>
<modules>
+ <module>build-tools</module>
<module>client</module>
<module>metrics</module>
<module>common</module>
@@ -162,7 +163,6 @@
<module>prism</module>
<module>webapp</module>
<module>docs</module>
- <module>build-tools</module>
</modules>
<repositories>
@@ -715,9 +715,6 @@
<outputDirectory>target/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
<testOutputDirectory>target/test-classes</testOutputDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -979,7 +976,7 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>build-tools</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
@@ -1049,6 +1046,11 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
</plugins>
</build>
</project>