You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by re...@apache.org on 2017/11/03 07:11:32 UTC
systemml git commit: [Minor]: - added main manifest to
systemml-lite.jar - added several additional class files - regenerated
lite.xml [Forced Update!]
Repository: systemml
Updated Branches:
refs/heads/master 0d4672207 -> 3ba5a1552 (forced update)
[Minor]:
- added main manifest to systemml-lite.jar
- added several additional class files
- regenerated lite.xml
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/3ba5a155
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/3ba5a155
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/3ba5a155
Branch: refs/heads/master
Commit: 3ba5a15528ece6abe1ddde0f3a04a0dd839257bc
Parents: ea2a6e4
Author: Berthold Reinwald <re...@us.ibm.com>
Authored: Thu Nov 2 23:49:40 2017 -0700
Committer: Berthold Reinwald <re...@us.ibm.com>
Committed: Thu Nov 2 23:49:40 2017 -0700
----------------------------------------------------------------------
pom.xml | 11 ++++++
src/assembly/lite.xml | 22 +++++++++++-
.../org/apache/sysml/utils/lite/BuildLite.java | 36 +++++++++++++++-----
3 files changed, 59 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/3ba5a155/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ff90986..615e93c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1162,6 +1162,17 @@
<descriptors>
<descriptor>src/assembly/lite.xml</descriptor>
</descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.sysml.api.DMLScript</mainClass>
+ </manifest>
+ <manifestEntries>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ <Group-Id>${project.groupId}</Group-Id>
+ <Artifact-Id>${project.artifactId}-lite</Artifact-Id>
+ <Version>${project.version}</Version>
+ </manifestEntries>
+ </archive>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/systemml/blob/3ba5a155/src/assembly/lite.xml
----------------------------------------------------------------------
diff --git a/src/assembly/lite.xml b/src/assembly/lite.xml
index 908c72e..0212ace 100644
--- a/src/assembly/lite.xml
+++ b/src/assembly/lite.xml
@@ -53,7 +53,7 @@
<dependencySets>
<dependencySet>
<includes>
- <include>*:antlr4-runtime</include>
+ <include>*:antlr4</include>
</includes>
<unpackOptions>
<includes>
@@ -210,6 +210,8 @@
</includes>
<unpackOptions>
<includes>
+ <include>org/apache/commons/cli/OptionValidator.class</include>
+ <include>org/apache/commons/cli/Util.class</include>
<include>org/apache/commons/cli/AlreadySelectedException.class</include>
<include>org/apache/commons/cli/CommandLine.class</include>
<include>org/apache/commons/cli/CommandLineParser.class</include>
@@ -620,7 +622,12 @@
<unpackOptions>
<includes>
<include>META-INF/services/org.apache.hadoop.fs.FileSystem</include>
+ <include>common-version-info.properties</include>
<include>org/apache/hadoop/log/metrics/EventCounter.class</include>
+ <include>org/apache/hadoop/security/Groups$CachedGroups.class</include>
+ <include>org/apache/hadoop/security/token/Token.class</include>
+ <include>org/apache/hadoop/security/token/TokenIdentifier.class</include>
+ <include>org/apache/hadoop/util/GenericOptionsParser.class</include>
<include>org/apache/hadoop/util/ShutdownHookManager$2.class</include>
<include>org/apache/hadoop/HadoopIllegalArgumentException.class</include>
<include>org/apache/hadoop/conf/Configurable.class</include>
@@ -1027,6 +1034,19 @@
<dependencySet>
<includes>
+ <include>*:hadoop-mapreduce-client-jobclient</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>org/apache/hadoop/mapred/YarnClientProtocolProvider.class</include>
+ </includes>
+ </unpackOptions>
+ <scope>compile</scope>
+ <unpack>true</unpack>
+ </dependencySet>
+
+ <dependencySet>
+ <includes>
<include>*:jcl-over-slf4j</include>
</includes>
<unpackOptions>
http://git-wip-us.apache.org/repos/asf/systemml/blob/3ba5a155/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/utils/lite/BuildLite.java b/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
index 9048ce6..0f7b490 100644
--- a/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
+++ b/src/main/java/org/apache/sysml/utils/lite/BuildLite.java
@@ -88,24 +88,42 @@ public class BuildLite {
static {
// avoid "No FileSystem for scheme: file" error in JMLC
additionalResources.add("META-INF/services/org.apache.hadoop.fs.FileSystem");
- // shutdown hook class
+ // shutdown hook class
additionalResources.add("org/apache/hadoop/util/ShutdownHookManager$2.class");
additionalResources.add("org/apache/hadoop/log/metrics/EventCounter.class");
+ additionalResources.add("org/apache/hadoop/util/GenericOptionsParser.class");
+ additionalResources.add("org/apache/hadoop/security/token/Token.class");
+ additionalResources.add("org/apache/hadoop/security/token/TokenIdentifier.class");
+ additionalResources.add("org/apache/hadoop/security/Groups$CachedGroups.class");
+ additionalResources.add("org/apache/commons/cli/OptionValidator.class");
+ additionalResources.add("org/apache/commons/cli/Util.class");
+ additionalResources.add("common-version-info.properties");
}
/**
* Map jars to the additional resources files in order to build the
* dependency sets required by lite.xml.
*/
- public static SortedMap<String, SortedSet<String>> additionalJarToFileMappingsForDependencySets = new TreeMap<>();
- static {
- SortedSet<String> hadoopCommonResources = new TreeSet<>();
- hadoopCommonResources.add("META-INF/services/org.apache.hadoop.fs.FileSystem");
- hadoopCommonResources.add("org/apache/hadoop/util/ShutdownHookManager$2.class");
- hadoopCommonResources.add("org/apache/hadoop/log/metrics/EventCounter.class");
- additionalJarToFileMappingsForDependencySets.put("hadoop-common", hadoopCommonResources);
- }
+
+ public static SortedMap<String, SortedSet<String>> additionalJarToFileMappingsForDependencySets = new TreeMap<String, SortedSet<String>>();
+ static {
+ SortedSet<String> hadoopCommonResources = new TreeSet<String>();
+ hadoopCommonResources.add("META-INF/services/org.apache.hadoop.fs.FileSystem");
+ hadoopCommonResources.add("org/apache/hadoop/util/ShutdownHookManager$2.class");
+ hadoopCommonResources.add("org/apache/hadoop/log/metrics/EventCounter.class");
+ hadoopCommonResources.add("org/apache/hadoop/util/GenericOptionsParser.class");
+ hadoopCommonResources.add("org/apache/hadoop/security/token/Token.class");
+ hadoopCommonResources.add("org/apache/hadoop/security/token/TokenIdentifier.class");
+ hadoopCommonResources.add("org/apache/hadoop/security/Groups$CachedGroups.class");
+ hadoopCommonResources.add("common-version-info.properties");
+ additionalJarToFileMappingsForDependencySets.put("hadoop-common", hadoopCommonResources);
+
+ SortedSet<String> commonsCliResources = new TreeSet<String>();
+ commonsCliResources.add("org/apache/commons/cli/OptionValidator.class");
+ commonsCliResources.add("org/apache/commons/cli/Util.class");
+ additionalJarToFileMappingsForDependencySets.put("commons-cli", commonsCliResources);
+ }
/**
* Scan project *.java files for these packages/classes that should