Skip to content

Commit 33d1904

Browse files
liorzeadenes
authored andcommitted
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)
1 parent 83e2569 commit 33d1904

File tree

7 files changed

+8
-32
lines changed

7 files changed

+8
-32
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ before_install:
2121
install:
2222
- # Skip mvn install. See https://docs.travis-ci.com/user/languages/java/
2323
script:
24-
- MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m" mvn clean install -DskipTests
24+
- MAVEN_OPTS="-Xms512m -Xmx1024m" mvn clean install -DskipTests

DEVNOTES

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,7 @@ to most devs are "compile" -> "test" -> "package" -> "install".
4141

4242
Set MAVEN_OPTS to give the Flume build enough RAM to build.
4343

44-
export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=512M"
45-
46-
Note: If you see a permgen error (below), you need to increase the perm gen size.
47-
48-
[ERROR] PermGen space -> [Help 1]
49-
[ERROR]
50-
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
51-
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
52-
[ERROR]
53-
[ERROR] For more information about the errors and possible solutions, please read the following articles:
54-
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/OutOfMemoryError
44+
export MAVEN_OPTS="-Xms512m -Xmx1024m"
5545

5646
Builds
5747
------

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ Bug and Issue tracker.
5555

5656
Compiling Flume requires the following tools:
5757

58-
* Oracle Java JDK 1.7
58+
* Oracle Java JDK 1.8
5959
* Apache Maven 3.x
6060

6161
Note: The Apache Flume build requires more memory than the default configuration.
6262
We recommend you set the following Maven options:
6363

64-
export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"
64+
`export MAVEN_OPTS="-Xms512m -Xmx1024m"`
6565

6666
To compile Flume and build a distribution tarball, run `mvn install` from the
6767
top level directory. The artifacts will be placed under `flume-ng-dist/target/`.

conf/flume-env.sh.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# Enviroment variables can be set here.
2121

22-
# export JAVA_HOME=/usr/lib/jvm/java-6-sun
22+
# export JAVA_HOME=/usr/lib/jvm/java-8-oracle
2323

2424
# Give Flume more memory and pre-allocate, enable remote monitoring via JMX
2525
# export JAVA_OPTS="-Xms100m -Xmx2000m -Dcom.sun.management.jmxremote"

flume-ng-doc/sphinx/FlumeUserGuide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ in the latest architecture.
5050
System Requirements
5151
-------------------
5252

53-
#. Java Runtime Environment - Java 1.7 or later
53+
#. Java Runtime Environment - Java 1.8 or later
5454
#. Memory - Sufficient memory for configurations used by sources, channels or sinks
5555
#. Disk Space - Sufficient disk space for configurations used by channels or sinks
5656
#. Directory Permissions - Read/Write permissions for directories used by agent

flume-ng-sources/flume-taildir-source/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,6 @@ limitations under the License.
3030
<artifactId>flume-taildir-source</artifactId>
3131
<name>Flume Taildir Source</name>
3232

33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<version>2.3.2</version>
39-
<configuration>
40-
<source>1.7</source>
41-
<target>1.7</target>
42-
</configuration>
43-
</plugin>
44-
</plugins>
45-
</build>
46-
4733
<dependencies>
4834
<dependency>
4935
<groupId>org.apache.flume</groupId>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ limitations under the License.
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838

3939
<!-- Java compiler configuration -->
40-
<sourceJavaVersion>1.7</sourceJavaVersion>
41-
<targetJavaVersion>1.7</targetJavaVersion>
40+
<sourceJavaVersion>1.8</sourceJavaVersion>
41+
<targetJavaVersion>1.8</targetJavaVersion>
4242

4343
<!-- defaults for flaky test and focused test exclusions -->
4444
<test.exclude.pattern>$</test.exclude.pattern> <!-- junk pattern -->

0 commit comments

Comments
 (0)