Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8827e474 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8827e474 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8827e474 Branch: refs/heads/1.6 Commit: 8827e474063a9162a2d0bd0a09f9429ad99dd241 Parents: e4ffc77 f042460 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Sep 10 19:02:21 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Sep 10 19:02:21 2015 -0400 ---------------------------------------------------------------------- NOTICE | 2 +- assemble/pom.xml | 2 +- core/pom.xml | 2 +- docs/pom.xml | 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 8 +++++--- 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 +- start/pom.xml | 2 +- test/pom.xml | 2 +- trace/pom.xml | 2 +- 20 files changed, 24 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/NOTICE ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/assemble/pom.xml ---------------------------------------------------------------------- diff --cc assemble/pom.xml index fb92ea7,cce6b2a..4c23616 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@@ -24,10 -24,8 +24,10 @@@ </parent> <artifactId>accumulo</artifactId> <packaging>pom</packaging> - <name>Assemblies</name> + <name>Apache Accumulo</name> + <description>Apache Accumulo packages.</description> <properties> + <DEV_ACCUMULO_HOME>${project.build.directory}</DEV_ACCUMULO_HOME> <accumulo-top>..</accumulo-top> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index f0d28ae,7304e4f..cd5a379 --- a/core/pom.xml +++ b/core/pom.xml @@@ -20,11 -20,10 +20,11 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-core</artifactId> - <name>Core</name> + <name>Apache Accumulo Core</name> + <description>Apache Accumulo core libraries.</description> <dependencies> <dependency> <groupId>com.beust</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/docs/pom.xml ---------------------------------------------------------------------- diff --cc docs/pom.xml index 80f81f8,0000000..11f573d mode 100644,000000..100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@@ -1,128 -1,0 +1,128 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + </parent> + <artifactId>accumulo-docs</artifactId> + <packaging>pom</packaging> - <name>Documentation</name> ++ <name>Apache Accumulo Documentation</name> + <description>User documentation for Apache Accumulo.</description> + <profiles> + <profile> + <id>docs</id> + <dependencies> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>prep-output-dir</id> + <goals> + <goal>exec</goal> + </goals> + <phase>compile</phase> + <configuration> + <executable>mkdir</executable> + <arguments> + <argument>-p</argument> + <argument>${project.build.directory}/latex/accumulo_user_manual/appendices</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>config-html</id> + <goals> + <goal>java</goal> + </goals> + <phase>compile</phase> + <configuration> + <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass> + <classpathScope>compile</classpathScope> + <arguments> + <argument>--generate-html</argument> + <argument>${project.build.directory}/config.html</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>config-appendix</id> + <goals> + <goal>java</goal> + </goals> + <phase>compile</phase> + <configuration> + <mainClass>org.apache.accumulo.core.conf.ConfigurationDocGen</mainClass> + <classpathScope>compile</classpathScope> + <arguments> + <argument>--generate-latex</argument> + <argument>${project.build.directory}/latex/accumulo_user_manual/appendices/config.tex</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>latex-maven-plugin</artifactId> + <executions> + <execution> + <id>build-pdf-manuals</id> + <goals> + <goal>latex</goal> + </goals> + <phase>prepare-package</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-user-manual-pdf</id> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/accumulo_user_manual.pdf</file> + <type>pdf</type> + <classifier>user-manual</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/examples/simple/pom.xml ---------------------------------------------------------------------- diff --cc examples/simple/pom.xml index 589fe41,d083b0a..5eab15b --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@@ -19,13 -19,11 +19,13 @@@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-examples</artifactId> - <version>1.5.4-SNAPSHOT</version> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>accumulo-examples-simple</artifactId> - <name>Simple Examples</name> + <name>Apache Accumulo Simple Examples</name> + <description>Simple Apache Accumulo examples.</description> <dependencies> <dependency> <groupId>com.beust</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/fate/pom.xml ---------------------------------------------------------------------- diff --cc fate/pom.xml index 0c68dbd,898a819..5929a3d --- a/fate/pom.xml +++ b/fate/pom.xml @@@ -20,11 -20,10 +20,11 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-fate</artifactId> - <name>Fate</name> + <name>Apache Accumulo Fate</name> + <description>A FAult-Tolerant Executor library used by Apache Accumulo.</description> <dependencies> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/maven-plugin/pom.xml ---------------------------------------------------------------------- diff --cc maven-plugin/pom.xml index fc066f4,0000000..fc79fac mode 100644,000000..100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@@ -1,138 -1,0 +1,138 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + </parent> + <artifactId>accumulo-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> - <name>Accumulo Maven Plugin</name> ++ <name>Apache Accumulo Maven Plugin</name> + <description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description> + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-minicluster</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <id>mojo-descriptor</id> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + <execution> + <id>help-goal</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <noLog>true</noLog> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <goals> + <goal>clean</goal> + <goal>post-integration-test</goal> + </goals> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>skip-plugin-its-with-skipTests</id> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + <properties> + <invoker.skip>true</invoker.skip> + </properties> + </profile> + <profile> + <id>skip-plugin-its-with-skipITs</id> + <activation> + <property> + <name>skipITs</name> + </property> + </activation> + <properties> + <invoker.skip>true</invoker.skip> + </properties> + </profile> + </profiles> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/minicluster/pom.xml ---------------------------------------------------------------------- diff --cc minicluster/pom.xml index 87d8673,ecbdec6..8cdccef --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@@ -20,11 -20,10 +20,11 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-minicluster</artifactId> - <name>MiniCluster</name> + <name>Apache Accumulo MiniCluster</name> + <description>A library for launching and running a standalone instance of Apache Accumulo for testing.</description> <dependencies> <dependency> <groupId>com.beust</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 6ddad7f,be775fd..13c7a16 --- a/pom.xml +++ b/pom.xml @@@ -24,9 -24,9 +24,9 @@@ </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Accumulo</name> + <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> <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site --> <url>http://accumulo.apache.org/maven-site/</url> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/proxy/pom.xml ---------------------------------------------------------------------- diff --cc proxy/pom.xml index f313556,bed5f74..1ffd560 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@@ -20,11 -20,10 +20,11 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-proxy</artifactId> - <name>Proxy</name> + <name>Apache Accumulo Proxy</name> + <description>A server for Apache Accumulo that proxies connections from any language supported by Apache Thrift.</description> <dependencies> <dependency> <groupId>com.beust</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/base/pom.xml ---------------------------------------------------------------------- diff --cc server/base/pom.xml index 5b07e47,0000000..51f326c mode 100644,000000..100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@@ -1,122 -1,0 +1,122 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-server-base</artifactId> - <name>Server Base</name> ++ <name>Apache Accumulo Server Base</name> + <description>A common base library for Apache Accumulo servers.</description> + <dependencies> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + </build> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/gc/pom.xml ---------------------------------------------------------------------- diff --cc server/gc/pom.xml index 67bfc06,0000000..2d550c9 mode 100644,000000..100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@@ -1,91 -1,0 +1,91 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-gc</artifactId> - <name>GC Server</name> ++ <name>Apache Accumulo GC Server</name> + <description>The garbage collecting server for Apache Accumulo to clean up unused files.</description> + <dependencies> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/master/pom.xml ---------------------------------------------------------------------- diff --cc server/master/pom.xml index fa0d44f,0000000..aa6a14d mode 100644,000000..100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@@ -1,95 -1,0 +1,95 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-master</artifactId> - <name>Master Server</name> ++ <name>Apache Accumulo Master Server</name> + <description>The master server for Apache Accumulo for load balacing and other system-wide operations.</description> + <dependencies> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/monitor/pom.xml ---------------------------------------------------------------------- diff --cc server/monitor/pom.xml index b1052a6,0000000..a597032 mode 100644,000000..100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@@ -1,143 -1,0 +1,143 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-monitor</artifactId> - <name>Monitor Server</name> ++ <name>Apache Accumulo Monitor Server</name> + <description>A web server for monitoring Apache Accumulo.</description> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/resources/web/flot/**/*.js</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/native/pom.xml ---------------------------------------------------------------------- diff --cc server/native/pom.xml index 56891dd,0000000..2e534c1 mode 100644,000000..100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@@ -1,113 -1,0 +1,113 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-native</artifactId> + <packaging>pom</packaging> - <name>Native Libraries</name> ++ <name>Apache Accumulo Native Libraries</name> + <description>C++ native libraries for improved performance in Apache Accumulo.</description> + <dependencies> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-tserver</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>native-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-javah-includes</id> + <goals> + <goal>javah</goal> + </goals> + <phase>compile</phase> + <configuration> + <javahClassNames> + <javahClassName>org.apache.accumulo.tserver.NativeMap</javahClassName> + </javahClassNames> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assemble-native-tarball</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assemblies/native-tarball.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>test-native-libs</id> + <goals> + <goal>exec</goal> + </goals> + <phase>integration-test</phase> + <configuration> + <executable>make</executable> + <workingDirectory>${project.build.directory}/${project.artifactId}-${project.version}/${project.artifactId}-${project.version}</workingDirectory> + <arguments> + <argument>test</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/tracer/pom.xml ---------------------------------------------------------------------- diff --cc server/tracer/pom.xml index 3fa0d95,0000000..6d735a0 mode 100644,000000..100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@@ -1,77 -1,0 +1,77 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-tracer</artifactId> - <name>Tracer Server</name> ++ <name>Apache Accumulo Tracer Server</name> + <description>The tracer server for Apache Accumulo to listen for, and store, distributed tracing messages.</description> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/server/tserver/pom.xml ---------------------------------------------------------------------- diff --cc server/tserver/pom.xml index ab2691b,0000000..75bca9b mode 100644,000000..100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@@ -1,126 -1,0 +1,126 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-project</artifactId> + <version>1.6.4-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>accumulo-tserver</artifactId> - <name>Tablet Server</name> ++ <name>Apache Accumulo Tablet Server</name> + <description>The tablet server for Apache Accumulo to host tablets of data tables.</description> + <dependencies> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/test/resources/*.walog</exclude> + <exclude>src/test/resources/walog-from-14/*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/start/pom.xml ---------------------------------------------------------------------- diff --cc start/pom.xml index f455a6b,416bd51..4dc0bcd --- a/start/pom.xml +++ b/start/pom.xml @@@ -20,15 -20,19 +20,15 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-start</artifactId> - <name>Start</name> + <name>Apache Accumulo Start</name> + <description>A library for launching Apache Accumulo services.</description> <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>commons-logging</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/test/pom.xml ---------------------------------------------------------------------- diff --cc test/pom.xml index a84ba88,63f165c..89dbafd --- a/test/pom.xml +++ b/test/pom.xml @@@ -20,14 -20,10 +20,14 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-test</artifactId> - <name>Testing</name> + <name>Apache Accumulo Testing</name> + <description>Tests for Apache Accumulo.</description> + <properties> + <timeout.factor>1</timeout.factor> + </properties> <dependencies> <dependency> <groupId>com.beust</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/8827e474/trace/pom.xml ---------------------------------------------------------------------- diff --cc trace/pom.xml index b961aed,a07a973..b4316a5 --- a/trace/pom.xml +++ b/trace/pom.xml @@@ -20,19 -20,19 +20,19 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>accumulo-trace</artifactId> - <name>Trace</name> + <name>Apache Accumulo Trace</name> + <description>A distributed tracing library for Apache Accumulo.</description> <dependencies> <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId>
