You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2017/08/24 22:43:45 UTC

systemml git commit: [SYSTEMML-1870] Add avro to bin and standalone-jar artifacts

Repository: systemml
Updated Branches:
  refs/heads/master 6363295cd -> f1d35b780


[SYSTEMML-1870] Add avro to bin and standalone-jar artifacts

Include avro jars in bin artifacts and avro classes in standalone-jar
artifact. Update LICENSE files accordingly.

Closes #639.


Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/f1d35b78
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/f1d35b78
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/f1d35b78

Branch: refs/heads/master
Commit: f1d35b780a6c6eb5cdfaa4ddd71d49d25800016f
Parents: 6363295
Author: Deron Eriksson <de...@apache.org>
Authored: Thu Aug 24 15:41:26 2017 -0700
Committer: Deron Eriksson <de...@apache.org>
Committed: Thu Aug 24 15:41:26 2017 -0700

----------------------------------------------------------------------
 src/assembly/bin.xml                | 1 +
 src/assembly/bin/LICENSE            | 4 ++++
 src/assembly/standalone-jar.xml     | 1 +
 src/assembly/standalone-jar/LICENSE | 4 ++++
 4 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/f1d35b78/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index d3df0f3..7594f52 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -98,6 +98,7 @@
 		<dependencySet>
 			<includes>
 				<include>*:${artifactId}*</include>
+				<include>*:avro*</include>
 				<include>*:commons-cli*</include>
 				<include>*:commons-collections*</include>
 				<include>*:commons-configuration*</include>

http://git-wip-us.apache.org/repos/asf/systemml/blob/f1d35b78/src/assembly/bin/LICENSE
----------------------------------------------------------------------
diff --git a/src/assembly/bin/LICENSE b/src/assembly/bin/LICENSE
index f5d1507..9d9d85a 100644
--- a/src/assembly/bin/LICENSE
+++ b/src/assembly/bin/LICENSE
@@ -204,6 +204,10 @@
 
 The following components come under the Apache Software License 2.0.
 
+avro-1.7.4.jar
+avro-ipc-1.7.7-tests.jar
+avro-ipc-1.7.7.jar
+avro-mapred-1.7.7-hadoop2.jar
 commons-cli-1.2.jar
 commons-collections-3.2.1.jar
 commons-configuration-1.6.jar

http://git-wip-us.apache.org/repos/asf/systemml/blob/f1d35b78/src/assembly/standalone-jar.xml
----------------------------------------------------------------------
diff --git a/src/assembly/standalone-jar.xml b/src/assembly/standalone-jar.xml
index 178f917..0d1bda7 100644
--- a/src/assembly/standalone-jar.xml
+++ b/src/assembly/standalone-jar.xml
@@ -75,6 +75,7 @@
 		<dependencySet>
 			<includes>
 				<include>*:${artifactId}*</include>
+				<include>*:avro*</include>
 				<include>*:commons-cli*</include>
 				<include>*:commons-collections*</include>
 				<include>*:commons-configuration*</include>

http://git-wip-us.apache.org/repos/asf/systemml/blob/f1d35b78/src/assembly/standalone-jar/LICENSE
----------------------------------------------------------------------
diff --git a/src/assembly/standalone-jar/LICENSE b/src/assembly/standalone-jar/LICENSE
index 6074895..a9bc82b 100644
--- a/src/assembly/standalone-jar/LICENSE
+++ b/src/assembly/standalone-jar/LICENSE
@@ -214,6 +214,10 @@ commons-lang:commons-lang:2.6
 commons-logging:commons-logging:1.1.3
 log4j:log4j:1.2.15
 net.sf.opencsv:opencsv:2.3
+org.apache.avro:avro:1.7.4
+org.apache.avro:avro-ipc:1.7.7
+org.apache.avro:avro-ipc:1.7.7:tests
+org.apache.avro:avro-mapred:1.7.7:hadoop2
 org.apache.commons:commons-math3:3.4.1
 org.apache.hadoop:hadoop-auth:2.6.0
 org.apache.hadoop:hadoop-client:2.6.0