You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2014/11/06 22:17:10 UTC
[1/3] flume git commit: Preparing for Flume-1.5.1 Release
Repository: flume
Updated Branches:
refs/heads/flume-1.5 f25ff9e7d -> ab00f5c5d
Preparing for Flume-1.5.1 Release
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/a593cdd6
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/a593cdd6
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/a593cdd6
Branch: refs/heads/flume-1.5
Commit: a593cdd60fc1ab5d17c1988207a7e2f6549021ca
Parents: f25ff9e
Author: Hari Shreedharan <hs...@apache.org>
Authored: Thu Nov 6 11:39:28 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Nov 6 11:39:28 2014 -0800
----------------------------------------------------------------------
RELEASE-NOTES | 6 +--
flume-ng-channels/flume-file-channel/pom.xml | 2 +-
flume-ng-channels/flume-jdbc-channel/pom.xml | 2 +-
.../flume-spillable-memory-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-dataset-sink/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/flume-twitter-source/pom.xml | 2 +-
flume-ng-sources/pom.xml | 2 +-
flume-ng-tests/pom.xml | 2 +-
flume-tools/pom.xml | 2 +-
pom.xml | 50 ++++++++++----------
33 files changed, 62 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/RELEASE-NOTES
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5a6ab4d..6f22b21 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-Apache Flume 1.5.0.1
+Apache Flume 1.5.1
CONTENTS
1. What is Apache Flume
@@ -17,8 +17,8 @@ simple, extensible data model that allows for online analytic
application.
2. Status of this release
-Apache Flume 1.5.0.1 is the sixth release of Flume as an Apache top-level project
-(TLP). Apache Flume 1.5.0.1 is production-ready software.
+Apache Flume 1.5.1 is the seventh release of Flume as an Apache top-level project
+(TLP). Apache Flume 1.5.1 is production-ready software.
3. Major changes in this Release
For a detailed list of changes, please see the CHANGELOG file included
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 3ca7ee6..ef0a4f9 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 02696cf..aacca64 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-channels/flume-spillable-memory-channel/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
index 0411662..79851e2 100644
--- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml
+++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>flume-ng-channels</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-channels</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-channels/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-channels/pom.xml b/flume-ng-channels/pom.xml
index 7d2de6b..fb09403 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 981e2a8..2c5e836 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.5.0.1</version>
+ <version>1.5.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-clients/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-clients/pom.xml b/flume-ng-clients/pom.xml
index 8f08760..b578565 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.5.0.1</version>
+ <version>1.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml
index a4e7f80..029fcbc 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.5.0.1</version>
+ <version>1.5.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>flume-ng-configuration</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-core/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index f100fd1..e31796c 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-dist/pom.xml b/flume-ng-dist/pom.xml
index 690fec5..567357c 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<artifactId>flume-ng-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
index b10ec93..33cae94 100644
--- a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
@@ -15,7 +15,7 @@
======================================
-Flume 1.5.0.1 Developer Guide
+Flume 1.5.1 Developer Guide
======================================
Introduction
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index be0f593..c70f6de 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -15,7 +15,7 @@
======================================
-Flume 1.5.0.1 User Guide
+Flume 1.5.1 User Guide
======================================
Introduction
@@ -2946,7 +2946,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.5.0.1.jar).
+flume-ng-sdk-1.5.1.jar).
Required properties are in **bold**.
===================== ======= ==================================================================================
@@ -3010,7 +3010,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.5.0.1.jar). This appender supports a round-robin and random
+flume-ng-sdk-1.5.1.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/a593cdd6/flume-ng-doc/sphinx/index.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/index.rst b/flume-ng-doc/sphinx/index.rst
index f08a89a..7e81f7d 100644
--- a/flume-ng-doc/sphinx/index.rst
+++ b/flume-ng-doc/sphinx/index.rst
@@ -15,7 +15,7 @@
================================================
-Apache Flume 1.5.0.1 documentation
+Apache Flume 1.5.1 documentation
================================================
Flume is a distributed, reliable, and available system for efficiently
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-embedded-agent/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml
index 590b290..92ffa61 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<artifactId>flume-ng-embedded-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 9403053..378f023 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 10629e0..b832e4e 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-legacy-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-legacy-sources/pom.xml b/flume-ng-legacy-sources/pom.xml
index faefd5e..69c8106 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-node/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 17a5064..e62c21d 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<artifactId>flume-ng-node</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index b45f7c5..a3392ec 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<artifactId>flume-ng-sdk</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-sinks/flume-dataset-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-dataset-sink/pom.xml b/flume-ng-sinks/flume-dataset-sink/pom.xml
index d727041..4fe76e7 100644
--- a/flume-ng-sinks/flume-dataset-sink/pom.xml
+++ b/flume-ng-sinks/flume-dataset-sink/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sinks</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 0fce8d0..dfb2195 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 ce2e7c6..ff06bbd 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 99fc2b6..b535987 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 2ed8cb6..0a4150a 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.5.0.1</version>
+ <version>1.5.1</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/a593cdd6/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 e02e005..5aa4eb8 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-morphline-solr-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
<name>Flume NG Morphline Solr Sink</name>
<properties>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-sinks/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/pom.xml b/flume-ng-sinks/pom.xml
index 56c4dee..2337c76 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 101b858..97e030b 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/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 59bbeba..a0801f3 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-sources/flume-twitter-source/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-twitter-source/pom.xml b/flume-ng-sources/flume-twitter-source/pom.xml
index 6821875..3cd55fc 100644
--- a/flume-ng-sources/flume-twitter-source/pom.xml
+++ b/flume-ng-sources/flume-twitter-source/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
<parent>
<artifactId>flume-ng-sources</artifactId>
<groupId>org.apache.flume</groupId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume.flume-ng-sources</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sources/pom.xml b/flume-ng-sources/pom.xml
index ec11b50..535a4a3 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-ng-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml
index 2a543c6..6d9b10e 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<artifactId>flume-ng-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/flume-tools/pom.xml
----------------------------------------------------------------------
diff --git a/flume-tools/pom.xml b/flume-tools/pom.xml
index 193708b..57d6b56 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.5.0.1</version>
+ <version>1.5.1</version>
</parent>
<groupId>org.apache.flume</groupId>
http://git-wip-us.apache.org/repos/asf/flume/blob/a593cdd6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4dae2c9..c30015c 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.5.0.1</version>
+ <version>1.5.1</version>
<packaging>pom</packaging>
<name>Apache Flume</name>
@@ -192,7 +192,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-dataset-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1064,120 +1064,120 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-tools</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-file-channel</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-jdbc-channel</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-spillable-memory-channel</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-channels</groupId>
<artifactId>flume-recoverable-memory-channel</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hdfs-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-irc-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-elasticsearch-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-morphline-solr-sink</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-scribe-source</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-jms-source</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sources</groupId>
<artifactId>flume-twitter-source</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-thrift-source</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-legacy-sources</groupId>
<artifactId>flume-avro-source</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -1185,20 +1185,20 @@ limitations under the License.
<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-clients</groupId>
<artifactId>flume-ng-log4jappender</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
<classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-embedded-agent</artifactId>
- <version>1.5.0.1</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
[3/3] flume git commit: FLUME-2533: HTTPS tests fail on Java 6
Posted by hs...@apache.org.
FLUME-2533: HTTPS tests fail on Java 6
(Hari Shreedharan via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/ab00f5c5
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/ab00f5c5
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/ab00f5c5
Branch: refs/heads/flume-1.5
Commit: ab00f5c5d4ab8c3adccbc1ee296a18b2bfa412d3
Parents: 8229cc3
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Wed Nov 5 16:53:13 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Nov 6 13:16:41 2014 -0800
----------------------------------------------------------------------
.../flume/source/http/TestHTTPSource.java | 77 ++++++++++++++++++--
1 file changed, 71 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/ab00f5c5/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
index 9ba0a8c..64111be 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
@@ -367,6 +367,7 @@ public class TestHTTPSource {
}};
SSLContext sc = null;
+ javax.net.ssl.SSLSocketFactory factory = null;
if (System.getProperty("java.vendor").contains("IBM")) {
sc = SSLContext.getInstance("SSL_TLS");
} else {
@@ -379,11 +380,11 @@ public class TestHTTPSource {
}
};
sc.init(null, trustAllCerts, new SecureRandom());
- javax.net.ssl.SSLSocketFactory factory = null;
+
if(protocol != null) {
- factory = new TestSSLSocketFactory(sc.getSocketFactory(), protocol);
+ factory = new DisabledProtocolsSocketFactory(sc.getSocketFactory(), protocol);
} else {
- factory = sc.getSocketFactory();
+ factory = new EnabledProtocolsSocketFactory(sc.getSocketFactory());
}
HttpsURLConnection.setDefaultSSLSocketFactory(factory);
HttpsURLConnection.setDefaultHostnameVerifier(
@@ -490,16 +491,16 @@ public class TestHTTPSource {
}
}
- private class TestSSLSocketFactory extends javax.net.ssl.SSLSocketFactory {
+ private class DisabledProtocolsSocketFactory extends javax.net.ssl.SSLSocketFactory {
private final javax.net.ssl.SSLSocketFactory socketFactory;
private final String[] protocols;
- TestSSLSocketFactory(javax.net.ssl.SSLSocketFactory factory, String protocol) {
+ DisabledProtocolsSocketFactory(javax.net.ssl.SSLSocketFactory factory, String protocol) {
this.socketFactory = factory;
if(protocol.equals("SSLv2Hello")) {
protocols = new String[2];
- protocols[0] = "TLSv1.2";
+ protocols[0] = "TLSv1";
protocols[1] = protocol;
} else {
protocols = new String[1];
@@ -559,4 +560,68 @@ public class TestHTTPSource {
return sc;
}
}
+
+ private class EnabledProtocolsSocketFactory extends javax.net.ssl.SSLSocketFactory {
+
+ private final javax.net.ssl.SSLSocketFactory socketFactory;
+ private final String[] protocols;
+
+ EnabledProtocolsSocketFactory(javax.net.ssl.SSLSocketFactory factory) {
+ this.socketFactory = factory;
+ protocols = new String[1];
+ protocols[0] = "TLSv1";
+ }
+
+ @Override
+ public String[] getDefaultCipherSuites() {
+ return socketFactory.getDefaultCipherSuites();
+ }
+
+ @Override
+ public String[] getSupportedCipherSuites() {
+ return socketFactory.getSupportedCipherSuites();
+ }
+
+ @Override
+ public Socket createSocket(Socket socket, String s, int i, boolean b)
+ throws IOException {
+ SSLSocket sc = (SSLSocket) socketFactory.createSocket(socket, s, i, b);
+ sc.setEnabledProtocols(protocols);
+ return sc;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i)
+ throws IOException, UnknownHostException {
+ SSLSocket sc = (SSLSocket)socketFactory.createSocket(s, i);
+ sc.setEnabledProtocols(protocols);
+ return sc;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i, InetAddress inetAddress, int i2)
+ throws IOException, UnknownHostException {
+ SSLSocket sc = (SSLSocket)socketFactory.createSocket(s, i, inetAddress,
+ i2);
+ sc.setEnabledProtocols(protocols);
+ return sc;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i)
+ throws IOException {
+ SSLSocket sc = (SSLSocket)socketFactory.createSocket(inetAddress, i);
+ sc.setEnabledProtocols(protocols);
+ return sc;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i,
+ InetAddress inetAddress2, int i2) throws IOException {
+ SSLSocket sc = (SSLSocket)socketFactory.createSocket(inetAddress, i,
+ inetAddress2, i2);
+ sc.setEnabledProtocols(protocols);
+ return sc;
+ }
+ }
}
[2/3] flume git commit: FLUME-2441. HTTP Source Unit tests fail on
IBM JDK 7
Posted by hs...@apache.org.
FLUME-2441. HTTP Source Unit tests fail on IBM JDK 7
(Li Xiang via Hari)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/8229cc38
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/8229cc38
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/8229cc38
Branch: refs/heads/flume-1.5
Commit: 8229cc38a56a024859625dc1011b0333370c0617
Parents: a593cdd
Author: Hari Shreedharan <ha...@gmail.com>
Authored: Tue Aug 5 13:54:07 2014 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Nov 6 13:16:36 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/flume/source/http/TestHTTPSource.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/8229cc38/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
index ec3bd50..9ba0a8c 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestHTTPSource.java
@@ -365,7 +365,13 @@ public class TestHTTPSource {
return null;
}
}};
- SSLContext sc = SSLContext.getInstance("SSL");
+
+ SSLContext sc = null;
+ if (System.getProperty("java.vendor").contains("IBM")) {
+ sc = SSLContext.getInstance("SSL_TLS");
+ } else {
+ sc = SSLContext.getInstance("SSL");
+ }
HostnameVerifier hv = new HostnameVerifier() {
public boolean verify(String arg0, SSLSession arg1) {