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

Merge branch 'master' of https://github.com/themoffster/java-design-patterns into themoffster-master

Browse Source 
Conflicts:
	dao/pom.xml
This commit is contained in:
Ilkka Seppala
2015-10-19 20:44:46 +03:00
parent 9cbc4a20b9 d0af12b1ee
commit 339db2a0bf
11 changed files with 358 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -19,6 +19,7 @@
<jacoco.version>0.7.2.201409121644</jacoco.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<camel.version>2.15.3</camel.version>
<log4j.version>1.2.17</log4j.version>
</properties>
<modules>
<module>abstract-factory</module>
@ -126,6 +127,11 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
</dependencyManagement>