You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2013/05/14 21:09:30 UTC
git commit: FALCON-19 - Bump up the release version to 0.3-SNAPSHOT
Updated Branches:
refs/heads/master f90fc4d30 -> 3e7c8d30b
FALCON-19 - Bump up the release version to 0.3-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/3e7c8d30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/3e7c8d30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/3e7c8d30
Branch: refs/heads/master
Commit: 3e7c8d30bcd4198b0a11f5e442c4ffe9e61cdd7f
Parents: f90fc4d
Author: venkatesh <ve...@hortonworks.com>
Authored: Tue May 14 12:09:22 2013 -0700
Committer: venkatesh <ve...@hortonworks.com>
Committed: Tue May 14 12:09:22 2013 -0700
----------------------------------------------------------------------
Installation-steps.txt | 2 +-
acquisition/pom.xml | 2 +-
archival/pom.xml | 2 +-
build-tools/pom.xml | 2 +-
client/pom.xml | 2 +-
common/pom.xml | 2 +-
common/src/main/resources/startup.properties | 2 +-
docs/pom.xml | 2 +-
docs/src/site/twiki/InstallationSteps.twiki | 2 +-
feed/pom.xml | 2 +-
messaging/pom.xml | 2 +-
metrics/pom.xml | 2 +-
oozie/pom.xml | 2 +-
pom.xml | 4 ++--
prism/pom.xml | 2 +-
prism/src/main/java/org/apache/falcon/Prism.java | 4 +++-
.../src/main/resources/falcon-buildinfo.properties | 1 +
process/pom.xml | 2 +-
replication/pom.xml | 2 +-
rerun/pom.xml | 2 +-
retention/pom.xml | 2 +-
test-util/pom.xml | 2 +-
webapp/pom.xml | 2 +-
webapp/src/main/java/org/apache/falcon/Main.java | 4 +++-
.../src/main/resources/falcon-buildinfo.properties | 1 +
25 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/Installation-steps.txt
----------------------------------------------------------------------
diff --git a/Installation-steps.txt b/Installation-steps.txt
index aa8472d..5d8329a 100644
--- a/Installation-steps.txt
+++ b/Installation-steps.txt
@@ -46,7 +46,7 @@ Installing Falcon
Inside your web container, where the falcon war has exploded, you should be able to find 2 files, startup.properties and runtime.properties.
The path would be:
-<container-base>/<war-location>/falcon-webapp-0.2-SNAPSHOT/WEB-INF/classes
+<container-base>/<war-location>/falcon-webapp-<<project version>>/WEB-INF/classes
*startup.properties:* Specifies values/paths used by Falcon on startup. Common entries usually include config store location
,broker url (for messaging), and other settings.Any changes to this requires Falcon to be restarted to take effect.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/acquisition/pom.xml
----------------------------------------------------------------------
diff --git a/acquisition/pom.xml b/acquisition/pom.xml
index 7c2589c..1194ed7 100644
--- a/acquisition/pom.xml
+++ b/acquisition/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-acquisition</artifactId>
<description>Apache Falcon Acquisition Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/archival/pom.xml
----------------------------------------------------------------------
diff --git a/archival/pom.xml b/archival/pom.xml
index dfd3f6d..fdedd25 100644
--- a/archival/pom.xml
+++ b/archival/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-archival</artifactId>
<description>Apache Falcon Archival Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index e8001b3..c7e7c73 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -23,6 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.falcon</groupId>
<artifactId>build-tools</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<name>Build Tools</name>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index f602533..a1d2f32 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-client</artifactId>
<description>Apache Falcon CLI client</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 3f5a247..84f5e8f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-common</artifactId>
<description>Apache Falcon Common Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/common/src/main/resources/startup.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties
index e16fa6d..4accc39 100644
--- a/common/src/main/resources/startup.properties
+++ b/common/src/main/resources/startup.properties
@@ -46,7 +46,7 @@
debug.config.store.uri=${user.dir}/target/store
debug.config.oozie.conf.uri=${user.dir}/target/oozie
-debug.system.lib.location=${user.dir}/webapp/target/falcon-webapp-0.2-SNAPSHOT/WEB-INF/lib
+debug.system.lib.location=${user.dir}/webapp/target/falcon-webapp-${pom.version}/WEB-INF/lib
debug.broker.url=vm://localhost
debug.retry.recorder.path=${user.dir}/target/retry
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index a206267..e98bee0 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-docs</artifactId>
<description>Apache Falcon Documentation</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 11caf37..877d9ef 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -27,7 +27,7 @@
*Setting up Falcon server properties:*
Inside your web container, where the falcon war has exploded, you should be able to find 2 files, startup.properties and runtime.properties.
The path would be:
-<container-base>/<war-location>/falcon-webapp-0.2-SNAPSHOT/WEB-INF/classes
+<container-base>/<war-location>/falcon-webapp-<<project version>>/WEB-INF/classes
*startup.properties:* Specifies values/paths used by Falcon on startup. Common entries usually include config store location
,broker url (for messaging), and other settings.Any changes to this requires Falcon to be restarted to take effect.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/feed/pom.xml
----------------------------------------------------------------------
diff --git a/feed/pom.xml b/feed/pom.xml
index e01393f..14611f1 100644
--- a/feed/pom.xml
+++ b/feed/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-feed</artifactId>
<description>Apache Falcon Feed Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/messaging/pom.xml b/messaging/pom.xml
index d9f0f52..ddd9846 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-messaging</artifactId>
<description>Apache Falcon JMS messaging Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 4ff6087..f5d9fdd 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-metrics</artifactId>
<description>Apache Falcon Metrics</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/oozie/pom.xml
----------------------------------------------------------------------
diff --git a/oozie/pom.xml b/oozie/pom.xml
index 532bfc5..f813ff0 100644
--- a/oozie/pom.xml
+++ b/oozie/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-oozie-adaptor</artifactId>
<description>Apache Falcon Oozie Adaptor Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ddf4221..9e0f96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<description>Data Management and Processing Platform over Hadoop</description>
<name>Apache Falcon</name>
<packaging>pom</packaging>
@@ -779,7 +779,7 @@
<dependency>
<groupId>org.apache.falcon</groupId>
<artifactId>build-tools</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/prism/pom.xml
----------------------------------------------------------------------
diff --git a/prism/pom.xml b/prism/pom.xml
index 3eeff88..94f07e5 100644
--- a/prism/pom.xml
+++ b/prism/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-prism</artifactId>
<description>Apache Falcon Prism</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/prism/src/main/java/org/apache/falcon/Prism.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/Prism.java b/prism/src/main/java/org/apache/falcon/Prism.java
index 4c8b43c..d67ecb9 100644
--- a/prism/src/main/java/org/apache/falcon/Prism.java
+++ b/prism/src/main/java/org/apache/falcon/Prism.java
@@ -18,6 +18,7 @@
package org.apache.falcon;
+import org.apache.falcon.util.BuildProperties;
import org.apache.falcon.util.EmbeddedServer;
/**
@@ -43,8 +44,9 @@ public final class Prism {
* @throws Exception exception
*/
public static void main(final String[] args) throws Exception {
+ String projectVersion = BuildProperties.get().getProperty("project.version");
EmbeddedServer server = new EmbeddedServer(PORT,
- "prism/target/falcon-prism-0.2-SNAPSHOT");
+ "prism/target/falcon-prism-" + projectVersion);
server.start();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/prism/src/main/resources/falcon-buildinfo.properties
----------------------------------------------------------------------
diff --git a/prism/src/main/resources/falcon-buildinfo.properties b/prism/src/main/resources/falcon-buildinfo.properties
index c9a5b1a..5a7cb82 100644
--- a/prism/src/main/resources/falcon-buildinfo.properties
+++ b/prism/src/main/resources/falcon-buildinfo.properties
@@ -21,6 +21,7 @@
*.build.user=${user.name}
*.build.epoch=${timestamp}
+*.project.version=${pom.version}
*.build.version=${pom.version}-r${buildNumber}
*.vc.revision=${buildNumber}
*.vc.source.url=${scm.connection}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/process/pom.xml
----------------------------------------------------------------------
diff --git a/process/pom.xml b/process/pom.xml
index 5fa95c9..99948a1 100644
--- a/process/pom.xml
+++ b/process/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-process</artifactId>
<description>Apache Falcon Process Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/replication/pom.xml
----------------------------------------------------------------------
diff --git a/replication/pom.xml b/replication/pom.xml
index 376a702..0e4e132 100644
--- a/replication/pom.xml
+++ b/replication/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-replication</artifactId>
<description>Apache Falcon Replication Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/rerun/pom.xml
----------------------------------------------------------------------
diff --git a/rerun/pom.xml b/rerun/pom.xml
index ca3d592..e772f20 100644
--- a/rerun/pom.xml
+++ b/rerun/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-rerun</artifactId>
<description>Apache Falcon Rerun Handler</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/retention/pom.xml
----------------------------------------------------------------------
diff --git a/retention/pom.xml b/retention/pom.xml
index 16a730e..8fc58c1 100644
--- a/retention/pom.xml
+++ b/retention/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-retention</artifactId>
<description>Apache Falcon Retention Module</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/test-util/pom.xml
----------------------------------------------------------------------
diff --git a/test-util/pom.xml b/test-util/pom.xml
index 833d777..ac5260a 100644
--- a/test-util/pom.xml
+++ b/test-util/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-test-util</artifactId>
<description>Apache Falcon Test Utility</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2e74752..0d86a8c 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.falcon</groupId>
<artifactId>falcon-main</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>falcon-webapp</artifactId>
<description>Apache Falcon Web Application</description>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/webapp/src/main/java/org/apache/falcon/Main.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/falcon/Main.java b/webapp/src/main/java/org/apache/falcon/Main.java
index 609cbfc..438af8f 100644
--- a/webapp/src/main/java/org/apache/falcon/Main.java
+++ b/webapp/src/main/java/org/apache/falcon/Main.java
@@ -19,6 +19,7 @@
package org.apache.falcon;
import org.apache.activemq.broker.BrokerService;
+import org.apache.falcon.util.BuildProperties;
import org.apache.falcon.util.EmbeddedServer;
/**
@@ -34,8 +35,9 @@ public final class Main {
public static void main(String[] args) throws Exception {
+ String projectVersion = BuildProperties.get().getProperty("project.version");
EmbeddedServer server = new EmbeddedServer(15000,
- "webapp/target/falcon-webapp-0.2-SNAPSHOT");
+ "webapp/target/falcon-webapp-" + projectVersion);
server.start();
BrokerService broker = new BrokerService();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3e7c8d30/webapp/src/main/resources/falcon-buildinfo.properties
----------------------------------------------------------------------
diff --git a/webapp/src/main/resources/falcon-buildinfo.properties b/webapp/src/main/resources/falcon-buildinfo.properties
index c9a5b1a..5a7cb82 100644
--- a/webapp/src/main/resources/falcon-buildinfo.properties
+++ b/webapp/src/main/resources/falcon-buildinfo.properties
@@ -21,6 +21,7 @@
*.build.user=${user.name}
*.build.epoch=${timestamp}
+*.project.version=${pom.version}
*.build.version=${pom.version}-r${buildNumber}
*.vc.revision=${buildNumber}
*.vc.source.url=${scm.connection}