Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/358
Change subject: Fix missing JARs in YARN packaging
......................................................................
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
---
M asterix-yarn/pom.xml
M asterix-yarn/src/main/assembly/binary-assembly.xml
D asterix-yarn/src/main/assembly/hyracks-assembly.xml
3 files changed, 8 insertions(+), 37 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/58/358/1
diff --git a/asterix-yarn/pom.xml b/asterix-yarn/pom.xml
index e4eb3c6..4097ffa 100644
--- a/asterix-yarn/pom.xml
+++ b/asterix-yarn/pom.xml
@@ -237,5 +237,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>
diff --git a/asterix-yarn/src/main/assembly/binary-assembly.xml
b/asterix-yarn/src/main/assembly/binary-assembly.xml
index 8457c66..fadd843 100644
--- a/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ b/asterix-yarn/src/main/assembly/binary-assembly.xml
@@ -72,6 +72,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>
@@ -83,6 +84,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>
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 ae362ca..0000000
--- a/asterix-yarn/src/main/assembly/hyracks-assembly.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- ! Copyright 2009-2013 by The Regents of the University of California
- ! Licensed 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 from
- !
- ! 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>
--
To view, visit https://asterix-gerrit.ics.uci.edu/358
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3985f7c84f4a60733b99c696535dd8a4fb4b87e1
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <[email protected]>
