Repository: incubator-systemml Updated Branches: refs/heads/master eb35b2c90 -> aa2211ac0
[SYSTEMML-1559] Update pom to allow SystemML to be used as library Allow SystemML to be used as a library without requiring the manual specification of additional SystemML dependencies. Explicitly include wink-json4j and antlr4-runtime for shade plugin. Set required artifacts to compile scope. Remove opencsv dependency. Remove unneeded excludes from bin.xml. Switch includes to compile scope in bin.xml, inmemory.xml, and standalone-jar.xml. Closes #470. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/aa2211ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/aa2211ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/aa2211ac Branch: refs/heads/master Commit: aa2211ac02a46627af9145c97be125a72aeb8781 Parents: eb35b2c Author: Deron Eriksson <de...@us.ibm.com> Authored: Wed Apr 26 11:38:46 2017 -0700 Committer: Deron Eriksson <de...@us.ibm.com> Committed: Wed Apr 26 11:38:47 2017 -0700 ---------------------------------------------------------------------- pom.xml | 41 +++++++++--------------------------- src/assembly/bin.xml | 12 +---------- src/assembly/inmemory.xml | 2 +- src/assembly/standalone-jar.xml | 2 +- 4 files changed, 13 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/aa2211ac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 327b6f4..f4f6016 100644 --- a/pom.xml +++ b/pom.xml @@ -164,11 +164,12 @@ <goal>shade</goal> </goals> <configuration> - <artifactSet> - <!--<excludes> - <exclude>org.jcuda:*</exclude> - </excludes>--> - </artifactSet> + <artifactSet> + <includes> + <include>org.apache.wink:wink-json4j:*</include> + <include>org.antlr:antlr4-runtime:*</include> + </includes> + </artifactSet> </configuration> </execution> </executions> @@ -1117,11 +1118,10 @@ <dependencies> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>3.2.0</version> - <scope>provided</scope> - </dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.2.0</version> + </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcuda</artifactId> @@ -1232,13 +1232,11 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-mllib_${scala.binary.version}</artifactId> <version>${spark.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -1250,7 +1248,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -1262,13 +1259,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-app</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -1286,20 +1281,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.3</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math3</artifactId> <version>3.4.1</version> - <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.15</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>com.sun.jmx</groupId> @@ -1317,13 +1309,6 @@ </dependency> <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>2.3</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-json4j</artifactId> <version>1.4</version> @@ -1340,7 +1325,6 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> - <scope>provided</scope> </dependency> <!-- fast java compiler for codegen, consistent version w/ spark --> @@ -1374,34 +1358,29 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-common</artifactId> <version>${hadoop.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <version>${scala.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.scala-lang</groupId> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/aa2211ac/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml index 978bef1..f7a3927 100644 --- a/src/assembly/bin.xml +++ b/src/assembly/bin.xml @@ -103,15 +103,6 @@ <!-- Include all the libraries needed to run in standalone mode. --> <dependencySets> <dependencySet> - <excludes> - <exclude>*:${artifactId}*</exclude> <!-- exclude from base dir --> - <!-- Exclude compile-scoped dependencies since they are in main artifact jar --> - <exclude>*:antlr4-runtime*</exclude> - <exclude>*:wink-json4j*</exclude> - </excludes> - </dependencySet> - - <dependencySet> <includes> <include>*:${artifactId}*</include> <include>*:commons-cli*</include> @@ -131,13 +122,12 @@ <include>*:jackson-core-asl*</include> <include>*:jackson-mapper-asl*</include> <include>*:log4j*</include> - <include>*:opencsv*</include> <include>*:protobuf-java*</include> <include>*:slf4j-api*</include> <include>*:slf4j-log4j*</include> </includes> <outputDirectory>./lib</outputDirectory> - <scope>provided</scope> + <scope>compile</scope> </dependencySet> </dependencySets> </assembly> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/aa2211ac/src/assembly/inmemory.xml ---------------------------------------------------------------------- diff --git a/src/assembly/inmemory.xml b/src/assembly/inmemory.xml index c8ef0f0..d9a415b 100644 --- a/src/assembly/inmemory.xml +++ b/src/assembly/inmemory.xml @@ -96,7 +96,7 @@ </excludes> </unpackOptions> <outputDirectory>.</outputDirectory> - <scope>provided</scope> + <scope>compile</scope> <unpack>true</unpack> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/aa2211ac/src/assembly/standalone-jar.xml ---------------------------------------------------------------------- diff --git a/src/assembly/standalone-jar.xml b/src/assembly/standalone-jar.xml index d4bca14..4c20871 100644 --- a/src/assembly/standalone-jar.xml +++ b/src/assembly/standalone-jar.xml @@ -116,7 +116,7 @@ <exclude>META-INF/NOTICE</exclude> </excludes> </unpackOptions> - <scope>provided</scope> + <scope>compile</scope> <unpack>true</unpack> </dependencySet> </dependencySets>
