Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install
+install: travis_wait 40 mvn -q clean install -Dgib.enabled=true
 
 jdk:
   - oraclejdk8

pom.xml

@@ -11,6 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
+        <gib.enabled>false</gib.enabled>
     </properties>
 
     <modules>
@@ -190,6 +192,15 @@
 
         <module>struts2</module>
 
-  </modules>
+    </modules>
 
+    <build>
+        <extensions>
+            <extension>
+                <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
+                <artifactId>gitflow-incremental-builder</artifactId>
+                <version>3.1</version>
+            </extension>
+        </extensions>
+    </build>
 </project>