You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2013/06/25 00:25:56 UTC
git commit: FLUME-2106. Update 1.4.0-SNAPSHOT to 1.5.0-SNAPSHOT on
trunk.
Updated Branches:
refs/heads/trunk 8f62b779e -> 1d0e38ab4
FLUME-2106. Update 1.4.0-SNAPSHOT to 1.5.0-SNAPSHOT on trunk.
(Mike Percy)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/1d0e38ab
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/1d0e38ab
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/1d0e38ab
Branch: refs/heads/trunk
Commit: 1d0e38ab444018d010e659051578942a8d421a92
Parents: 8f62b77
Author: Mike Percy <mp...@apache.org>
Authored: Mon Jun 24 15:25:35 2013 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Mon Jun 24 15:25:35 2013 -0700
----------------------------------------------------------------------
flume-ng-channels/flume-file-channel/pom.xml | 2 +-
flume-ng-channels/flume-jdbc-channel/pom.xml | 2 +-
flume-ng-channels/pom.xml | 2 +-
flume-ng-clients/flume-ng-log4jappender/pom.xml | 2 +-
flume-ng-clients/pom.xml | 2 +-
flume-ng-configuration/pom.xml | 2 +-
flume-ng-core/pom.xml | 2 +-
flume-ng-dist/pom.xml | 2 +-
flume-ng-doc/sphinx/FlumeDeveloperGuide.rst | 2 +-
flume-ng-doc/sphinx/FlumeUserGuide.rst | 6 +--
flume-ng-doc/sphinx/index.rst | 2 +-
flume-ng-embedded-agent/pom.xml | 2 +-
.../flume-avro-source/pom.xml | 2 +-
.../flume-thrift-source/pom.xml | 2 +-
flume-ng-legacy-sources/pom.xml | 2 +-
flume-ng-node/pom.xml | 2 +-
flume-ng-sdk/pom.xml | 2 +-
flume-ng-sinks/flume-hdfs-sink/pom.xml | 2 +-
flume-ng-sinks/flume-irc-sink/pom.xml | 2 +-
.../flume-ng-elasticsearch-sink/pom.xml | 2 +-
flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 2 +-
.../flume-ng-morphline-solr-sink/pom.xml | 4 +-
flume-ng-sinks/pom.xml | 2 +-
flume-ng-sources/flume-jms-source/pom.xml | 2 +-
flume-ng-sources/flume-scribe-source/pom.xml | 2 +-
flume-ng-sources/pom.xml | 2 +-
flume-ng-tests/pom.xml | 2 +-
flume-tools/pom.xml | 2 +-
pom.xml | 42 ++++++++++----------
29 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-channels/flume-file-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml
index 0f44c68..e055d8a 100644
--- a/flume-ng-channels/flume-file-channel/pom.xml
+++ b/flume-ng-channels/flume-file-channel/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-channels/flume-jdbc-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-jdbc-channel/pom.xml b/flume-ng-channels/flume-jdbc-channel/pom.xml
index e42efc2..5615377 100644
--- a/flume-ng-channels/flume-jdbc-channel/pom.xml
+++ b/flume-ng-channels/flume-jdbc-channel/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-channels/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/pom.xml b/flume-ng-channels/pom.xml
index 6485d47..5832ab4 100644
--- a/flume-ng-channels/pom.xml
+++ b/flume-ng-channels/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-clients/flume-ng-log4jappender/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml
index 195ba97..ef3e965 100644
--- a/flume-ng-clients/flume-ng-log4jappender/pom.xml
+++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-clients</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-clients/pom.xml b/flume-ng-clients/pom.xml
index 7ea2d1d..b0f52d1 100644
--- a/flume-ng-clients/pom.xml
+++ b/flume-ng-clients/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml
index ee95327..e7a5350 100644
--- a/flume-ng-configuration/pom.xml
+++ b/flume-ng-configuration/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-configuration</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-core/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index 887a65d..e41bcc2 100644
--- a/flume-ng-core/pom.xml
+++ b/flume-ng-core/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index f20ff1e..83332a9 100644
--- a/flume-ng-dist/pom.xml
+++ b/flume-ng-dist/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
index c6ee8b5..2be9c68 100644
--- a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
@@ -15,7 +15,7 @@
======================================
-Flume 1.4.0-SNAPSHOT Developer Guide
+Flume 1.5.0-SNAPSHOT Developer Guide
======================================
Introduction
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index f244aea..e810d3d 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -15,7 +15,7 @@
======================================
-Flume 1.4.0-SNAPSHOT User Guide
+Flume 1.5.0-SNAPSHOT User Guide
======================================
Introduction
@@ -2731,7 +2731,7 @@ Log4J Appender
Appends Log4j events to a flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-1.4.0-SNAPSHOT.jar).
+flume-ng-sdk-1.5.0-SNAPSHOT.jar).
Required properties are in **bold**.
===================== ======= ==============================================================
@@ -2795,7 +2795,7 @@ Load Balancing Log4J Appender
Appends Log4j events to a list of flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-1.4.0-SNAPSHOT.jar). This appender supports a round-robin and random
+flume-ng-sdk-1.5.0-SNAPSHOT.jar). This appender supports a round-robin and random
scheme for performing the load balancing. It also supports a configurable backoff
timeout so that down agents are removed temporarily from the set of hosts
Required properties are in **bold**.
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-doc/sphinx/index.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/index.rst b/flume-ng-doc/sphinx/index.rst
index 0a8634a..af9b64e 100644
--- a/flume-ng-doc/sphinx/index.rst
+++ b/flume-ng-doc/sphinx/index.rst
@@ -15,7 +15,7 @@
================================================
-Apache Flume 1.4.0-SNAPSHOT documentation
+Apache Flume 1.5.0-SNAPSHOT documentation
================================================
Flume is a distributed, reliable, and available system for efficiently
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-embedded-agent/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml
index 099c424..a8d38d2 100644
--- a/flume-ng-embedded-agent/pom.xml
+++ b/flume-ng-embedded-agent/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-embedded-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-legacy-sources/flume-avro-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml
index 91e962c..e372ebd 100644
--- a/flume-ng-legacy-sources/flume-avro-source/pom.xml
+++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-legacy-sources/flume-thrift-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/flume-thrift-source/pom.xml b/flume-ng-legacy-sources/flume-thrift-source/pom.xml
index 2fb5bf1..c32247e 100644
--- a/flume-ng-legacy-sources/flume-thrift-source/pom.xml
+++ b/flume-ng-legacy-sources/flume-thrift-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-legacy-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-legacy-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/pom.xml b/flume-ng-legacy-sources/pom.xml
index bc58c1b..0d74022 100644
--- a/flume-ng-legacy-sources/pom.xml
+++ b/flume-ng-legacy-sources/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-node/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 5cdd9e2..f1b0c65 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-node</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index 27edaba..d5d50cf 100644
--- a/flume-ng-sdk/pom.xml
+++ b/flume-ng-sdk/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-sdk</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/flume-hdfs-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml
index 2b6b5d2..95fcdea 100644
--- a/flume-ng-sinks/flume-hdfs-sink/pom.xml
+++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/flume-irc-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-irc-sink/pom.xml b/flume-ng-sinks/flume-irc-sink/pom.xml
index 1cabd51..1e157ad 100644
--- a/flume-ng-sinks/flume-irc-sink/pom.xml
+++ b/flume-ng-sinks/flume-irc-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
index 6ee3bd7..7d5b0a8 100644
--- a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
index 3b4eadb..90b6991 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
index b47352d..5115090 100644
--- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-morphline-solr-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<name>Flume NG Morphline Solr Sink</name>
<properties>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sinks/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml
index 3ee75e5..d03576b 100644
--- a/flume-ng-sinks/pom.xml
+++ b/flume-ng-sinks/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sources/flume-jms-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/pom.xml b/flume-ng-sources/flume-jms-source/pom.xml
index 4803c5a..6aa267d 100644
--- a/flume-ng-sources/flume-jms-source/pom.xml
+++ b/flume-ng-sources/flume-jms-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sources/flume-scribe-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-scribe-source/pom.xml b/flume-ng-sources/flume-scribe-source/pom.xml
index 7b60766..1ba2e7f 100644
--- a/flume-ng-sources/flume-scribe-source/pom.xml
+++ b/flume-ng-sources/flume-scribe-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/pom.xml b/flume-ng-sources/pom.xml
index 7bd800f..6006fa1 100644
--- a/flume-ng-sources/pom.xml
+++ b/flume-ng-sources/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-ng-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml
index b9c7cfa..bd69a4e 100644
--- a/flume-ng-tests/pom.xml
+++ b/flume-ng-tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>flume-ng-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/flume-tools/pom.xml
----------------------------------------------------------------------
diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml
index 386c766..1e707fa 100644
--- a/flume-tools/pom.xml
+++ b/flume-tools/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
<parent>
<artifactId>flume-parent</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/1d0e38ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7f6f824..15e6d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.flume</groupId>
<artifactId>flume-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Flume</name>
@@ -893,102 +893,102 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-tools</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-file-channel</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-jdbc-channel</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hdfs-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-irc-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-elasticsearch-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-morphline-solr-sink</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-scribe-source</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-jms-source</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-thrift-source</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-avro-source</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -996,20 +996,20 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-embedded-agent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>