Merge remote-tracking branch 'upstream/master' into data-bus
* upstream/master: (67 commits) Set version for next development iteration Reached milestone 1.15.0 #539 Checkstyle fix #539 More Checkstyle fixes #539 Checkstyle fixes #497 Add missing puml and license headers #77 Add missing license header Work on #190: urm/puml updates * added pumlid where it was missing and possible * removed pumlid where it generated a bad image * regenerated some incorrect puml's * added 'left to right direction' puml prefix to some diagrams to improve the automatic layouting Removed AvoidStarImport Rule Added JavaDocType Rule Update App.java Update App.java Update after changes from review. Additional improvements. Pom.xml files fixed. #66 Balking Pattern fixed pmd violation fixed checkstyle violations diagrams added comments, tests and description changed parent POM version #69 apply changes from review #69 ... # Conflicts: # pom.xml
This commit is contained in:
8
pom.xml
8
pom.xml
@ -21,7 +21,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.iluwatar</groupId>
|
||||
<artifactId>java-design-patterns</artifactId>
|
||||
<version>1.15.0-SNAPSHOT</version>
|
||||
<version>1.16.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<inceptionYear>2014</inceptionYear>
|
||||
<properties>
|
||||
@ -50,6 +50,7 @@
|
||||
</properties>
|
||||
<modules>
|
||||
<module>abstract-factory</module>
|
||||
<module>tls</module>
|
||||
<module>builder</module>
|
||||
<module>factory-method</module>
|
||||
<module>prototype</module>
|
||||
@ -121,7 +122,7 @@
|
||||
<module>factory-kit</module>
|
||||
<module>feature-toggle</module>
|
||||
<module>value-object</module>
|
||||
<module>module</module>
|
||||
<module>module</module>
|
||||
<module>monad</module>
|
||||
<module>mute-idiom</module>
|
||||
<module>mutex</module>
|
||||
@ -135,6 +136,9 @@
|
||||
<module>queue-load-leveling</module>
|
||||
<module>object-mother</module>
|
||||
<module>data-bus</module>
|
||||
<module>converter</module>
|
||||
<module>guarded-suspension</module>
|
||||
<module>balking</module>
|
||||
</modules>
|
||||
|
||||
<dependencyManagement>
|
||||
|
Reference in New Issue
Block a user