accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [12/13] git commit: Merge branch 'accumulo-1.5.0-SNAPSHOT' into 1.5
Date Fri, 18 Oct 2013 23:53:19 GMT
Merge branch 'accumulo-1.5.0-SNAPSHOT' into 1.5

Conflicts:
	.gitignore
	pom.xml
	src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
	src/main/java/org/apache/accumulo/pig/AccumuloStorage.java
	src/main/java/org/apache/accumulo/pig/Utils.java

ACCUMULO-1783 Merge in Jason's 1.5 changes and do some pom cleanup


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

Branch: refs/heads/1.5
Commit: e0583a501a51978933cab73d076e7aa493e1d4b6
Parents: e1af2f3 6d49466
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 18 11:43:49 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 18 11:43:49 2013 -0400

----------------------------------------------------------------------
 .gitignore                                      |  2 +
 README.md                                       | 90 ++++++++++++++++++++
 pom.xml                                         | 69 +++++++++++++--
 .../accumulo/pig/AbstractAccumuloStorage.java   | 73 ++++++++++------
 .../apache/accumulo/pig/AccumuloStorage.java    | 34 +++++---
 .../java/org/apache/accumulo/pig/Utils.java     |  4 +
 6 files changed, 226 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/e0583a50/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index f0e4507,7adea5f..1121465
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,6 +1,6 @@@
 -/target
 -/lib
+ *~
 -/.classpath
 -/.project
 -/.settings
 +.classpath
 +.project
 +.settings
++/lib
 +/target

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/e0583a50/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 249dcce,097d8de..37f2841
--- a/pom.xml
+++ b/pom.xml
@@@ -18,34 -15,87 +18,91 @@@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.apache.accumulo</groupId>
    <artifactId>accumulo-pig</artifactId>
-   <version>1.4.4-SNAPSHOT</version>
 -  <packaging>jar</packaging>
+   <version>1.5.0-SNAPSHOT</version>
 -  <name>accumulo-pig</name>
 -  <url>http://maven.apache.org</url>
 -
 +  
    <dependencies>
      <dependency>
 +      <groupId>org.apache.pig</groupId>
 +      <artifactId>pig</artifactId>
 +      <version>0.12.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-logging</groupId>
 +      <artifactId>commons-logging</artifactId>
 +      <version>1.0.4</version>
 +    </dependency>
 +    <dependency>
+       <groupId>log4j</groupId>
+       <artifactId>log4j</artifactId>
+       <version>1.2.16</version>
+     </dependency>
+     <dependency>
        <groupId>org.apache.hadoop</groupId>
        <artifactId>hadoop-core</artifactId>
 -      <version>1.1.1</version>
 +      <version>1.2.1</version>
      </dependency>
 -    <dependency>
 -      <groupId>org.apache.pig</groupId>
 -      <artifactId>pig</artifactId>
 -      <version>0.11.0</version>
 -    </dependency>
 -    <!-- Needed by Apache Pig 0.11.0 -->
++    <!-- Needed by Apache Pig -->
+     <dependency>
+       <groupId>joda-time</groupId>
+       <artifactId>joda-time</artifactId>
+       <version>1.6</version>
+     </dependency>
      <dependency>
        <groupId>org.apache.accumulo</groupId>
        <artifactId>accumulo-core</artifactId>
-       <version>1.4.4</version>
+       <version>1.5.0</version>
      </dependency>
      <dependency>
-       <groupId>joda-time</groupId>
-       <artifactId>joda-time</artifactId>
-       <version>1.6</version>
 -      <groupId>org.apache.hadoop</groupId>
++      <groupId>org.apache.zookeeper</groupId>
+       <artifactId>zookeeper</artifactId>
 -      <version>3.3.1</version>
++      <version>3.4.5</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.thrift</groupId>
+       <artifactId>libthrift</artifactId>
+       <version>0.9.0</version>
      </dependency>
    </dependencies>
-   
+ 
 -  <build>
 -    <plugins>
 -      <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-compiler-plugin</artifactId>
 -        <configuration>
 -          <source>1.6</source>
 -          <target>1.6</target>
 -        </configuration>
 -      </plugin>
 -
 -      <plugin>
 -        <artifactId>maven-assembly-plugin</artifactId>
 -        <configuration>
 -          <descriptorRefs>
 -            <descriptorRef>jar-with-dependencies</descriptorRef>
 -          </descriptorRefs>
 -          <archive>
 -            <manifest>
 -              <mainClass />
 -            </manifest>
 -          </archive>
 -        </configuration>
 -        <executions>
 -          <execution>
 -            <id>make-assembly</id>
 -            <phase>package</phase>
 -            <goals>
 -              <goal>single</goal>
 -            </goals>
 -          </execution>
 -        </executions>
 -      </plugin>
 -
 -
 -    </plugins>
 -  </build>
++  <profiles>
++    <profile>
++      <id>assemble</id>
++      <build>
++        <plugins>
++          <plugin>
++            <groupId>org.apache.maven.plugins</groupId>
++            <artifactId>maven-compiler-plugin</artifactId>
++            <configuration>
++              <source>1.6</source>
++              <target>1.6</target>
++            </configuration>
++          </plugin>
+ 
++          <plugin>
++            <artifactId>maven-assembly-plugin</artifactId>
++            <configuration>
++              <descriptorRefs>
++                <descriptorRef>jar-with-dependencies</descriptorRef>
++              </descriptorRefs>
++              <archive>
++                <manifest>
++                  <mainClass />
++                </manifest>
++              </archive>
++            </configuration>
++            <executions>
++              <execution>
++                <id>make-assembly</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>single</goal>
++                </goals>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ 
  </project>

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/e0583a50/src/main/java/org/apache/accumulo/pig/AbstractAccumuloStorage.java
----------------------------------------------------------------------


Mime
View raw message