You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemall.apache.org by my...@apache.org on 2018/04/27 03:07:33 UTC
[1/2] incubator-hivemall git commit: Fixed formatting scheme for
multi-module project
Repository: incubator-hivemall
Updated Branches:
refs/heads/master 9257a3509 -> 851daafeb
Fixed formatting scheme for multi-module project
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/73f77e5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/73f77e5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/73f77e5f
Branch: refs/heads/master
Commit: 73f77e5f64a8c6961c8106421f31800fb1fb3a13
Parents: 9257a35
Author: Makoto Yui <my...@apache.org>
Authored: Fri Apr 27 01:14:15 2018 +0900
Committer: Makoto Yui <my...@apache.org>
Committed: Fri Apr 27 12:05:56 2018 +0900
----------------------------------------------------------------------
bin/format_code.sh | 21 ++++++++++++++++-
pom.xml | 51 ++++++++++++++++++++--------------------
resources/eclipse-style.xml | 11 +++++----
3 files changed, 52 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/73f77e5f/bin/format_code.sh
----------------------------------------------------------------------
diff --git a/bin/format_code.sh b/bin/format_code.sh
index b6c9baf..358e276 100755
--- a/bin/format_code.sh
+++ b/bin/format_code.sh
@@ -32,4 +32,23 @@ fi
cd $HIVEMALL_HOME
HIVEMALL_HOME=`pwd`
-mvn formatter:format
+mvn clean
+
+# workaround for muti-module projects
+# https://github.com/revelc/formatter-maven-plugin/issues/261
+# mvn formatter:format
+
+projects=(
+ core
+ nlp
+ xgboost
+ mixserv
+ spark/common
+ tools/hivemall-docs
+)
+
+for pl in ${projects[@]}; do
+ echo "Start formatting ${pl} .."
+ mvn -pl ${pl} formatter:format
+ echo
+done
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/73f77e5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35e3767..75c4b62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hivemall</groupId>
@@ -50,8 +51,8 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-hivemall.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-hivemall.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-hivemall.git</developerConnection>
- <tag>v0.5.0-rc1</tag>
- </scm>
+ <tag>v0.5.0-rc1</tag>
+ </scm>
<mailingLists>
<mailingList>
@@ -464,9 +465,9 @@
</plugin>
<plugin>
<!-- mvn formatter:format -->
- <groupId>net.revelc.code</groupId>
+ <groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>0.5.2</version>
+ <version>2.0.1</version> <!-- for Java7 compatibility -->
<configuration>
<configFile>${main.basedir}/resources/eclipse-style.xml</configFile>
<encoding>UTF-8</encoding>
@@ -572,24 +573,24 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.basedir}/target/classes/META-INF</outputDirectory>
- <resources>
- <resource>
- <directory>${main.basedir}/</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DISCLAIMER</include>
- </includes>
- </resource>
- </resources>
- </configuration>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/classes/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${main.basedir}/</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -644,9 +645,9 @@
</execution>
</executions>
</plugin>
+ <!-- mvn formatter:format -->
<plugin>
- <!-- mvn formatter:format -->
- <groupId>net.revelc.code</groupId>
+ <groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/73f77e5f/resources/eclipse-style.xml
----------------------------------------------------------------------
diff --git a/resources/eclipse-style.xml b/resources/eclipse-style.xml
index a3dc7b7..b6590a0 100644
--- a/resources/eclipse-style.xml
+++ b/resources/eclipse-style.xml
@@ -30,7 +30,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="18"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
@@ -73,7 +73,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
@@ -139,6 +139,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
@@ -177,7 +178,7 @@
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="82"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="9"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
@@ -199,7 +200,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="9"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
@@ -269,7 +270,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="9"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
[2/2] incubator-hivemall git commit: Removed warnings about duplicate
entry
Posted by my...@apache.org.
Removed warnings about duplicate entry
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/851daafe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/851daafe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/851daafe
Branch: refs/heads/master
Commit: 851daafeb42ede7e943db91e41131d12d4bcea00
Parents: 73f77e5
Author: Makoto Yui <my...@apache.org>
Authored: Fri Apr 27 11:52:06 2018 +0900
Committer: Makoto Yui <my...@apache.org>
Committed: Fri Apr 27 12:06:31 2018 +0900
----------------------------------------------------------------------
spark/spark-2.2/pom.xml | 4 ----
spark/spark-2.3/pom.xml | 4 ----
2 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/851daafe/spark/spark-2.2/pom.xml
----------------------------------------------------------------------
diff --git a/spark/spark-2.2/pom.xml b/spark/spark-2.2/pom.xml
index 47aea92..100de59 100644
--- a/spark/spark-2.2/pom.xml
+++ b/spark/spark-2.2/pom.xml
@@ -136,10 +136,6 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<environmentVariables>
<JAVA_HOME>${env.JAVA8_HOME}</JAVA_HOME>
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/851daafe/spark/spark-2.3/pom.xml
----------------------------------------------------------------------
diff --git a/spark/spark-2.3/pom.xml b/spark/spark-2.3/pom.xml
index cfa6457..0ab424f 100644
--- a/spark/spark-2.3/pom.xml
+++ b/spark/spark-2.3/pom.xml
@@ -171,10 +171,6 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<environmentVariables>
<JAVA_HOME>${env.JAVA8_HOME}</JAVA_HOME>