Fixing a couple more pom issues. Dealing with Hadoop1 and hadoop2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/34a39f83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/34a39f83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/34a39f83 Branch: refs/heads/console-v2 Commit: 34a39f83bbb566ce5494505c77e8c1184c23a121 Parents: 7afca43 Author: Aaron McCurry <[email protected]> Authored: Thu May 1 22:29:01 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Thu May 1 22:29:01 2014 -0400 ---------------------------------------------------------------------- blur-shell/pom.xml | 24 ------------------------ distribution/pom.xml | 19 ++++++++++++++----- distribution/src/assemble/bin.xml | 2 +- 3 files changed, 15 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/34a39f83/blur-shell/pom.xml ---------------------------------------------------------------------- diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml index ddc154c..2d2cc6a 100644 --- a/blur-shell/pom.xml +++ b/blur-shell/pom.xml @@ -103,30 +103,6 @@ under the License. <target>1.6</target> </configuration> </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.3</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <mainClass>org.apache.blur.shell.Main</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/34a39f83/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 5d7eb0b..284d6b5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -36,11 +36,6 @@ under the License. <dependencies> <dependency> <groupId>org.apache.blur</groupId> - <artifactId>blur-mapred</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.blur</groupId> <artifactId>blur-shell</artifactId> <version>${project.version}</version> </dependency> @@ -77,6 +72,13 @@ under the License. <name>hadoop1</name> </property> </activation> + <dependencies> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-mapred-hadoop1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <properties> <projectVersion>${project.parent.version}-hadoop1</projectVersion> </properties> @@ -88,6 +90,13 @@ under the License. <name>hadoop2</name> </property> </activation> + <dependencies> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-mapred-hadoop2</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <properties> <projectVersion>${project.parent.version}-hadoop2</projectVersion> </properties> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/34a39f83/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 51b985f..0a8c0ba 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -68,7 +68,7 @@ under the License. <exclude>org.eclipse.jdt:core</exclude> <!-- Removing dup --> - <exclude>org.apache.hadoop:hadoop-core</exclude> + <exclude>org.apache.hadoop:*</exclude> <exclude>org.apache.zookeeper:zookeeper</exclude> <exclude>org.slf4j:slf4j-api</exclude>
