accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From md...@apache.org
Subject [4/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Date Tue, 04 Mar 2014 21:00:44 GMT
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b5c53d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b5c53d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b5c53d0

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 9b5c53d054d42f8265369cef48d4e2246055cd24
Parents: 5d9e155 0f23245
Author: Mike Drob <mdrob@cloudera.com>
Authored: Tue Mar 4 15:59:39 2014 -0500
Committer: Mike Drob <mdrob@cloudera.com>
Committed: Tue Mar 4 15:59:39 2014 -0500

----------------------------------------------------------------------
 server/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b5c53d0/server/pom.xml
----------------------------------------------------------------------
diff --cc server/pom.xml
index 667b864,0000000..bd61fe6
mode 100644,000000..100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@@ -1,172 -1,0 +1,171 @@@
 +<?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.5.2-SNAPSHOT</version>
 +  </parent>
 +  <artifactId>accumulo-server</artifactId>
 +  <name>Server</name>
 +  <dependencies>
 +    <dependency>
 +      <groupId>com.beust</groupId>
 +      <artifactId>jcommander</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.google.code.gson</groupId>
 +      <artifactId>gson</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>jline</groupId>
 +      <artifactId>jline</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.thrift</groupId>
 +      <artifactId>libthrift</artifactId>
 +    </dependency>
 +    <dependency>
++      <groupId>org.mortbay.jetty</groupId>
++      <artifactId>jetty</artifactId>
++    </dependency>
++    <dependency>
 +      <groupId>commons-codec</groupId>
 +      <artifactId>commons-codec</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-collections</groupId>
 +      <artifactId>commons-collections</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-configuration</groupId>
 +      <artifactId>commons-configuration</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-io</groupId>
 +      <artifactId>commons-io</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-lang</groupId>
 +      <artifactId>commons-lang</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>javax.servlet</groupId>
 +      <artifactId>servlet-api</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.hadoop</groupId>
 +      <artifactId>hadoop-client</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.zookeeper</groupId>
 +      <artifactId>zookeeper</artifactId>
 +      <scope>provided</scope>
 +    </dependency>
 +    <dependency>
-       <groupId>org.mortbay.jetty</groupId>
-       <artifactId>jetty</artifactId>
-       <scope>provided</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>
 +    <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>
 +    <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>
 +  <profiles>
 +    <profile>
 +      <id>native</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>exec-maven-plugin</artifactId>
 +            <executions>
 +              <execution>
 +                <id>generate-native-in-memory-map</id>
 +                <goals>
 +                  <goal>exec</goal>
 +                </goals>
 +                <phase>compile</phase>
 +                <configuration>
 +                  <executable>make</executable>
 +                  <workingDirectory>${basedir}/src/main/c++</workingDirectory>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +  </profiles>
 +</project>


Mime
View raw message