You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ti...@apache.org on 2015/10/01 00:17:03 UTC
[1/2] incubator-apex-core git commit: APEX-174 #resolve #comment
modified the import order as per recommendation
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 cf97d0b71 -> 9193ec81a
APEX-174 #resolve #comment modified the import order as per recommendation
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/dec20032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/dec20032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/dec20032
Branch: refs/heads/devel-3
Commit: dec20032b42d424b14b683ef7816f8c0f49bfa8f
Parents: cf97d0b
Author: Chandni Singh <cs...@apache.org>
Authored: Tue Sep 29 14:00:13 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Wed Sep 30 13:01:12 2015 -0700
----------------------------------------------------------------------
apex_checks.xml | 5 ++---
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
engine/src/main/java/org/apache/log4j/DTLoggerFactory.java | 4 ++--
5 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/dec20032/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index 24ce9df..7ba9ea4 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -136,10 +136,9 @@
</module>
<module name="ImportOrder">
- <property name="groups" value="/^javax?\./,org,com,*,/com\.datatorrent/"/>
+ <property name="groups" value="/^javax?\./,org,/org\.apache/,com,/com\.datatorrent/,*"/>
<property name="ordered" value="true"/>
- <property name="separated" value="true"/>
- <property name="option" value="above"/>
+ <property name="option" value="bottom"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/dec20032/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index bbd27f2..773add8 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>123</maxAllowedViolations>
+ <maxAllowedViolations>121</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/dec20032/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 20a9d1b..12a1d30 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -74,7 +74,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>77</maxAllowedViolations>
+ <maxAllowedViolations>76</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/dec20032/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 15e0565..ae334f2 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -145,7 +145,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>2238</maxAllowedViolations>
+ <maxAllowedViolations>2209</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/dec20032/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java b/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java
index 04a4238..04e6856 100644
--- a/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java
+++ b/engine/src/main/java/org/apache/log4j/DTLoggerFactory.java
@@ -87,9 +87,9 @@ public class DTLoggerFactory implements LoggerFactory
String loggersLevel = System.getProperty(DT_LOGGERS_LEVEL);
if (!Strings.isNullOrEmpty(loggersLevel)) {
Map<String, String> targetChanges = Maps.newHashMap();
- String targets[] = loggersLevel.split(",");
+ String[] targets = loggersLevel.split(",");
for (String target : targets) {
- String parts[] = target.split(":");
+ String[] parts = target.split(":");
targetChanges.put(parts[0], parts[1]);
}
changeLoggersLevel(targetChanges);
[2/2] incubator-apex-core git commit: Merge branch 'APEX-174' into
devel-3
Posted by ti...@apache.org.
Merge branch 'APEX-174' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/9193ec81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9193ec81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9193ec81
Branch: refs/heads/devel-3
Commit: 9193ec81ac2e41c06bc71e73643eca2bcc458bc8
Parents: cf97d0b dec2003
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Wed Sep 30 15:12:56 2015 -0700
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Wed Sep 30 15:12:56 2015 -0700
----------------------------------------------------------------------
apex_checks.xml | 5 ++---
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
engine/src/main/java/org/apache/log4j/DTLoggerFactory.java | 4 ++--
5 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------