You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2015/09/18 23:51:33 UTC
incubator-asterixdb git commit: Fix missing JARs in YARN packaging
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master a7627425c -> e245ed840
Fix missing JARs in YARN packaging
There were some missing JARs for the Asterix YARN client in the zip packaging.
This tells maven's packager to include those dependencies.
Change-Id: I3985f7c84f4a60733b99c696535dd8a4fb4b87e1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/358
Reviewed-by: Murtadha Hubail <hu...@gmail.com>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/e245ed84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/e245ed84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/e245ed84
Branch: refs/heads/master
Commit: e245ed840db7b237472b0eb688daa1fb6047ed1f
Parents: a762742
Author: Ian Maxon <im...@apache.org>
Authored: Tue Aug 18 15:26:32 2015 -0700
Committer: Ian Maxon <im...@apache.org>
Committed: Fri Sep 18 14:48:29 2015 -0700
----------------------------------------------------------------------
asterix-yarn/pom.xml | 6 +++
.../src/main/assembly/binary-assembly.xml | 2 +
.../src/main/assembly/hyracks-assembly.xml | 41 --------------------
3 files changed, 8 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e245ed84/asterix-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/asterix-yarn/pom.xml b/asterix-yarn/pom.xml
index 9835122..81b6a37 100644
--- a/asterix-yarn/pom.xml
+++ b/asterix-yarn/pom.xml
@@ -241,5 +241,11 @@
<artifactId>slf4j-simple</artifactId>
<version>1.6.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e245ed84/asterix-yarn/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/asterix-yarn/src/main/assembly/binary-assembly.xml b/asterix-yarn/src/main/assembly/binary-assembly.xml
index 81a3992..f7106f0 100644
--- a/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ b/asterix-yarn/src/main/assembly/binary-assembly.xml
@@ -76,6 +76,7 @@
<include>commons-io:commons-io</include>
<include>commons-cli:commons-cli</include>
<include>commons-configuration:commons-configuration</include>
+ <include>commons-collections:commons-collections</include>
<include>commons-logging:commons-logging</include>
<include>commons-codec:commons-codec</include>
<include>commons-lang:commons-lang</include>
@@ -87,6 +88,7 @@
<include>org.apache.hadoop:hadoop-yarn-api</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.httpcomponents:httpclient</include>
+ <include>org.htrace:htrace-core</include>
<include>commons-httpclient:commons-httpclient</include>
<include>com.google.guava:guava</include>
<include>com.google.protobuf:protobuf-java</include>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/e245ed84/asterix-yarn/src/main/assembly/hyracks-assembly.xml
----------------------------------------------------------------------
diff --git a/asterix-yarn/src/main/assembly/hyracks-assembly.xml b/asterix-yarn/src/main/assembly/hyracks-assembly.xml
deleted file mode 100644
index 7d680dd..0000000
--- a/asterix-yarn/src/main/assembly/hyracks-assembly.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
- ! 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.
- !-->
-<assembly>
- <id>binary-assembly</id>
- <formats>
- <format>zip</format>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/appassembler/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/appassembler/lib</directory>
- <outputDirectory>lib</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>docs</directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>