Repository: accumulo Updated Branches: refs/heads/master b49f9309f -> 44f72a847
ACCUMULO-905 Make JDK7 the minimum supported version Change documentation referring to a specific JDK version to something more generic. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44f72a84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44f72a84 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44f72a84 Branch: refs/heads/master Commit: 44f72a8470f22ef83077a0e75ecc14af20377620 Parents: b49f930 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Apr 2 18:30:46 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Apr 2 18:30:46 2014 -0400 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/1GB/standalone/accumulo-env.sh | 2 +- conf/examples/2GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/2GB/standalone/accumulo-env.sh | 2 +- conf/examples/3GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/3GB/standalone/accumulo-env.sh | 2 +- conf/examples/512MB/native-standalone/accumulo-env.sh | 2 +- conf/examples/512MB/standalone/accumulo-env.sh | 2 +- .../main/java/org/apache/accumulo/fate/util/AddressUtil.java | 6 +++--- pom.xml | 8 ++++---- 10 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/1GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh b/conf/examples/1GB/native-standalone/accumulo-env.sh index 9e9b6a6..7bdc73a 100755 --- a/conf/examples/1GB/native-standalone/accumulo-env.sh +++ b/conf/examples/1GB/native-standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/1GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/standalone/accumulo-env.sh b/conf/examples/1GB/standalone/accumulo-env.sh index 8b904ac..c7033bf 100755 --- a/conf/examples/1GB/standalone/accumulo-env.sh +++ b/conf/examples/1GB/standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/2GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh b/conf/examples/2GB/native-standalone/accumulo-env.sh index 5f6d2cb..5927a89 100755 --- a/conf/examples/2GB/native-standalone/accumulo-env.sh +++ b/conf/examples/2GB/native-standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/2GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/standalone/accumulo-env.sh b/conf/examples/2GB/standalone/accumulo-env.sh index feba48c..329c19e 100755 --- a/conf/examples/2GB/standalone/accumulo-env.sh +++ b/conf/examples/2GB/standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/3GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/native-standalone/accumulo-env.sh b/conf/examples/3GB/native-standalone/accumulo-env.sh index be72992..57c631c 100755 --- a/conf/examples/3GB/native-standalone/accumulo-env.sh +++ b/conf/examples/3GB/native-standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/3GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/standalone/accumulo-env.sh b/conf/examples/3GB/standalone/accumulo-env.sh index 6e5fb3a..53cc1d2 100755 --- a/conf/examples/3GB/standalone/accumulo-env.sh +++ b/conf/examples/3GB/standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/512MB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/native-standalone/accumulo-env.sh b/conf/examples/512MB/native-standalone/accumulo-env.sh index e02b524..eed9178 100755 --- a/conf/examples/512MB/native-standalone/accumulo-env.sh +++ b/conf/examples/512MB/native-standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/conf/examples/512MB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/standalone/accumulo-env.sh b/conf/examples/512MB/standalone/accumulo-env.sh index 457e1d3..e3e5f2a 100755 --- a/conf/examples/512MB/standalone/accumulo-env.sh +++ b/conf/examples/512MB/standalone/accumulo-env.sh @@ -20,7 +20,7 @@ ### ### The functional tests require conditional values, so keep this style: ### -### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/local/lib/jdk-1.6.0 +### test -z "$JAVA_HOME" && export JAVA_HOME=/usr/lib/jvm/java ### ### ### Note that the -Xmx -Xms settings below require substantial free memory: http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java ---------------------------------------------------------------------- diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java index fce7a62..401bc1a 100644 --- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java +++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java @@ -43,16 +43,16 @@ public class AddressUtil { negativeTtl = Integer.parseInt(Security.getProperty("networkaddress.cache.negative.ttl")); } catch (NumberFormatException exception) { log.warn("Failed to get JVM negative DNS respones cache TTL due to format problem (e.g. this JVM might not have the " - + "property). Falling back to default based on Oracle JVM 1.6 (10s)", exception); + + "property). Falling back to default based on Oracle JVM 1.4+ (10s)", exception); } catch (SecurityException exception) { - log.warn("Failed to get JVM negative DNS response cache TTL due to security manager. Falling back to default based on Oracle JVM 1.6 (10s)", exception); + log.warn("Failed to get JVM negative DNS response cache TTL due to security manager. Falling back to default based on Oracle JVM 1.4+ (10s)", exception); } if (-1 == negativeTtl) { log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and host lookup failed. TTL can be changed with security property " + "'networkaddress.cache.negative.ttl', see java.net.InetAddress.", originalException); throw new IllegalArgumentException(originalException); } else if (0 > negativeTtl) { - log.warn("JVM specified negative DNS response cache TTL was negative (and not 'forever'). Falling back to default based on Oracle JVM 1.6 (10s)"); + log.warn("JVM specified negative DNS response cache TTL was negative (and not 'forever'). Falling back to default based on Oracle JVM 1.4+ (10s)"); negativeTtl = 10; } return negativeTtl; http://git-wip-us.apache.org/repos/asf/accumulo/blob/44f72a84/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a2b6b7f..5ab13f5 100644 --- a/pom.xml +++ b/pom.xml @@ -517,8 +517,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <optimize>true</optimize> </configuration> </plugin> @@ -541,7 +541,7 @@ <encoding>${project.reporting.outputEncoding}</encoding> <quiet>true</quiet> <reportOutputDirectory>docs</reportOutputDirectory> - <javadocVersion>1.6</javadocVersion> + <javadocVersion>1.7</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> </configuration> </plugin> @@ -889,7 +889,7 @@ <configuration> <format>html</format> <includeTests>true</includeTests> - <targetJdk>1.6</targetJdk> + <targetJdk>1.7</targetJdk> </configuration> </plugin> <plugin>
