Merge branch 'devel-3'
Conflicts:
kafka/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/ca5ab112
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/ca5ab112
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/ca5ab112
Branch: refs/heads/devel-3
Commit: ca5ab11245d98f9d7b5b52c7b33949b290cf110d
Parents: d23e283 27c5a80
Author: Thomas Weise <[email protected]>
Authored: Wed Feb 24 22:27:06 2016 -0800
Committer: Thomas Weise <[email protected]>
Committed: Wed Feb 24 22:27:06 2016 -0800
----------------------------------------------------------------------
kafka/pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/ca5ab112/kafka/pom.xml
----------------------------------------------------------------------
diff --cc kafka/pom.xml
index 556a703,208b3ed..03dd765
--- a/kafka/pom.xml
+++ b/kafka/pom.xml
@@@ -173,15 -173,12 +173,20 @@@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <maxAllowedViolations>35</maxAllowedViolations>
+ <consoleOutput>false</consoleOutput>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx2048m</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
