Merge branch 'master' into add-checkstyle-into-maven

# Conflicts:
#	pom.xml
This commit is contained in:
zafarella
2015-09-11 15:13:45 -04:00
16 changed files with 954 additions and 8 deletions

15
pom.xml
View File

@ -73,11 +73,12 @@
<module>front-controller</module>
<module>repository</module>
<module>async-method-invocation</module>
<module>business-delegate</module>
<module>half-sync-half-async</module>
<module>business-delegate</module>
<module>half-sync-half-async</module>
<module>step-builder</module>
<module>layers</module>
<module>message-channel</module>
<module>fluentinterface</module>
</modules>
<dependencyManagement>
@ -130,8 +131,8 @@
<build>
<pluginManagement>
<plugins>
<!-- This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. TODO: Remove when the
<!-- This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. TODO: Remove when the
m2e plugin can correctly bind to Maven lifecycle -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@ -187,10 +188,10 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<!-- The following exclude configuration was added because error occurred
<!-- The following exclude configuration was added because error occurred
when executing "mvn clean test jacoco:report coveralls:report" -->
<!-- [ERROR] Failed to execute goal org.eluder.coveralls:coveralls-maven-plugin:3.1.0:report
(default-cli) on project java-design-patterns: I/O operation failed: No source
<!-- [ERROR] Failed to execute goal org.eluder.coveralls:coveralls-maven-plugin:3.1.0:report
(default-cli) on project java-design-patterns: I/O operation failed: No source
found for domainapp/dom/modules/simple/QSimpleObject.java -> [Help 1] -->
<configuration>
<excludes>