You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/10/28 23:33:00 UTC

svn commit: r1190592 [2/2] - in /incubator/accumulo: branches/1.3/ branches/1.3/src/core/ branches/1.3/src/examples/ branches/1.3/src/server/ branches/1.3/src/start/ branches/1.3/src/trace/ trunk/ trunk/contrib/accumulo_sample/ trunk/contrib/accumulo_s...

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,623 +16,623 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.accumulo</groupId>
-	<artifactId>accumulo</artifactId>
-	<packaging>pom</packaging>
-	<version>1.4.0-incubating-SNAPSHOT</version>
-	<name>accumulo</name>
-
-	<modules>
-		<module>src/trace</module>
-		<module>src/core</module>
-		<module>src/server</module>
-		<module>src/start</module>
-		<module>src/examples</module>
-	</modules>
-
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.0-beta-1</version>
-				<executions>
-					<execution>
-						<id>enforce-mvn</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>[2.0.9,)</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
-			</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>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../../lib</outputDirectory>
-							<!-- just grab the non-provided runtime dependencies -->
-							<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
-							<excludeGroupIds>org.apache.accumulo</excludeGroupIds>
-							<excludeTransitive>true</excludeTransitive>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<outputDirectory>../../lib</outputDirectory>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Implementation-Build>${buildNumber}</Implementation-Build>
-							<Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
-						</manifestEntries>
-					</archive>
-					<includes>
-						<include>cloudtrace/**</include>
-						<include>org/apache/accumulo**/**</include>
-						<include>web/**</include>
-						<include>randomwalk/**</include>
-						<include>*.*</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assemble/dist.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<optimize>true</optimize>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<quiet>true</quiet>
-					<jarOutputDirectory>lib</jarOutputDirectory>
-					<reportOutputDirectory>docs</reportOutputDirectory>
-					<javadocVersion>1.6</javadocVersion>
-					<additionalJOption>-J-Xmx512m</additionalJOption>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.0.4</version>
-				<configuration>
-					<outputDirectory>../../lib</outputDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<environmentVariables>
-						<ACCUMULO_HOME>../..</ACCUMULO_HOME>
-					</environmentVariables>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rpm-maven-plugin</artifactId>
-				<version>2.0-beta-2</version>
-				<inherited>false</inherited>
-				<configuration>
-					<name>accumulo</name>
-					<projversion>${project.version}</projversion>
-					<summary>Accumulo BigTable clone</summary>
-					<description>
-						Accumulo is a large distributed structured store based on Google's
-						BigTable design.
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.accumulo</groupId>
+  <artifactId>accumulo</artifactId>
+  <packaging>pom</packaging>
+  <version>1.4.0-incubating-SNAPSHOT</version>
+  <name>accumulo</name>
+
+  <modules>
+    <module>src/trace</module>
+    <module>src/core</module>
+    <module>src/server</module>
+    <module>src/start</module>
+    <module>src/examples</module>
+  </modules>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>enforce-mvn</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>[2.0.9,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>../../lib</outputDirectory>
+              <!-- just grab the non-provided runtime dependencies -->
+              <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
+              <excludeGroupIds>org.apache.accumulo</excludeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <outputDirectory>../../lib</outputDirectory>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+              <Implementation-Build>${buildNumber}</Implementation-Build>
+              <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+            </manifestEntries>
+          </archive>
+          <includes>
+            <include>cloudtrace/**</include>
+            <include>org/apache/accumulo**/**</include>
+            <include>web/**</include>
+            <include>randomwalk/**</include>
+            <include>*.*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assemble/dist.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <optimize>true</optimize>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <quiet>true</quiet>
+          <jarOutputDirectory>lib</jarOutputDirectory>
+          <reportOutputDirectory>docs</reportOutputDirectory>
+          <javadocVersion>1.6</javadocVersion>
+          <additionalJOption>-J-Xmx512m</additionalJOption>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.0.4</version>
+        <configuration>
+          <outputDirectory>../../lib</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <environmentVariables>
+            <ACCUMULO_HOME>../..</ACCUMULO_HOME>
+          </environmentVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rpm-maven-plugin</artifactId>
+        <version>2.0-beta-2</version>
+        <inherited>false</inherited>
+        <configuration>
+          <name>accumulo</name>
+          <projversion>${project.version}</projversion>
+          <summary>Accumulo BigTable clone</summary>
+          <description>
+            Accumulo is a large distributed structured store based on Google's
+            BigTable design.
           </description>
-					<copyright>FIXME</copyright>
-					<url>http://incubator.apache.org/accumulo</url>
-					<group>Utilities</group>
-					<requires>
-						<require>jdk</require>
-						<require>hadoop</require>
-						<require>zookeeper</require>
-					</requires>
-					<prefix>/opt/accumulo</prefix>
-					<defaultDirmode>755</defaultDirmode>
-					<defaultFilemode>644</defaultFilemode>
-					<defaultUsername>root</defaultUsername>
-					<defaultGroupname>root</defaultGroupname>
-					<mappings>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}</directory>
-							<sources>
-								<source>
-									<location>README</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
-							<sources>
-								<source>
-									<location>docs</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/test</directory>
-							<sources>
-								<source>
-									<location>test</location>
-									<excludes>
-										<exclude>**/walkers.txt</exclude>
-										<exclude>**/ingesters.txt</exclude>
-										<exclude>**/continuous-env.sh</exclude>
-										<exclude>**/*.pyc</exclude>
-									</excludes>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
-							<directoryIncluded>false</directoryIncluded>
-							<filemode>755</filemode>
-							<username>root</username>
-							<groupname>root</groupname>
-							<sources>
-								<source>
-									<location>bin</location>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
-							<sources>
-								<source>
-									<location>conf</location>
-									<excludes>
-										<exclude>**/accumulo-site.xml</exclude>
-										<exclude>**/accumulo-env.sh</exclude>
-										<exclude>**/accumulo-metrics.xml</exclude>
-										<exclude>**/test-*</exclude>
-										<exclude>**/slaves</exclude>
-										<exclude>**/masters</exclude>
-										<exclude>**/tracers</exclude>
-										<exclude>**/gc</exclude>
-										<exclude>**/monitor</exclude>
-									</excludes>
-								</source>
-							</sources>
-						</mapping>
-						<mapping>
-							<directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
-							<dependency />
-							<sources>
-								<source>
-									<location>lib</location>
-								</source>
-							</sources>
-						</mapping>
-					</mappings>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<inherited>false</inherited>
-				<version>1.2</version>
-				<configuration>
-					<executable>bash</executable>
-					<arguments>
-	   			      <argument>docs/src/user_manual/build.sh</argument>
-					</arguments>
-				</configuration>
-				<executions>
-					<execution>
-						<id>user-manual</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-                <plugins>
-                        <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></ignore>
-                                                        </action>
-                                                </pluginExecution>
-                                                <pluginExecution>
-                                                        <pluginExecutionFilter>
-                                                                <groupId>org.codehaus.mojo</groupId>
-                                                                <artifactId>exec-maven-plugin</artifactId>
-                                                                <versionRange>[1.1.1,)</versionRange>
-                                                                <goals>
-                                                                        <goal>exec</goal>
-                                                                </goals>
-                                                        </pluginExecutionFilter>
-                                                        <action>
-                                                                <ignore></ignore>
-                                                        </action>
-                                                </pluginExecution>
-                                        </pluginExecutions>
-                                        </lifecycleMappingMetadata>
-                                </configuration>
-                        </plugin>
-                </plugins>
-        </pluginManagement>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<format>html</format>
-					<includeTests>true</includeTests>
-					<targetJdk>1.6</targetJdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<formats>
-						<format>xml</format>
-						<format>html</format>
-					</formats>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>2.0.1</version>
-				<configuration>
-					<findbugsXmlOutput>true</findbugsXmlOutput>
-					<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-					<xmlOutput>true</xmlOutput>
-					<effort>Max</effort>
-					<threshold>Medium</threshold>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<profiles>
-		<profile>
-			<id>distclean</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clean-plugin</artifactId>
-						<configuration>
-							<filesets>
-								<fileset>
-									<directory>conf</directory>
-									<includes>
-										<include>gc</include>
-										<include>monitor</include>
-										<include>slaves</include>
-										<include>masters</include>
-										<include>accumulo-site.xml</include>
-										<include>accumulo-env.sh</include>
-										<include>accumulo-metrics.xml</include>
-										<include>test-*</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>docs/apidocs</directory>
-								</fileset>
-								<fileset>
-									<directory>logs</directory>
-								</fileset>
-								<fileset>
-									<directory>walogs</directory>
-								</fileset>
-								<fileset>
-									<directory>lib</directory>
-									<includes>
-										<include>*.jar</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>test</directory>
-									<includes>
-										<include>**/*.so</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>./</directory>
-									<includes>
-										<include>**/*.pyc</include>
-									</includes>
-								</fileset>
-								<fileset>
-									<directory>test/system/continuous</directory>
-									<includes>
-										<include>walkers.txt</include>
-										<include>ingesters.txt</include>
-										<include>continuous-env.sh</include>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-	<dependencyManagement>
-		<dependencies>
-			<!-- test dependencies -->
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.4</version>
-				<scope>test</scope>
-			</dependency>
-
-			<!-- provided dependencies needed at runtime -->
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-core</artifactId>
-				<version>0.20.2</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>zookeeper</artifactId>
-				<version>3.3.1</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.4</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>jetty</artifactId>
-				<version>[5.1,)</version>
-				<scope>provided</scope>
-			</dependency>
-
-			<!-- accumulo dependency jars that we will provide -->
-		  	<dependency>
-		  	   <groupId>org.apache.accumulo</groupId>
-		  	   <artifactId>cloudtrace</artifactId>
-		  	   <version>1.4.0-incubating-SNAPSHOT</version>
-		  	</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-start</artifactId>
-				<version>1.4.0-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-core</artifactId>
-				<version>1.4.0-incubating-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.accumulo</groupId>
-				<artifactId>accumulo-server</artifactId>
-				<version>1.4.0-incubating-SNAPSHOT</version>
-			</dependency>
-
-			<!-- additional dependencies we need to provide -->
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.16</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>2.4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-configuration</groupId>
-				<artifactId>commons-configuration</artifactId>
-				<version>1.5</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>1.4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>3.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.thrift</groupId>
-				<artifactId>libthrift</artifactId>
-				<version>0.6.1</version>
-			</dependency>
-			<dependency>
-				<groupId>jline</groupId>
-				<artifactId>jline</artifactId>
-				<version>0.9.94</version>
-			</dependency>
-			<dependency>
-				<groupId>jfree</groupId>
-				<artifactId>jcommon</artifactId>
-				<version>1.0.12</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>1.0.4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging-api</artifactId>
-				<version>1.0.4</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-net</groupId>
-				<artifactId>commons-net</artifactId>
-				<version>1.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.4.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.4.3</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>
-		</dependencies>
-	</dependencyManagement>
-
-	<!-- dependencies inherited by all sub-modules -->
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-	</dependencies>
-
-	<distributionManagement>
-		<repository>
-			<id>${accumulo-releases-repo}</id>
-			<url>${accumulo-releases-url}</url>
-		</repository>
-		<snapshotRepository>
-			<id>${accumulo-snapshots-repo}</id>
-			<url>${accumulo-snapshots-url}</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<scm>
-		<connection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</connection>
-		<developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</developerConnection>
-		<url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
-	</scm>
-
-	<ciManagement>
-		<url>https://builds.apache.org/job/Accumulo-Trunk-Nightly/</url>
-		<system>Apache Jenkins</system>
-	</ciManagement>
-	<url>http://incubator.apache.org/accumulo/</url>
-	<description>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>
-	<issueManagement>
-		<system>Apache's JIRA issue tracker</system>
-		<url>https://issues.apache.org/jira/browse/ACCUMULO</url>
-	</issueManagement>
+          <copyright>FIXME</copyright>
+          <url>http://incubator.apache.org/accumulo</url>
+          <group>Utilities</group>
+          <requires>
+            <require>jdk</require>
+            <require>hadoop</require>
+            <require>zookeeper</require>
+          </requires>
+          <prefix>/opt/accumulo</prefix>
+          <defaultDirmode>755</defaultDirmode>
+          <defaultFilemode>644</defaultFilemode>
+          <defaultUsername>root</defaultUsername>
+          <defaultGroupname>root</defaultGroupname>
+          <mappings>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}</directory>
+              <sources>
+                <source>
+                  <location>README</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+              <sources>
+                <source>
+                  <location>docs</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+              <sources>
+                <source>
+                  <location>test</location>
+                  <excludes>
+                    <exclude>**/walkers.txt</exclude>
+                    <exclude>**/ingesters.txt</exclude>
+                    <exclude>**/continuous-env.sh</exclude>
+                    <exclude>**/*.pyc</exclude>
+                  </excludes>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+              <directoryIncluded>false</directoryIncluded>
+              <filemode>755</filemode>
+              <username>root</username>
+              <groupname>root</groupname>
+              <sources>
+                <source>
+                  <location>bin</location>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+              <sources>
+                <source>
+                  <location>conf</location>
+                  <excludes>
+                    <exclude>**/accumulo-site.xml</exclude>
+                    <exclude>**/accumulo-env.sh</exclude>
+                    <exclude>**/accumulo-metrics.xml</exclude>
+                    <exclude>**/test-*</exclude>
+                    <exclude>**/slaves</exclude>
+                    <exclude>**/masters</exclude>
+                    <exclude>**/tracers</exclude>
+                    <exclude>**/gc</exclude>
+                    <exclude>**/monitor</exclude>
+                  </excludes>
+                </source>
+              </sources>
+            </mapping>
+            <mapping>
+              <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+              <dependency/>
+              <sources>
+                <source>
+                  <location>lib</location>
+                </source>
+              </sources>
+            </mapping>
+          </mappings>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <inherited>false</inherited>
+        <version>1.2</version>
+        <configuration>
+          <executable>bash</executable>
+          <arguments>
+            <argument>docs/src/user_manual/build.sh</argument>
+          </arguments>
+        </configuration>
+        <executions>
+          <execution>
+            <id>user-manual</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <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></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <versionRange>[1.1.1,)</versionRange>
+                    <goals>
+                      <goal>exec</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.0</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <format>html</format>
+          <includeTests>true</includeTests>
+          <targetJdk>1.6</targetJdk>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <formats>
+            <format>xml</format>
+            <format>html</format>
+          </formats>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.0.1</version>
+        <configuration>
+          <findbugsXmlOutput>true</findbugsXmlOutput>
+          <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+          <xmlOutput>true</xmlOutput>
+          <effort>Max</effort>
+          <threshold>Medium</threshold>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>distclean</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-clean-plugin</artifactId>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>conf</directory>
+                  <includes>
+                    <include>gc</include>
+                    <include>monitor</include>
+                    <include>slaves</include>
+                    <include>masters</include>
+                    <include>accumulo-site.xml</include>
+                    <include>accumulo-env.sh</include>
+                    <include>accumulo-metrics.xml</include>
+                    <include>test-*</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>docs/apidocs</directory>
+                </fileset>
+                <fileset>
+                  <directory>logs</directory>
+                </fileset>
+                <fileset>
+                  <directory>walogs</directory>
+                </fileset>
+                <fileset>
+                  <directory>lib</directory>
+                  <includes>
+                    <include>*.jar</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>test</directory>
+                  <includes>
+                    <include>**/*.so</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>./</directory>
+                  <includes>
+                    <include>**/*.pyc</include>
+                  </includes>
+                </fileset>
+                <fileset>
+                  <directory>test/system/continuous</directory>
+                  <includes>
+                    <include>walkers.txt</include>
+                    <include>ingesters.txt</include>
+                    <include>continuous-env.sh</include>
+                  </includes>
+                </fileset>
+              </filesets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- test dependencies -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.4</version>
+        <scope>test</scope>
+      </dependency>
+
+      <!-- provided dependencies needed at runtime -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-core</artifactId>
+        <version>0.20.2</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.3.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.4</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>[5.1,)</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <!-- accumulo dependency jars that we will provide -->
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>cloudtrace</artifactId>
+        <version>1.4.0-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-start</artifactId>
+        <version>1.4.0-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-core</artifactId>
+        <version>1.4.0-incubating-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-server</artifactId>
+        <version>1.4.0-incubating-SNAPSHOT</version>
+      </dependency>
+
+      <!-- additional dependencies we need to provide -->
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.16</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>1.5</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.thrift</groupId>
+        <artifactId>libthrift</artifactId>
+        <version>0.6.1</version>
+      </dependency>
+      <dependency>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
+        <version>0.9.94</version>
+      </dependency>
+      <dependency>
+        <groupId>jfree</groupId>
+        <artifactId>jcommon</artifactId>
+        <version>1.0.12</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>1.0.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-net</groupId>
+        <artifactId>commons-net</artifactId>
+        <version>1.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.4.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.4.3</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>
+    </dependencies>
+  </dependencyManagement>
+
+  <!-- dependencies inherited by all sub-modules -->
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+  </dependencies>
+
+  <distributionManagement>
+    <repository>
+      <id>${accumulo-releases-repo}</id>
+      <url>${accumulo-releases-url}</url>
+    </repository>
+    <snapshotRepository>
+      <id>${accumulo-snapshots-repo}</id>
+      <url>${accumulo-snapshots-url}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <scm>
+    <connection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</connection>
+    <developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</developerConnection>
+    <url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
+  </scm>
+
+  <ciManagement>
+    <url>https://builds.apache.org/job/Accumulo-Trunk-Nightly/</url>
+    <system>Apache Jenkins</system>
+  </ciManagement>
+  <url>http://incubator.apache.org/accumulo/</url>
+  <description>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>
+  <issueManagement>
+    <system>Apache's JIRA issue tracker</system>
+    <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+  </issueManagement>
 </project>

Modified: incubator/accumulo/trunk/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/pom.xml (original)
+++ incubator/accumulo/trunk/src/core/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,112 +16,112 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.4.0-incubating-SNAPSHOT</version>
-                <relativePath>../../</relativePath>
-	</parent>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.4.0-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>accumulo-core</artifactId>
-	<name>accumulo-core</name>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>accumulo-core</artifactId>
+  <name>accumulo-core</name>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.1.1</version>
-				<executions>
-					<execution>
-						<id>generate-core-thrift</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>${basedir}/src/main/thrift/thrift.sh</executable>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate-documentation</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>../../src/assemble/docgen.sh</executable>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestSections>
-							<manifestSection>
-								<name>accumulo/core/</name>
-								<manifestEntries>
-									<Sealed>true</Sealed>
-								</manifestEntries>
-							</manifestSection>
-						</manifestSections>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>generate-core-thrift</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>${basedir}/src/main/thrift/thrift.sh</executable>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-documentation</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>../../src/assemble/docgen.sh</executable>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestSections>
+              <manifestSection>
+                <name>accumulo/core/</name>
+                <manifestEntries>
+                  <Sealed>true</Sealed>
+                </manifestEntries>
+              </manifestSection>
+            </manifestSections>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>zookeeper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-start</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>cloudtrace</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/pom.xml (original)
+++ incubator/accumulo/trunk/src/examples/pom.xml Fri Oct 28 21:32:55 2011
@@ -15,8 +15,7 @@
   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"
+<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">
 
   <parent>

Modified: incubator/accumulo/trunk/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/pom.xml (original)
+++ incubator/accumulo/trunk/src/server/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,90 +16,90 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.4.0-incubating-SNAPSHOT</version>
-                <relativePath>../../</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>accumulo-server</artifactId>
-	<name>accumulo-server</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestSections>
-							<manifestSection>
-								<name>accumulo/server/</name>
-								<manifestEntries>
-									<Sealed>true</Sealed>
-								</manifestEntries>
-							</manifestSection>
-						</manifestSections>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>zookeeper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>accumulo-start</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.accumulo</groupId>
-			<artifactId>cloudtrace</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</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>
-	</dependencies>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.4.0-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>accumulo-server</artifactId>
+  <name>accumulo-server</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestSections>
+              <manifestSection>
+                <name>accumulo/server/</name>
+                <manifestEntries>
+                  <Sealed>true</Sealed>
+                </manifestEntries>
+              </manifestSection>
+            </manifestSections>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-start</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>cloudtrace</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</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>
+  </dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/src/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/start/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/start/pom.xml (original)
+++ incubator/accumulo/trunk/src/start/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,65 +16,65 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.4.0-incubating-SNAPSHOT</version>
-                <relativePath>../../</relativePath>
-	</parent>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.4.0-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>accumulo-start</artifactId>
-	<name>accumulo-start</name>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>accumulo-start</artifactId>
+  <name>accumulo-start</name>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestSections>
-							<manifestSection>
-								<name>accumulo/start/</name>
-								<manifestEntries>
-									<Sealed>true</Sealed>
-								</manifestEntries>
-							</manifestSection>
-						</manifestSections>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestSections>
+              <manifestSection>
+                <name>accumulo/start/</name>
+                <manifestEntries>
+                  <Sealed>true</Sealed>
+                </manifestEntries>
+              </manifestSection>
+            </manifestSections>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-jci-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-jci-fam</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-jci-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-jci-fam</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/trace/pom.xml?rev=1190592&r1=1190591&r2=1190592&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/trace/pom.xml (original)
+++ incubator/accumulo/trunk/src/trace/pom.xml Fri Oct 28 21:32:55 2011
@@ -16,39 +16,39 @@
   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">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.apache.accumulo</groupId>
-		<artifactId>accumulo</artifactId>
-		<version>1.4.0-incubating-SNAPSHOT</version>
-                <relativePath>../../</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>cloudtrace</artifactId>
-	<name>cloudtrace</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>zookeeper</artifactId>
-		</dependency>
-	</dependencies>
+  <parent>
+    <groupId>org.apache.accumulo</groupId>
+    <artifactId>accumulo</artifactId>
+    <version>1.4.0-incubating-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cloudtrace</artifactId>
+  <name>cloudtrace</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>zookeeper</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>