Merge remote-tracking branch 'upstream/master'

pom.xml

@@ -5,23 +5,25 @@
 
 	<groupId>com.iluwatar</groupId>
 	<artifactId>java-design-patterns</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.10.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<hibernate.version>5.0.1.Final</hibernate.version>
-		<spring.version>4.1.7.RELEASE</spring.version>
-		<spring-data.version>1.9.0.RELEASE</spring-data.version>
-		<h2.version>1.4.188</h2.version>
+		<spring.version>4.2.4.RELEASE</spring.version>
+		<spring-data.version>1.9.2.RELEASE</spring-data.version>
+		<h2.version>1.4.190</h2.version>
 		<junit.version>4.12</junit.version>
 		<compiler.version>3.0</compiler.version>
 		<coveralls.version>4.0.0</coveralls.version>
 		<jacoco.version>0.7.2.201409121644</jacoco.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
-		<camel.version>2.15.3</camel.version>
+		<camel.version>2.16.1</camel.version>
 		<log4j.version>1.2.17</log4j.version>
- 		<guava.version>18.0</guava.version>
+ 		<guava.version>19.0</guava.version>
+		<systemrules.version>1.15.1</systemrules.version>
+		<mockito.version>1.10.19</mockito.version>
 	</properties>
 	<modules>
 		<module>abstract-factory</module>
@@ -79,16 +81,18 @@
 		<module>front-controller</module>
 		<module>repository</module>
 		<module>async-method-invocation</module>
-                <module>monostate</module>
+		<module>monostate</module>
 		<module>step-builder</module>
-    	       <module>business-delegate</module>
-    	       <module>half-sync-half-async</module>
+		<module>business-delegate</module>
+		<module>half-sync-half-async</module>
 		<module>layers</module>
 		<module>message-channel</module>
 		<module>fluentinterface</module>
 		<module>reactor</module>
 		<module>caching</module>
 		<module>publish-subscribe</module>
+		<module>delegation</module>
+		<module>event-driven-architecture</module>
 	</modules>
 
 	<dependencyManagement>
@@ -142,7 +146,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>1.10.19</version>
+				<version>${mockito.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -155,6 +159,12 @@
 				<artifactId>guava</artifactId>
 				<version>${guava.version}</version>
             		</dependency>
+			<dependency>
+				<groupId>com.github.stefanbirkner</groupId>
+				<artifactId>system-rules</artifactId>
+				<version>${systemrules.version}</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -245,7 +255,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.15</version>
+				<version>2.17</version>
 				<executions>
 					<execution>
 						<id>validate</id>
@@ -255,9 +265,11 @@
 						<phase>validate</phase>
 						<configuration>
 							<configLocation>checkstyle.xml</configLocation>
+							<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
 							<encoding>UTF-8</encoding>
-							<consoleOutput>false</consoleOutput>
-							<failsOnError>false</failsOnError>
+							<consoleOutput>true</consoleOutput>
+							<failsOnError>true</failsOnError>
+							<includeTestSourceDirectory>true</includeTestSourceDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -297,7 +309,37 @@
 					<argLine>-Xmx1024M ${argLine}</argLine>
 				</configuration>
 			</plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-pmd-plugin</artifactId>
+              <version>3.6</version>
+              <configuration>
+                <failOnViolation>true</failOnViolation>
+                <failurePriority>5</failurePriority>
+                <printFailingErrors>true</printFailingErrors>
+              </configuration>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>check</goal>
+                  </goals>
+                  <configuration>
+					  <excludeFromFailureFile>exclude-pmd.properties</excludeFromFailureFile>
+				  </configuration>
+                </execution>
+              </executions>              
+            </plugin>            
 		</plugins>
 	</build>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.6</version>
+      </plugin>
+    </plugins>
+  </reporting>
+  
 </project>