Repository: flume Updated Branches: refs/heads/trunk 83e25691d -> 33d19046f
FLUME-2945. Bump java target version to 1.8 - Removed the unsupported PermSize and MaxPermSize settings from .travis.yml - Updated DEVNOTES, README and Flume User Guide - Removed the maven-compiler-plugin from the taildir-source subproject - Changed the sourceJavaVersion and targetJavaVersion to 1.8 in the root pom.xml (Lior Zeno via Denes Arvay) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/33d19046 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/33d19046 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/33d19046 Branch: refs/heads/trunk Commit: 33d19046f0db66c3093f68716e4f6100301d3b49 Parents: 83e2569 Author: Lior Zeno <[email protected]> Authored: Tue Jun 20 12:26:10 2017 +0200 Committer: Denes Arvay <[email protected]> Committed: Tue Jun 20 15:25:36 2017 +0200 ---------------------------------------------------------------------- .travis.yml | 2 +- DEVNOTES | 12 +----------- README.md | 4 ++-- conf/flume-env.sh.template | 2 +- flume-ng-doc/sphinx/FlumeUserGuide.rst | 2 +- flume-ng-sources/flume-taildir-source/pom.xml | 14 -------------- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index befc2c9..1abc06e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ before_install: install: - # Skip mvn install. See https://docs.travis-ci.com/user/languages/java/ script: - - MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m" mvn clean install -DskipTests + - MAVEN_OPTS="-Xms512m -Xmx1024m" mvn clean install -DskipTests http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/DEVNOTES ---------------------------------------------------------------------- diff --git a/DEVNOTES b/DEVNOTES index 83cdf89..2430b14 100644 --- a/DEVNOTES +++ b/DEVNOTES @@ -41,17 +41,7 @@ to most devs are "compile" -> "test" -> "package" -> "install". Set MAVEN_OPTS to give the Flume build enough RAM to build. - export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=512M" - -Note: If you see a permgen error (below), you need to increase the perm gen size. - -[ERROR] PermGen space -> [Help 1] -[ERROR] -[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. -[ERROR] Re-run Maven using the -X switch to enable full debug logging. -[ERROR] -[ERROR] For more information about the errors and possible solutions, please read the following articles: -[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/OutOfMemoryError + export MAVEN_OPTS="-Xms512m -Xmx1024m" Builds ------ http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 9ebb2a3..f7daa79 100644 --- a/README.md +++ b/README.md @@ -55,13 +55,13 @@ Bug and Issue tracker. Compiling Flume requires the following tools: -* Oracle Java JDK 1.7 +* Oracle Java JDK 1.8 * 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" +`export MAVEN_OPTS="-Xms512m -Xmx1024m"` To compile Flume and build a distribution tarball, run `mvn install` from the top level directory. The artifacts will be placed under `flume-ng-dist/target/`. http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/conf/flume-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/flume-env.sh.template b/conf/flume-env.sh.template index 07182ca..292435e 100644 --- a/conf/flume-env.sh.template +++ b/conf/flume-env.sh.template @@ -19,7 +19,7 @@ # Enviroment variables can be set here. -# export JAVA_HOME=/usr/lib/jvm/java-6-sun +# export JAVA_HOME=/usr/lib/jvm/java-8-oracle # Give Flume more memory and pre-allocate, enable remote monitoring via JMX # export JAVA_OPTS="-Xms100m -Xmx2000m -Dcom.sun.management.jmxremote" http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/flume-ng-doc/sphinx/FlumeUserGuide.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index 2cd5465..fde56ec 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.7 or later +#. Java Runtime Environment - Java 1.8 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 http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/flume-ng-sources/flume-taildir-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-taildir-source/pom.xml b/flume-ng-sources/flume-taildir-source/pom.xml index 96c2468..a1fe8c2 100644 --- a/flume-ng-sources/flume-taildir-source/pom.xml +++ b/flume-ng-sources/flume-taildir-source/pom.xml @@ -30,20 +30,6 @@ limitations under the License. <artifactId>flume-taildir-source</artifactId> <name>Flume Taildir Source</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.flume</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/33d19046/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e823e3a..5730db0 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.7</sourceJavaVersion> - <targetJavaVersion>1.7</targetJavaVersion> + <sourceJavaVersion>1.8</sourceJavaVersion> + <targetJavaVersion>1.8</targetJavaVersion> <!-- defaults for flaky test and focused test exclusions --> <test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->
