Repository: accumulo Updated Branches: refs/heads/master c044127a9 -> a40733374
ACCUMULO-4299 Switch to Java 8 Bump version to 2.0.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4073337 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4073337 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4073337 Branch: refs/heads/master Commit: a40733374075c47d7cb403b3fdab00fb19639acf Parents: c044127 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu May 5 14:26:27 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu May 5 14:26:27 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 5 ----- assemble/pom.xml | 2 +- core/pom.xml | 2 +- docs/pom.xml | 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 31 ++++--------------------------- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- trace/pom.xml | 2 +- 22 files changed, 24 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 81672e5..c650fe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. language: java -addons: - hostname: travis-accumulo-host notifications: irc: channels: @@ -28,11 +26,8 @@ cache: install: true jdk: - oraclejdk8 - - oraclejdk7 - - openjdk7 # clear any cache of accumulo artifacts, just in case; use https for central before_script: - - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname)/" /etc/hosts | sudo tee /etc/hosts - rm -rf $HOME/.m2/repository/org/apache/accumulo - echo "<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0'><mirrors><mirror><id>secure-central</id><url>https://repo.maven.apache.org/maven2</url><mirrorOf>central</mirrorOf></mirror></mirrors></settings>" > $HOME/settings-custom.xml script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/assemble/pom.xml ---------------------------------------------------------------------- diff --git a/assemble/pom.xml b/assemble/pom.xml index a49e7b9..be8bfa6 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index b412933..b00a65f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-core</artifactId> <name>Apache Accumulo Core</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/docs/pom.xml ---------------------------------------------------------------------- diff --git a/docs/pom.xml b/docs/pom.xml index 6445efb..aa1a8ec 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-docs</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/examples/simple/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index b5ecbd9..0debf5c 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-examples-simple</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/fate/pom.xml ---------------------------------------------------------------------- diff --git a/fate/pom.xml b/fate/pom.xml index 059e4f1..bc665dc 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-fate</artifactId> <name>Apache Accumulo Fate</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/iterator-test-harness/pom.xml ---------------------------------------------------------------------- diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index d54a086..3a9c6f6 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-iterator-test-harness</artifactId> <name>Apache Accumulo Iterator Test Harness</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 557a3c5..17b2591 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-maven-plugin</artifactId> <packaging>maven-plugin</packaging> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 222a46e..b8786dc 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-minicluster</artifactId> <name>Apache Accumulo MiniCluster</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e4c3ea6..418ed80 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Accumulo Project</name> <description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description> @@ -130,7 +130,6 @@ <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle> <!-- extra release args for testing --> <extraReleaseArgs /> - <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer --> <findbugs.version>3.0.3</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> @@ -139,8 +138,8 @@ <htrace.version>3.1.0-incubating</htrace.version> <httpclient.version>3.1</httpclient.version> <jetty.version>9.1.5.v20140505</jetty.version> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.5</maven.min-version> <!-- surefire/failsafe plugin option --> @@ -689,6 +688,7 @@ <quiet>true</quiet> <javadocVersion>${maven.compiler.target}</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> + <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam> </configuration> </plugin> <plugin> @@ -1461,29 +1461,6 @@ </properties> </profile> <profile> - <id>jdk8</id> - <activation> - <jdk>[1.8,1.9)</jdk> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> - <quiet>true</quiet> - <javadocVersion>1.8</javadocVersion> - <additionalJOption>-J-Xmx512m</additionalJOption> - <additionalparam>-Xdoclint:all,-Xdoclint:-missing</additionalparam> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - <profile> <id>performanceTests</id> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/proxy/pom.xml b/proxy/pom.xml index 2aee90b..6bb4eb2 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-proxy</artifactId> <name>Apache Accumulo Proxy</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/base/pom.xml ---------------------------------------------------------------------- diff --git a/server/base/pom.xml b/server/base/pom.xml index 6cac8d3..5620d94 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-server-base</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/gc/pom.xml ---------------------------------------------------------------------- diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 4aa31f7..50cdfd0 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-gc</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/master/pom.xml ---------------------------------------------------------------------- diff --git a/server/master/pom.xml b/server/master/pom.xml index 6af8344..51775a8 100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-master</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/monitor/pom.xml ---------------------------------------------------------------------- diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index 0e4688a..73469bb 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-monitor</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/native/pom.xml ---------------------------------------------------------------------- diff --git a/server/native/pom.xml b/server/native/pom.xml index d4126cd..c6ba25e 100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-native</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/tracer/pom.xml ---------------------------------------------------------------------- diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml index cd69d9d..a01916d 100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-tracer</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/server/tserver/pom.xml ---------------------------------------------------------------------- diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index fea0cec..1e97c29 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-tserver</artifactId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/shell/pom.xml ---------------------------------------------------------------------- diff --git a/shell/pom.xml b/shell/pom.xml index 93fa651..77f9261 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-shell</artifactId> <name>Apache Accumulo Shell</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/start/pom.xml ---------------------------------------------------------------------- diff --git a/start/pom.xml b/start/pom.xml index 9993555..655b1df 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-start</artifactId> <name>Apache Accumulo Start</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 6da0f0e..d36291a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-test</artifactId> <name>Apache Accumulo Testing</name> http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4073337/trace/pom.xml ---------------------------------------------------------------------- diff --git a/trace/pom.xml b/trace/pom.xml index d8c5ef4..3b1eccc 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.8.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <artifactId>accumulo-trace</artifactId> <name>Apache Accumulo Trace</name>