From 949e0005d83433365da0815b54c291a68d7d9370 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 20:43:33 +0100
Subject: [PATCH 1/7] Enable incremental build

---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a24e3d4667..7282d6a0d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
     </properties>
 
     <modules>
@@ -190,6 +191,17 @@
 
         <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>

From b6155df1301078e13cbd1d8c4fa46600cf2f8db3 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 20:58:30 +0100
Subject: [PATCH 2/7] Disable incremental build by default

---
 .travis.yml | 2 +-
 pom.xml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 256180a240..c2a369a1b3 100644
--- a/.travis.yml
+++ b/.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
diff --git a/pom.xml b/pom.xml
index 7282d6a0d3..737a470649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
+        <gib.enabled>false</gib.enabled>
     </properties>
 
     <modules>

From 57d5278707d32022bcb951968d56e810f4e9ea52 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 21:09:20 +0100
Subject: [PATCH 3/7] Disable incremental build by default

---
 .travis.yml |  2 +-
 pom.xml     | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2a369a1b3..ed61f462f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install -Dgib.enabled=true
+install: travis_wait 40 mvn -q clean install --activate-profiles incremental
 
 jdk:
   - oraclejdk8
diff --git a/pom.xml b/pom.xml
index 737a470649..fb88c48f5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,14 +195,17 @@
     </modules>
 
     <build>
-        <extensions>
-            <extension>
-                <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
-                <artifactId>gitflow-incremental-builder</artifactId>
-                <version>3.1</version>
-            </extension>
-        </extensions>
+
     </build>
 
+    <profiles>
+        <profile>
+            <id>incremental</id>
+            <properties>
+                <gib.enabled>true</gib.enabled>
+            </properties>
+        </profile>
+    </profiles>
+
 
 </project>

From ae3ee2150f02ba5172e58b086384b75b4479cbf5 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 21:17:29 +0100
Subject: [PATCH 4/7] Disable incremental build by default

---
 .travis.yml |  2 +-
 pom.xml     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ed61f462f9..c3557f0328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install --activate-profiles incremental
+install: travis_wait 40 mvn -q clean install --activate-profiles incremental-enabled
 
 jdk:
   - oraclejdk8
diff --git a/pom.xml b/pom.xml
index fb88c48f5b..2a9eb67d18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
-        <gib.enabled>false</gib.enabled>
     </properties>
 
     <modules>
@@ -200,11 +199,20 @@
 
     <profiles>
         <profile>
-            <id>incremental</id>
+            <id>incremental-enabled</id>
             <properties>
                 <gib.enabled>true</gib.enabled>
             </properties>
         </profile>
+        <profile>
+            <id>incremental-disabled</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <gib.enabled>false</gib.enabled>
+            </properties>
+        </profile>
     </profiles>
 
 

From d6911adc5da82d1cb3cef588ebb63afa0684f694 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 21:25:34 +0100
Subject: [PATCH 5/7] Disable incremental build by default

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c3557f0328..ea49692e03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install --activate-profiles incremental-enabled
+install: travis_wait 40 mvn -q clean install -P incremental-enabled
 
 jdk:
   - oraclejdk8

From 234cdb16b2fd9e7e20261230b14eb9b4b4d50fd0 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 21:40:31 +0100
Subject: [PATCH 6/7] Enable incremental

---
 .travis.yml | 2 +-
 pom.xml     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea49692e03..73a4607a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install -P incremental-enabled
+install: travis_wait 40 mvn -q clean install -Pincremental-enabled
 
 jdk:
   - oraclejdk8
diff --git a/pom.xml b/pom.xml
index 2a9eb67d18..dd077dbd4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,9 +194,16 @@
     </modules>
 
     <build>
-
+        <extensions>
+            <extension>
+                <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
+                <artifactId>gitflow-incremental-builder</artifactId>
+                <version>3.1</version>
+            </extension>
+        </extensions>
     </build>
 
+
     <profiles>
         <profile>
             <id>incremental-enabled</id>

From 30ed03aea1c84d2fec157c7281d0aec761569dcb Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Thu, 9 Feb 2017 21:45:17 +0100
Subject: [PATCH 7/7] Enable incremental

---
 .travis.yml |  2 +-
 pom.xml     | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73a4607a97..c2a369a1b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 40 mvn -q clean install -Pincremental-enabled
+install: travis_wait 40 mvn -q clean install -Dgib.enabled=true
 
 jdk:
   - oraclejdk8
diff --git a/pom.xml b/pom.xml
index dd077dbd4a..764b8c6416 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gib.referenceBranch>refs/heads/master</gib.referenceBranch>
+        <gib.enabled>false</gib.enabled>
     </properties>
 
     <modules>
@@ -202,25 +203,4 @@
             </extension>
         </extensions>
     </build>
-
-
-    <profiles>
-        <profile>
-            <id>incremental-enabled</id>
-            <properties>
-                <gib.enabled>true</gib.enabled>
-            </properties>
-        </profile>
-        <profile>
-            <id>incremental-disabled</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <gib.enabled>false</gib.enabled>
-            </properties>
-        </profile>
-    </profiles>
-
-
 </project>