mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ssla...@apache.org
Subject [34/37] mahout git commit: MAHOUT-1704: Pare down dependency jar for h2o. closes apache/mahout#128
Date Tue, 26 May 2015 20:40:29 GMT
MAHOUT-1704:  Pare down dependency jar for h2o.  closes apache/mahout#128


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

Branch: refs/heads/mahout-0.10.x
Commit: 244295a743554ecd2a7b5154788336735e47d694
Parents: 9abb526
Author: Andrew Palumbo <apalumbo@apache.org>
Authored: Thu May 7 15:09:45 2015 -0400
Committer: Andrew Palumbo <apalumbo@apache.org>
Committed: Thu May 7 15:09:45 2015 -0400

----------------------------------------------------------------------
 CHANGELOG                                       |  2 +
 bin/mahout                                      |  3 +-
 h2o/pom.xml                                     | 26 +++++++-----
 h2o/src/main/assembly/dependency-reduced.xml    | 44 ++++++++++++++++++++
 .../h2obindings/test/DistributedH2OSuite.scala  |  1 -
 5 files changed, 63 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/244295a7/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 1657afc..66cbf80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ Mahout Change Log
 
 Release 0.10.1 - unreleased
 
+  MAHOUT-1704: Pare down dependency jar for h2o (apalumbo)
+
   MAHOUT-1697: Fixed paths to which math-scala and spark modules docs get packaged under
in bin distribution archive (sslavic)
 
   MAHOUT-1696: QRDecomposition.solve(...) can return incorrect Matrix types (apalumbo)

http://git-wip-us.apache.org/repos/asf/mahout/blob/244295a7/bin/mahout
----------------------------------------------------------------------
diff --git a/bin/mahout b/bin/mahout
index 772c184..ee0b918 100755
--- a/bin/mahout
+++ b/bin/mahout
@@ -186,9 +186,10 @@ then
        CLASSPATH=${CLASSPATH}:$f;
     done
 
-    for f in $MAHOUT_HOME/h2o/target/mahout-h2o-*.jar; do
+    for f in $MAHOUT_HOME/h2o/target/mahout-h2o*.jar; do
        CLASSPATH=${CLASSPATH}:$f;
     done
+
   fi
 
   # add jars for running from the command line if we requested shell or spark CLI driver

http://git-wip-us.apache.org/repos/asf/mahout/blob/244295a7/h2o/pom.xml
----------------------------------------------------------------------
diff --git a/h2o/pom.xml b/h2o/pom.xml
index b9d101a..a422072 100644
--- a/h2o/pom.xml
+++ b/h2o/pom.xml
@@ -35,27 +35,26 @@
 
   <packaging>jar</packaging>
 
+
+
   <build>
-    <plugins>
 
+    <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <archive>
-            <manifest>
-              <mainClass>water.H2O</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
         <executions>
           <execution>
+            <id>dependency-reduced</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/dependency-reduced.xml</descriptor>
+              </descriptors>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -124,6 +123,11 @@
   </build>
 
   <dependencies>
+  <dependency>
+    <groupId>org.scala-lang</groupId>
+    <artifactId>scala-library</artifactId>
+    <version>${scala.version}</version>
+  </dependency>
 
     <dependency>
       <groupId>org.apache.mahout</groupId>

http://git-wip-us.apache.org/repos/asf/mahout/blob/244295a7/h2o/src/main/assembly/dependency-reduced.xml
----------------------------------------------------------------------
diff --git a/h2o/src/main/assembly/dependency-reduced.xml b/h2o/src/main/assembly/dependency-reduced.xml
new file mode 100644
index 0000000..0636f1d
--- /dev/null
+++ b/h2o/src/main/assembly/dependency-reduced.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
+  http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>dependency-reduced</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <unpackOptions>
+      <!-- MAHOUT-1126 -->
+      <excludes>
+         <exclude>META-INF/LICENSE</exclude>
+      </excludes>
+      </unpackOptions>
+      <scope>runtime</scope>
+      <outputDirectory>/</outputDirectory>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <includes>
+        <include>ai.h2o:h2o-core</include>
+        <include>org.scala-lang:scala-library</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mahout/blob/244295a7/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
----------------------------------------------------------------------
diff --git a/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
b/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
index abb4289..26182b4 100644
--- a/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
+++ b/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
@@ -29,7 +29,6 @@ trait DistributedH2OSuite extends DistributedMahoutSuite with LoggerConfiguratio
 
   override protected def beforeEach() {
     super.beforeEach()
-
     mahoutCtx = mahoutH2OContext("mah2out" + System.currentTimeMillis())
   }
 


Mime
View raw message