Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
src/assemble/build.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f75be7d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f75be7d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f75be7d5
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: f75be7d5a302a79650f3e35de4ecf5493c21f2bb
Parents: 9aebb2b ba507fc
Author: Christopher Tubbs <[email protected]>
Authored: Thu Sep 5 20:46:27 2013 -0400
Committer: Christopher Tubbs <[email protected]>
Committed: Thu Sep 5 20:46:27 2013 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f75be7d5/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 52e1beb,d427da8..9ec893c
--- a/pom.xml
+++ b/pom.xml
@@@ -20,598 -20,50 +20,598 @@@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>13</version>
</parent>
-
-
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <version>1.4.5-SNAPSHOT</version>
- <name>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>
+ <organization>
+ <name>Apache Accumulo Project</name>
+ <url>http://accumulo.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>User</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/accumulo-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/accumulo-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/accumulo-commits</archive>
+ </mailingList>
+ <mailingList>
+ <name>Notifications</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/accumulo-notifications</archive>
+ </mailingList>
+ </mailingLists>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<modules>
- <module>src/trace</module>
- <module>src/core</module>
- <module>src/server</module>
- <module>src/start</module>
- <module>src/examples</module>
- <module>src/proxy</module>
- <module>src/minicluster</module>
+ <module>trace</module>
+ <module>core</module>
+ <module>fate</module>
+ <module>server</module>
+ <module>start</module>
+ <module>examples</module>
+ <module>assemble</module>
+ <module>proxy</module>
+ <module>test</module>
+ <module>minicluster</module>
</modules>
-
+ <scm>
+ <connection>scm:git:git://git.apache.org/accumulo.git</connection>
+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Apache Jenkins</system>
+ <url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
+ </ciManagement>
+ <distributionManagement>
+ <site>
+ <id>accumulo.mvn.website</id>
+ <name>Accumulo Maven Site</name>
+ <!-- this is not likely to be what we really want, but it's good enough
for a test -->
+
<url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <!-- used for filtering the java source with the current version -->
+ <accumulo.release.version>${project.version}</accumulo.release.version>
+ <!-- the maven-release-plugin makes this recommendation, due to plugin
bugs -->
+ <maven.min-version>3.0.4</maven.min-version>
+ <powermock.version>1.5</powermock.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <sealJars>false</sealJars>
+ <!-- ZooKeeper 3.4.x works also, but we're not using new features yet;
this ensures 3.3.x compatibility. -->
+ <zookeeper.version>3.3.6</zookeeper.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.30</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-minicluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-proxy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-tools</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-reflect</artifactId>
+ <version>${powermock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <defaultGoal>package</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <version>2.1.0</version>
+ <configuration>
+ <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+ <lineSeparator>\n</lineSeparator>
+ <expandEmptyElements>false</expandEmptyElements>
+ <nrOfIndentSpace>2</nrOfIndentSpace>
+ <sortDependencies>scope,groupId,artifactId</sortDependencies>
+ <sortProperties>true</sortProperties>
+ <verifyFail>Stop</verifyFail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <attach>false</attach>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <issueManagementSystems>
+ <issueManagementSystem>JIRA</issueManagementSystem>
+ </issueManagementSystems>
+ <onlyCurrentVersion>true</onlyCurrentVersion>
+ <statusIds>Closed,Resolved</statusIds>
+ <maxEntries>10000</maxEntries>
+ <useJql>true</useJql>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- should be in the Apache parent, but isn't -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Sealed>${sealJars}</Sealed>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>clean compile javadoc:aggregate deploy</goals>
+ <preparationGoals>clean compile javadoc:aggregate
verify</preparationGoals>
+ <tagNameFormat>@{project.version}-RC</tagNameFormat>
+ <releaseProfiles>seal-jars</releaseProfiles>
+ <useReleaseProfile>false</useReleaseProfile>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
- <version>0.9</version>
++ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>docs/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <formats>
+ <format>xml</format>
+ <format>html</format>
+ </formats>
+ <instrumentation>
+ <excludes>
+ <exclude>**/thrift/*.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>latex-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
+ <versionRange>[2.1.0,)</versionRange>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
+ <!-- verify only; 'mvn clean -P sortpom' sorts -->
+ <groupId>com.google.code.sortpom</groupId>
+ <artifactId>maven-sortpom-plugin</artifactId>
<executions>
<execution>
- <id>enforce-mvn</id>
+ <id>verify-sorted-pom</id>
<goals>
- <goal>enforce</goal>
+ <goal>verify</goal>
</goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
+ <phase>validate</phase>
</execution>
</executions>
</plugin>
