gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
amit2103
2015-10-07 20:10:36 +05:30
parent 2c45f73254 0a9879a277
commit 1e988c10f9
178 changed files with 3330 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pom.xml
View File

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hibernate.version>5.0.0.Final</hibernate.version>
<spring-data.version>1.8.2.RELEASE</spring-data.version>
<hibernate.version>5.0.1.Final</hibernate.version>
<spring-data.version>1.9.0.RELEASE</spring-data.version>
<h2.version>1.4.188</h2.version>
<junit.version>4.12</junit.version>
<compiler.version>3.0</compiler.version>
<coveralls.version>3.1.0</coveralls.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>
@ -73,12 +74,12 @@
<module>repository</module>
<module>async-method-invocation</module>
<module>monostate</module>
<module>business-delegate</module>
<module>half-sync-half-async</module>
<module>step-builder</module>
<module>layers</module>
<module>message-channel</module>
</modules>
<module>fluentinterface</module>
<module>reactor</module>
</modules>
<dependencyManagement>
<dependencies>
@ -206,6 +207,30 @@
</execution>
</executions>
</plugin>
<!--checkstyle plug-in. checking against googles styles
see config at checkstyle.xml
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.15</version>
<executions>
<execution>
<id>validate</id>
<goals>
<goal>check</goal>
</goals>
<phase>validate</phase>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>false</consoleOutput>
<failsOnError>false</failsOnError>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>