Merge branch 'master' into jira/HIVEMALL-12

# Conflicts:
#       src/site/markdown/contributing.md


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

Branch: refs/heads/master
Commit: 02686099341742210a01591743c916fc7bfc64c3
Parents: d433a0a 9a6d1c0
Author: myui <[email protected]>
Authored: Sat Nov 12 15:03:02 2016 +0900
Committer: myui <[email protected]>
Committed: Sat Nov 12 15:03:02 2016 +0900

----------------------------------------------------------------------
 bin/build_xgboost.sh              |  2 +-
 src/site/markdown/contributing.md | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/02686099/bin/build_xgboost.sh
----------------------------------------------------------------------
diff --cc bin/build_xgboost.sh
index 7dcd4f7,43ea515..9ba201f
--- a/bin/build_xgboost.sh
+++ b/bin/build_xgboost.sh
@@@ -1,24 -1,23 +1,24 @@@
  #!/bin/bash
 -
 -# Hivemall: Hive scalable Machine Learning Library
  #
 -# Copyright (C) 2015 Makoto YUI
 -# Copyright (C) 2013-2015 National Institute of Advanced Industrial Science 
and Technology (AIST)
 +# 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
  #
 -# Licensed 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
  #
 -#         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.
  #
 -# 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.
  
- set -eu
+ set -e
  set -o pipefail
  
  # Target commit hash value

http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/02686099/src/site/markdown/contributing.md
----------------------------------------------------------------------
diff --cc src/site/markdown/contributing.md
index 999380a,17f7020..803d5f5
--- a/src/site/markdown/contributing.md
+++ b/src/site/markdown/contributing.md
@@@ -1,22 -1,21 +1,40 @@@
 +<!--
 +  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.
 +-->
 +
+ # How to build
+ 
+ #### Prerequisites
+ 
+ * Maven 3.x
+ * JDK 1.7 or later
+ 
+ ```
+ $ cd hivemall
+ 
+ # This is a workaround for resolving xgboost dependencies.
+ $ mvn validate -Pxgboost
+  
+ $ mvn clean package
+ ```
+ 
+ # Contribution guideline
+ 
  to appear ...
  
  [Here](http://www.apache.org/foundation/getinvolved.html) is a general guide 
for contributing to Apache Project.

Reply via email to