ACCUMULO-1166 Merge branch '1.5'
Conflicts:
pom.xml
src/main/resources/archetype-resources/pom.xml
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/07f70592
Tree:
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/07f70592
Diff:
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/07f70592
Branch: refs/heads/master
Commit: 07f705921c2fa81543e920ef51a51dc7d2e3bfb6
Parents: eb4abac 1e6f9d4
Author: Josh Elser <[email protected]>
Authored: Tue Sep 17 17:48:11 2013 -0400
Committer: Josh Elser <[email protected]>
Committed: Tue Sep 17 17:48:11 2013 -0400
----------------------------------------------------------------------
.gitignore | 3 +
README.md | 2 +-
pom.xml | 162 ++++++++++---------
.../META-INF/maven/archetype-metadata.xml | 2 +-
src/main/resources/archetype-resources/pom.xml | 46 +++---
.../src/main/java/ShellExample.java | 6 +
.../src/test/java/ExampleAccumuloUnitTest.java | 13 +-
.../src/test/resources/log4j.properties | 29 ++++
8 files changed, 163 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/07f70592/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 25f2032,6428a07..3711c80
--- 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.6.0-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
- <name>instamo-archetype</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk</developerConnection>
-
<url>http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk</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.5.0-SNAPSHOT</version>
++ <version>1.6.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/07f70592/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --cc src/main/resources/archetype-resources/pom.xml
index 1fb7cf2,60779f5..91e3bf0
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@@ -25,9 -25,9 +25,9 @@@
<url>http://accumulo.apache.org</url>
<properties>
- <accumulo.version>1.5.0</accumulo.version>
+ <accumulo.version>1.6.0-SNAPSHOT</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>
@@@ -197,6 -192,16 +192,21 @@@
<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-codec</groupId>
++ <artifactId>commons-codec</artifactId>
++ <version>1.7</version>
++ </dependency>
++ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
</dependencies>
<build>
