Repository: flume
Updated Branches:
refs/heads/trunk 4a7db4a36 -> 2f731f0aa
FLUME-2935. Bump java target version to 1.7
* Renamed README to README.textile in order to allow GitHub to properly
render the headings. Also changed the min. requirement to JDK 1.7
* pom.xml:
* Changed the sourceJavaVersion and targetJavaVersion to 1.7
* Removed the test dependency hadoop-minicluster since it is already
required as a "normal" dependency. This was causing Maven warnings
* flume-ng-elasticsearch-sink/pom.xml: pom file had two identical
dependencies, causing Maven warnings
* FlumeUserGuide.rst: changed the system requirements to Java 1.7
* KafkaLocal.java: The tests threw a MethodNotFoundException, since
there isn't a constructor for KafkaConfig with a java.util.properties
parameter. Instead, I used the static method KafkaConfig.fromProps.
(Lior Zeno via Mike Percy)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/2f731f0a
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/2f731f0a
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/2f731f0a
Branch: refs/heads/trunk
Commit: 2f731f0aaeb490ab72400d8c83074daac840ac44
Parents: 4a7db4a
Author: Mike Percy <[email protected]>
Authored: Sun Jun 26 14:17:37 2016 -0700
Committer: Mike Percy <[email protected]>
Committed: Sun Jun 26 14:17:37 2016 -0700
----------------------------------------------------------------------
README | 50 ----------
README.textile | 100 +++++++++++++++++++
flume-ng-doc/sphinx/FlumeUserGuide.rst | 4 +-
.../flume-ng-elasticsearch-sink/pom.xml | 5 -
.../flume/sink/kafka/util/KafkaLocal.java | 2 +-
pom.xml | 10 +-
6 files changed, 105 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/README
----------------------------------------------------------------------
diff --git a/README b/README
deleted file mode 100644
index a86e098..0000000
--- a/README
+++ /dev/null
@@ -1,50 +0,0 @@
-h1. Welcome to Apache Flume!
-
-Apache Flume is a distributed, reliable, and available service for efficiently
-collecting, aggregating, and moving large amounts of log data. It has a simple
-and flexible architecture based on streaming data flows. It is robust and fault
-tolerant with tunable reliability mechanisms and many failover and recovery
-mechanisms. The system is centrally managed and allows for intelligent dynamic
-management. It uses a simple extensible data model that allows for online
-analytic application.
-
-The Apache Flume 1.x (NG) code line is a refactoring of the first generation
-Flume to solve certain known issues and limitations of the original design.
-
-Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
-
-h2. Documentation
-
-Documentation is included in the binary distribution under the docs directory.
-In source form, it can be found in the flume-ng-doc directory.
-
-The Flume 1.x guide and FAQ are available here:
-
-* https://cwiki.apache.org/FLUME/flume-ng.html
-* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
-
-h2. Contact us!
-
-* Mailing lists:
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
-* IRC channel #flume on irc.freenode.net
-
-Bug and Issue tracker.
-
-* https://issues.apache.org/jira/browse/FLUME
-
-h2. Compiling Flume
-
-Compiling Flume requires the following tools:
-
-* Oracle Java JDK 1.6
-* Apache Maven 3.x
-
-Note: The Apache Flume build requires more memory than the default
configuration.
-We recommend you set the following Maven options:
-
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
-
-To compile Flume, run `mvn compile`.
-To build a distribution, run `mvn install`.
-
-The final Flume distribution artifacts will be in
$project/flume-ng-dist/target/.
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/README.textile
----------------------------------------------------------------------
diff --git a/README.textile b/README.textile
new file mode 100644
index 0000000..2b884fa
--- /dev/null
+++ b/README.textile
@@ -0,0 +1,100 @@
+h1. Welcome to Apache Flume!
+
+Apache Flume is a distributed, reliable, and available service for efficiently
+collecting, aggregating, and moving large amounts of log data. It has a simple
+and flexible architecture based on streaming data flows. It is robust and fault
+tolerant with tunable reliability mechanisms and many failover and recovery
+mechanisms. The system is centrally managed and allows for intelligent dynamic
+management. It uses a simple extensible data model that allows for online
+analytic application.
+
+The Apache Flume 1.x (NG) code line is a refactoring of the first generation
+Flume to solve certain known issues and limitations of the original design.
+
+Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
+
+h2. Documentation
+
+Documentation is included in the binary distribution under the docs directory.
+In source form, it can be found in the flume-ng-doc directory.
+
+The Flume 1.x guide and FAQ are available here:
+
+* https://cwiki.apache.org/FLUME/flume-ng.html
+* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
+
+h2. Contact us!
+
+* Mailing lists:
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
+* IRC channel #flume on irc.freenode.net
+
+Bug and Issue tracker.
+
+* https://issues.apache.org/jira/browse/FLUME
+
+h2. Compiling Flume
+
+Compiling Flume requires the following tools:
+
+* Oracle Java JDK 1.7
+* Apache Maven 3.x
+
+Note: The Apache Flume build requires more memory than the default
configuration.
+We recommend you set the following Maven options:
+
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
+
+To compile Flume, run `mvn compile`.
+To build a distribution, run `mvn install`.
+
+The final Flume distribution artifacts will be in
$project/flume-ng-dist/target/.
+h1. Welcome to Apache Flume!
+
+Apache Flume is a distributed, reliable, and available service for efficiently
+collecting, aggregating, and moving large amounts of log data. It has a simple
+and flexible architecture based on streaming data flows. It is robust and fault
+tolerant with tunable reliability mechanisms and many failover and recovery
+mechanisms. The system is centrally managed and allows for intelligent dynamic
+management. It uses a simple extensible data model that allows for online
+analytic application.
+
+The Apache Flume 1.x (NG) code line is a refactoring of the first generation
+Flume to solve certain known issues and limitations of the original design.
+
+Apache Flume is open-sourced under the Apache Software Foundation License v2.0.
+
+h2. Documentation
+
+Documentation is included in the binary distribution under the docs directory.
+In source form, it can be found in the flume-ng-doc directory.
+
+The Flume 1.x guide and FAQ are available here:
+
+* https://cwiki.apache.org/FLUME/flume-ng.html
+* https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
+
+h2. Contact us!
+
+* Mailing lists:
https://cwiki.apache.org/confluence/display/FLUME/Mailing+Lists
+* IRC channel #flume on irc.freenode.net
+
+Bug and Issue tracker.
+
+* https://issues.apache.org/jira/browse/FLUME
+
+h2. Compiling Flume
+
+Compiling Flume requires the following tools:
+
+* Oracle Java JDK 1.7
+* Apache Maven 3.x
+
+Note: The Apache Flume build requires more memory than the default
configuration.
+We recommend you set the following Maven options:
+
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
+
+To compile Flume, run `mvn compile`.
+To build a distribution, run `mvn install`.
+
+The final Flume distribution artifacts will be in
$project/flume-ng-dist/target/.
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst
b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index affdf66..287d066 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -50,7 +50,7 @@ in the latest architecture.
System Requirements
-------------------
-#. Java Runtime Environment - Java 1.6 or later (Java 1.7 Recommended)
+#. Java Runtime Environment - Java 1.7 or later
#. Memory - Sufficient memory for configurations used by sources, channels or
sinks
#. Disk Space - Sufficient disk space for configurations used by channels or
sinks
#. Directory Permissions - Read/Write permissions for directories used by agent
@@ -1093,7 +1093,7 @@ deserializer.maxBlobLength 100000000 The
maximum number of bytes to r
Taildir Source
~~~~~~~~~~~~~~~~~~~~~~~~~
-.. note:: **This source is provided as a preview feature. It does not work on
Windows.** This source requires Java version 1.7 or later.
+.. note:: **This source is provided as a preview feature. It does not work on
Windows.**
Watch the specified files, and tail them in nearly real-time once detected new
lines appended to the each files.
If the new lines are being written, this source will retry reading them in
wait for the completion of the write.
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/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 0e2b751..c372c0b 100644
--- a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml
@@ -84,11 +84,6 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/util/KafkaLocal.java
----------------------------------------------------------------------
diff --git
a/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/util/KafkaLocal.java
b/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/util/KafkaLocal.java
index 3c6e064..d8a45ef 100644
---
a/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/util/KafkaLocal.java
+++
b/flume-ng-sinks/flume-ng-kafka-sink/src/test/java/org/apache/flume/sink/kafka/util/KafkaLocal.java
@@ -35,7 +35,7 @@ public class KafkaLocal {
public KafkaLocal(Properties kafkaProperties) throws IOException,
InterruptedException{
- KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);
+ KafkaConfig kafkaConfig = KafkaConfig.fromProps(kafkaProperties);
//start local kafka broker
kafka = new KafkaServerStartable(kafkaConfig);
http://git-wip-us.apache.org/repos/asf/flume/blob/2f731f0a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 694c073..50037c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Java compiler configuration -->
- <sourceJavaVersion>1.6</sourceJavaVersion>
- <targetJavaVersion>1.6</targetJavaVersion>
+ <sourceJavaVersion>1.7</sourceJavaVersion>
+ <targetJavaVersion>1.7</targetJavaVersion>
<!-- defaults for flaky test and focused test exclusions -->
<test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->
@@ -253,12 +253,6 @@ limitations under the License.
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
<!-- Ideally this should be optional, but making it optional causes
build to fail.
