You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2020/01/31 12:07:28 UTC

[mahout] branch master updated: (nojira)[release] make sure conf dir is cpoied into bin distribution

This is an automated email from the ASF dual-hosted git repository.

apalumbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mahout.git


The following commit(s) were added to refs/heads/master by this push:
     new 69242e3  (nojira)[release] make sure conf dir is cpoied into bin distribution
69242e3 is described below

commit 69242e380c6064f394352e44440023470b10b291
Author: Andrew Palumbo <ap...@apache.org>
AuthorDate: Fri Jan 31 04:07:08 2020 -0800

    (nojira)[release] make sure conf dir is cpoied into bin distribution
---
 dist/pom.xml                             | 2 +-
 dist/src/main/resources/assembly/bin.xml | 2 ++
 dist/src/main/resources/assembly/src.xml | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index d582717..f357b48 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -63,7 +63,7 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    
+
         <build>
          <defaultGoal>install</defaultGoal>
           <plugins>
diff --git a/dist/src/main/resources/assembly/bin.xml b/dist/src/main/resources/assembly/bin.xml
index 29f26f6..9651f2d 100644
--- a/dist/src/main/resources/assembly/bin.xml
+++ b/dist/src/main/resources/assembly/bin.xml
@@ -41,6 +41,8 @@
             <include>pom.xml*</include>
             <include>Dockerfile*</include>
             <include>entrypoint.sh*</include>
+            <include>conf/**</include>
+
         </includes>
     </fileSet>
     <fileSet>
diff --git a/dist/src/main/resources/assembly/src.xml b/dist/src/main/resources/assembly/src.xml
index eb42029..057e068 100644
--- a/dist/src/main/resources/assembly/src.xml
+++ b/dist/src/main/resources/assembly/src.xml
@@ -56,7 +56,7 @@ yes distributed under the License is distributed on an "AS IS" BASIS,
           <include>experimental/**</include>
           <include>experimental/**/**</include>
           <include>dist/**</include>
-          <include>examples/**</include>
+          <include>dist/**/**</include>
           <include>examples/**</include>
           <include>resource-managers/**</include>
         </includes>