accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] git commit: ACCUMULO-1166 Merge branch '1.4' into 1.5
Date Tue, 17 Sep 2013 21:23:48 GMT
ACCUMULO-1166 Merge branch '1.4' into 1.5

Rework some more of the hadoop-1 and hadoop-2 support since 1.5.0 has
the compatibility to run on both present.

Conflicts:
	README.md
	pom.xml
	src/main/resources/archetype-resources/pom.xml
	src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/commit/1e6f9d42
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/1e6f9d42
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/1e6f9d42

Branch: refs/heads/1.5
Commit: 1e6f9d42f9604bcfa08c90828aa388752b717bb5
Parents: faa7f8d c4ca799
Author: Josh Elser <elserj@rpi.edu>
Authored: Tue Sep 17 17:18:16 2013 -0400
Committer: Josh Elser <elserj@rpi.edu>
Committed: Tue Sep 17 17:18:16 2013 -0400

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 README.md                                       |   2 +-
 pom.xml                                         | 162 ++++++++++---------
 .../META-INF/maven/archetype-metadata.xml       |   2 +-
 src/main/resources/archetype-resources/pom.xml  |  41 ++---
 .../src/main/java/ShellExample.java             |   6 +
 .../src/test/java/ExampleAccumuloUnitTest.java  |  13 +-
 .../src/test/resources/log4j.properties         |  29 ++++
 8 files changed, 158 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/1e6f9d42/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7693af5,19e0c4e..6428a07
--- a/pom.xml
+++ b/pom.xml
@@@ -1,78 -1,84 +1,84 @@@
- <?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/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>org.apache.accumulo</groupId>
-   <artifactId>instamo-archetype</artifactId>
-   <version>1.5.1-SNAPSHOT</version>
-   <packaging>maven-archetype</packaging>
-   <name>instamo-archetype</name>
-   <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/branches/1.5</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/branches/1.5</developerConnection>
-     <url>http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.5</url>
-   </scm>
-   <url>http://accumulo.apache.org</url>
-   <build>
-     <extensions>
-       <extension>
-         <groupId>org.apache.maven.archetype</groupId>
-         <artifactId>archetype-packaging</artifactId>
-         <version>2.2</version>
-       </extension>
-     </extensions>
-     <pluginManagement>
-       <plugins>
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-archetype-plugin</artifactId>
-           <version>2.2</version>
-         </plugin>
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-source-plugin</artifactId>
-           <version>2.2.1</version>
-           <configuration>
-             <includePom>true</includePom>
-           </configuration>
-         </plugin>
-       </plugins>
-     </pluginManagement>
-   </build>
-   <profiles>
-     <profile>
-       <id>release</id>
-       <build>
-         <plugins>
-           <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-source-plugin</artifactId>
-             <executions>
-               <execution>
-                 <id>attach-sources</id>
-                   <goals>
-                     <goal>jar</goal>
-                   </goals>
-               </execution>
-             </executions>
-           </plugin>
-         </plugins>
-       </build>
-     </profile>
-   </profiles>
- </project>
+ <?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/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+     <groupId>org.apache</groupId>
+     <artifactId>apache</artifactId>
+     <version>10</version>
+   </parent>
+ 
+   <groupId>org.apache.accumulo</groupId>
+   <artifactId>instamo-archetype</artifactId>
 -  <version>1.4.4-SNAPSHOT</version>
++  <version>1.5.0-SNAPSHOT</version>
+   <packaging>maven-archetype</packaging>
+   <name>instamo-archetype</name>
+   <scm>
+     <connection>scm:git:git://git.apache.org/accumulo-instamo-archetype.git</connection>
+     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git</developerConnection>
+     <url>https://git-wip-us.apache.org/repos/asf?p=accumulo-instamo-archetype.git</url>
+   </scm>
+   <url>http://accumulo.apache.org</url>
+   <build>
+     <extensions>
+       <extension>
+         <groupId>org.apache.maven.archetype</groupId>
+         <artifactId>archetype-packaging</artifactId>
+         <version>2.2</version>
+       </extension>
+     </extensions>
+     <pluginManagement>
+       <plugins>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-archetype-plugin</artifactId>
+           <version>2.2</version>
+         </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-source-plugin</artifactId>
+           <version>2.2.1</version>
+           <configuration>
+             <includePom>true</includePom>
+           </configuration>
+         </plugin>
+       </plugins>
+     </pluginManagement>
+   </build>
+   <profiles>
+     <profile>
+       <id>release</id>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-source-plugin</artifactId>
+             <executions>
+               <execution>
+                 <id>attach-sources</id>
+                   <goals>
+                     <goal>jar</goal>
+                   </goals>
+               </execution>
+             </executions>
+           </plugin>
+         </plugins>
+       </build>
+     </profile>
+   </profiles>
+ </project>

http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/1e6f9d42/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --cc src/main/resources/archetype-resources/pom.xml
index 7704cde,d7ec0ad..60779f5
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@@ -25,10 -25,8 +25,10 @@@
    <url>http://accumulo.apache.org</url>
  
    <properties>
 -    <accumulo.version>1.4.4</accumulo.version>
 +    <accumulo.version>1.5.0</accumulo.version>
-     <hadoop-one.version>1.0.4</hadoop-one.version>
-     <hadoop-two.version>2.0.2-alpha</hadoop-two.version>
+     <hadoop-one.version>1.2.1</hadoop-one.version>
++    <hadoop-two.version>2.1.0-beta</hadoop-two.version>
 +    <slf4j.version>1.6.1</slf4j.version>
      <maclass>${package}.MapReduceExample</maclass>
    </properties>
  
@@@ -44,35 -42,7 +44,25 @@@
        </activation>
        <properties>
          <hadoop.version>${hadoop-one.version}</hadoop.version>
++		<httpclient.version>3.0.1</httpclient.version>
++		<slf4j.version>1.4.3</slf4j.version>
 +      </properties>
-       <dependencies>
-         <dependency>
-           <groupId>org.apache.hadoop</groupId>
-           <artifactId>hadoop-core</artifactId>
-           <version>${hadoop.version}</version>
-         </dependency>
-       </dependencies>
 +    </profile>
-     <!-- profile for building against Hadoop 2.0.x
++    <!-- profile for building against Hadoop 2.1.x
 +    Activate using: mvn -Dhadoop.profile=2.0 -->
 +    <profile>
 +      <id>hadoop-2.0</id>
 +      <activation>
 +        <property>
 +          <name>hadoop.profile</name>
 +          <value>2.0</value>
 +        </property>
 +      </activation>
 +      <properties>
 +        <hadoop.version>${hadoop-two.version}</hadoop.version>
++		<httpclient.version>3.1</httpclient.version>
++		<slf4j.version>1.6.1</slf4j.version>
        </properties>
-       <dependencies>
-         <dependency>
-           <groupId>org.apache.hadoop</groupId>
-           <artifactId>hadoop-client</artifactId>
-           <version>${hadoop.version}</version>
-         </dependency>
-       </dependencies>
      </profile>
      <profile>
        <id>shell</id>
@@@ -159,6 -109,11 +149,11 @@@
        <version>${accumulo.version}</version>
      </dependency>
      <dependency>
+       <groupId>org.apache.hadoop</groupId>
 -      <artifactId>hadoop-core</artifactId>
++      <artifactId>hadoop-client</artifactId>
+       <version>${hadoop.version}</version>
+     </dependency>
+     <dependency>
        <groupId>org.apache.zookeeper</groupId>
        <artifactId>zookeeper</artifactId>
        <version>3.3.6</version>
@@@ -187,16 -128,6 +182,26 @@@
        <artifactId>guava</artifactId>
        <version>14.0.1</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>commons-cli</groupId>
++      <artifactId>commons-cli</artifactId>
++      <version>1.2</version>
++    </dependency>
++    <dependency>
++      <groupId>commons-httpclient</groupId>
++      <artifactId>commons-httpclient</artifactId>
++      <version>${httpclient.version}</version>
++    </dependency>
    </dependencies>
  
    <build>

http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/1e6f9d42/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
----------------------------------------------------------------------


Mime
View raw message