Merge branch 'master' into issue-989

pom.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The MIT License Copyright © 2014-2019 Ilkka Seppälä Permission is hereby 
-	granted, free of charge, to any person obtaining a copy of this software 
-	and associated documentation files (the "Software"), to deal in the Software 
-	without restriction, including without limitation the rights to use, copy, 
-	modify, merge, publish, distribute, sublicense, and/or sell copies of the 
-	Software, and to permit persons to whom the Software is furnished to do so, 
-	subject to the following conditions: The above copyright notice and this 
-	permission notice shall be included in all copies or substantial portions 
-	of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY 
-	KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN 
-	NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-	DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
-	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+<!-- The MIT License Copyright © 2014-2019 Ilkka Seppälä Permission is hereby
+	granted, free of charge, to any person obtaining a copy of this software
+	and associated documentation files (the "Software"), to deal in the Software
+	without restriction, including without limitation the rights to use, copy,
+	modify, merge, publish, distribute, sublicense, and/or sell copies of the
+	Software, and to permit persons to whom the Software is furnished to do so,
+	subject to the following conditions: The above copyright notice and this
+	permission notice shall be included in all copies or substantial portions
+	of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+	KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+	NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+	DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 	DEALINGS IN THE SOFTWARE. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -177,17 +177,18 @@
 		<module>circuit-breaker</module>
 		<module>role-object</module>
 		<module>saga</module>
-		<module>double-buffer</module>
-		<module>sharding</module>
-		<module>game-loop</module>
-	</modules>
+    <module>double-buffer</module>
+    <module>sharding</module>
+    <module>game-loop</module>
+		<module>combinator</module>
+  </modules>
 
-	<repositories>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
-	</repositories>
+  <repositories>
+      <repository>
+          <id>jitpack.io</id>
+          <url>https://jitpack.io</url>
+      </repository>
+  </repositories>
 
 	<dependencyManagement>
 		<dependencies>
@@ -387,7 +388,7 @@
 								<descriptorRefs>
 									<descriptorRef>jar-with-dependencies</descriptorRef>
 								</descriptorRefs>
-								<!-- below two line make sure the fat jar is sharing the same name 
+								<!-- below two line make sure the fat jar is sharing the same name
 									as of project name -->
 								<finalName>${project.artifactId}</finalName>
 								<appendAssemblyId>false</appendAssemblyId>
@@ -422,8 +423,8 @@
 				</executions>
 			</plugin>
 
-			<!-- Resolves ${projectRoot} to the project root directory. Used by the 
-				license-maven-plugin to find the correct location of license-plugin-header-style.xml 
+			<!-- Resolves ${projectRoot} to the project root directory. Used by the
+				license-maven-plugin to find the correct location of license-plugin-header-style.xml
 				when built from a submodule directory. -->
 			<plugin>
 				<groupId>org.commonjava.maven.plugins</groupId>