diff --git a/pom.xml b/pom.xml
index aa79dae1d5..f4338bf995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,7 +545,7 @@
                                 <exclude>**/*IntTest.java</exclude>
                                 <exclude>**/*LongRunningUnitTest.java</exclude>
                                 <exclude>**/*ManualTest.java</exclude>
-                                <exclude>**/JdbcTest.java</exclude>
+                                <exclude>**/*JdbcTest.java</exclude>
                                 <exclude>**/*LiveTest.java</exclude>
                             </excludes>
                         </configuration>
@@ -898,37 +898,25 @@
 
 		<profile>
 			<id>integration</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>integration-test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-									<excludes>
-										<exclude>**/*ManualTest.java</exclude>
-										<exclude>**/*LiveTest.java</exclude>
-									</excludes>
-									<includes>
-										<include>**/*IntegrationTest.java</include>
-										<include>**/*IntTest.java</include>
-									</includes>
-								</configuration>
-							</execution>
-						</executions>
-						<configuration>
-							<systemPropertyVariables>
-								<test.mime>json</test.mime>
-							</systemPropertyVariables>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
+            
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
 			<modules>
 
@@ -1213,39 +1201,26 @@
 		</profile>
 
 		<profile>
-			<id>integration-lite</id>
+			<id>integration-lite-test</id>
 
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>integration-test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-									<excludes>
-										<exclude>**/*ManualTest.java</exclude>
-										<exclude>**/*LiveTest.java</exclude>
-									</excludes>
-									<includes>
-										<include>**/*IntegrationTest.java</include>
-										<include>**/*IntTest.java</include>
-									</includes>
-								</configuration>
-							</execution>
-						</executions>
-						<configuration>
-							<systemPropertyVariables>
-								<test.mime>json</test.mime>
-							</systemPropertyVariables>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
 			<modules>
 				<module>parent-boot-1</module>
@@ -1254,270 +1229,305 @@
 				<module>parent-spring-5</module>
 				<module>parent-java</module>
 				<module>parent-kotlin</module>
-				<module>asm</module>
-				<module>atomix</module>
-				<module>persistence-modules/apache-cayenne</module>
-				<module>aws</module>
-				<module>aws-lambda</module>
-				<module>akka-streams</module>
-				<module>algorithms-genetic</module>
-				<module>algorithms-miscellaneous-1</module>
-				<module>algorithms-miscellaneous-2</module>
-				<module>algorithms-sorting</module>
-				<module>annotations</module>
-				<module>apache-cxf</module>
-				<module>apache-fop</module>
-				<module>apache-poi</module>
-				<module>apache-tika</module>
-				<module>apache-thrift</module>
-				<module>apache-curator</module>
-				<module>apache-zookeeper</module>
-				<module>apache-opennlp</module>
-				<module>autovalue</module>
-				<module>axon</module>
-				<module>azure</module>
-				<module>bootique</module>
-				<module>cdi</module>
-				<module>java-strings</module>
-				<!--<module>core-java-9</module> --> <!-- Commented because we have still not upgraded to java 9 -->
-				<module>core-java-collections</module>
-				<module>java-collections-conversions</module>
-				<module>java-collections-maps</module>
-				<module>core-java-io</module>
-				<module>core-java-8</module>
-				<module>java-streams</module>
-				<module>core-groovy</module>
-
-				<module>couchbase</module>
-				<module>persistence-modules/deltaspike</module>
-				<module>dozer</module>
-				<module>ethereum</module>
-				<module>feign</module>
-				<module>flips</module>
-				<module>testing-modules/groovy-spock</module>
-				<module>google-cloud</module>
-				<module>gson</module>
-				<module>guava</module>
-				<module>guava-collections</module>
-				<module>guava-modules/guava-18</module>
-				<module>guava-modules/guava-19</module>
-				<module>guava-modules/guava-21</module>
-				<module>guice</module>
-				<module>disruptor</module>
-				<module>spring-static-resources</module>
-				<module>hazelcast</module>
-				<module>persistence-modules/hbase</module>
-
-				<module>hystrix</module>
-				<module>image-processing</module>
-				<module>immutables</module>
-				<module>persistence-modules/influxdb</module>
-				<module>jackson</module>
-				<module>vavr</module>
-				<module>java-lite</module>
-				<module>java-numbers</module>
-				<module>java-rmi</module>
-				<module>java-vavr-stream</module>
-				<module>javax-servlets</module>
-				<module>javaxval</module>
-				<module>jaxb</module>
-				<module>javafx</module>
-				<module>jgroups</module>
-				<module>jee-7</module>
-				<module>jee-7-security</module>
-				<module>jjwt</module>
-				<module>jsf</module>
-				<module>json-path</module>
-				<module>json</module>
-				<module>jsoup</module>
-				<module>jta</module>
-				<module>testing-modules/junit-5</module>
-				<module>testing-modules/junit5-migration</module>
-				<module>jws</module>
-				<module>libraries-data</module>
-				<module>linkrest</module>
-				<module>logging-modules/log-mdc</module>
-				<module>logging-modules/log4j</module>
-
-				<module>logging-modules/logback</module>
-				<module>lombok</module>
-				<module>mapstruct</module>
-
-				<module>maven</module>
-				<module>mesos-marathon</module>
-				<module>msf4j</module>
-				<module>testing-modules/mockito</module>
-				<module>testing-modules/mockito-2</module>
-				<module>testing-modules/mocks</module>
-				<module>mustache</module>
-				<module>mvn-wrapper</module>
-				<module>noexception</module>
-				<module>persistence-modules/orientdb</module>
-				<module>osgi</module>
-				<module>orika</module>
-				<module>patterns</module>
-				<module>pdf</module>
-				<module>protobuffer</module>
-				<module>persistence-modules/querydsl</module>
-				<module>reactor-core</module>
-				<module>persistence-modules/redis</module>
-				<module>testing-modules/rest-assured</module>
-				<module>testing-modules/rest-testing</module>
-				<module>resteasy</module>
-				<module>rxjava</module>
-				<module>rxjava-2</module>
-				<module>spring-swagger-codegen</module>
-				<module>testing-modules/selenium-junit-testng</module>
-				<module>persistence-modules/solr</module>
-				<module>spark-java</module>
+                
 				<module>spring-4</module>
-				<module>spring-5-data-reactive</module>
-				<module>spring-5-reactive</module>
-				<module>spring-5-reactive-security</module>
-				<module>spring-5-reactive-client</module>
-				<module>spring-5-mvc</module>
-				<module>spring-5-security</module>
-				<module>spring-activiti</module>
-				<module>spring-akka</module>
-				<module>spring-amqp</module>
-				<module>spring-all</module>
-				<module>spring-amqp-simple</module>
-				<module>spring-apache-camel</module>
-				<module>spring-batch</module>
-				<module>spring-bom</module>
-				<module>spring-boot-keycloak</module>
-				<module>spring-boot-bootstrap</module>
-				<module>spring-boot-admin</module>
-				<module>spring-boot-camel</module>
-				<module>persistence-modules/spring-boot-persistence</module>
-				<module>spring-boot-security</module>
-				<module>spring-boot-mvc</module>
-				<module>spring-boot-logging-log4j2</module>
-				<module>spring-boot-disable-console-logging</module>
-				<module>spring-cloud-data-flow</module>
-				<module>spring-cloud</module>
-				<module>spring-cloud-bus</module>
-				<module>spring-core</module>
-				<module>spring-cucumber</module>
-				<module>spring-ejb</module>
-				<module>spring-aop</module>
+			</modules>
 
-				<module>persistence-modules/spring-data-dynamodb</module>
-				<module>persistence-modules/spring-data-keyvalue</module>
-				<module>persistence-modules/spring-data-mongodb</module>
-				<module>persistence-modules/spring-data-neo4j</module>
+		</profile>
 
-				<module>spring-data-rest</module>
-				<module>persistence-modules/spring-data-solr</module>
-				<module>spring-dispatcher-servlet</module>
-				<module>spring-exceptions</module>
-				<module>spring-freemarker</module>
-				<module>persistence-modules/spring-hibernate-3</module>
+        <profile>
+            <id>integration-lite</id>
 
-				<module>persistence-modules/spring-hibernate-5</module>
-				<module>persistence-modules/spring-data-eclipselink</module>
-				<module>spring-integration</module>
-				<module>spring-jenkins-pipeline</module>
-				<module>spring-jersey</module>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
 
-				<module>spring-jms</module>
-				<module>spring-jooq</module>
-				<module>persistence-modules/spring-jpa</module>
-				<module>spring-kafka</module>
-				<module>spring-katharsis</module>
-				<module>spring-ldap</module>
-				<module>spring-mockito</module>
-				<module>spring-mvc-forms-jsp</module>
-				<module>spring-mvc-forms-thymeleaf</module>
-				<module>spring-mvc-java</module>
-				<module>spring-mvc-velocity</module>
-				<module>spring-mvc-webflow</module>
-				<module>spring-mvc-xml</module>
-				<module>spring-mvc-kotlin</module>
-				<module>spring-protobuf</module>
-				<module>spring-quartz</module>
-				<module>spring-rest-angular</module>
-				<module>spring-rest-full</module>
-				<module>spring-rest-query-language</module>
-				<module>spring-rest</module>
-				<module>spring-resttemplate</module>
-				<module>spring-rest-simple</module>
-				<module>spring-security-acl</module>
-				<module>spring-security-cache-control</module>
-				<module>spring-security-client/spring-security-jsp-authentication</module>
-				<module>spring-security-client/spring-security-jsp-authorize</module>
-				<module>spring-security-client/spring-security-jsp-config</module>
-				<module>spring-security-client/spring-security-mvc</module>
-				<module>spring-security-client/spring-security-thymeleaf-authentication</module>
-				<module>spring-security-client/spring-security-thymeleaf-authorize</module>
-				<module>spring-security-client/spring-security-thymeleaf-config</module>
-				<module>spring-security-core</module>
-				<module>spring-security-mvc-boot</module>
-				<module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-ldap</module>
-				<module>spring-security-mvc-login</module>
-				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
-				<module>spring-security-mvc-socket</module>
-				<module>spring-security-openid</module>
-				<!--<module>spring-security-react</module> -->
-				<module>spring-security-rest-basic-auth</module>
-				<module>spring-security-rest-custom</module>
-				<module>spring-security-rest</module>
-				<module>spring-security-sso</module>
-				<module>spring-security-x509</module>
-				<module>spring-session</module>
-				<module>spring-sleuth</module>
-				<module>spring-social-login</module>
-				<module>spring-spel</module>
-				<module>spring-state-machine</module>
-				<module>spring-thymeleaf</module>
-				<module>spring-userservice</module>
-				<module>spring-zuul</module>
-				<module>spring-remoting</module>
-				<module>spring-reactor</module>
-				<module>spring-vertx</module>
-				<module>spring-vault</module>
-				<module>spring-jinq</module>
-				<module>spring-rest-embedded-tomcat</module>
-				<module>testing-modules/testing</module>
-				<module>testing-modules/testng</module>
-				<module>video-tutorials</module>
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+                <module>asm</module>
+                <module>atomix</module>
+                <module>persistence-modules/apache-cayenne</module>
+                <module>aws</module>
+                <module>aws-lambda</module>
+                <module>akka-streams</module>
+                <module>algorithms-genetic</module>
+                <module>algorithms-miscellaneous-1</module>
+                <module>algorithms-miscellaneous-2</module>
+                <module>algorithms-sorting</module>
+                <module>annotations</module>
+                <module>apache-cxf</module>
+                <module>apache-fop</module>
+                <module>apache-poi</module>
+                <module>apache-tika</module>
+                <module>apache-thrift</module>
+                <module>apache-curator</module>
+                <module>apache-zookeeper</module>
+                <module>apache-opennlp</module>
+                <module>autovalue</module>
+                <module>axon</module>
+                <module>azure</module>
+                <module>bootique</module>
+                <module>cdi</module>
+                <module>java-strings</module>
+                <!--<module>core-java-9</module> --> <!-- Commented because we have still not upgraded to java 9 -->
+                <module>core-java-collections</module>
+                <module>java-collections-conversions</module>
+                <module>java-collections-maps</module>
+                <module>core-java-io</module>
+                <module>core-java-8</module>
+                <module>java-streams</module>
+                <module>core-groovy</module>
 
-				<module>xmlunit-2</module>
-				<module>struts-2</module>
-				<module>apache-velocity</module>
-				<module>apache-solrj</module>
-				<module>rabbitmq</module>
+                <module>couchbase</module>
+                <module>persistence-modules/deltaspike</module>
+                <module>dozer</module>
+                <module>ethereum</module>
+                <module>feign</module>
+                <module>flips</module>
+                <module>testing-modules/groovy-spock</module>
+                <module>google-cloud</module>
+                <module>gson</module>
+                <module>guava</module>
+                <module>guava-collections</module>
+                <module>guava-modules/guava-18</module>
+                <module>guava-modules/guava-19</module>
+                <module>guava-modules/guava-21</module>
+                <module>guice</module>
+                <module>disruptor</module>
+                <module>spring-static-resources</module>
+                <module>hazelcast</module>
+                <module>persistence-modules/hbase</module>
 
-				<module>persistence-modules/spring-data-gemfire</module>
-				<module>mybatis</module>
-				<module>spring-drools</module>
-				<module>drools</module>
-				<module>persistence-modules/liquibase</module>
-				<module>spring-boot-property-exp</module>
-				<module>testing-modules/mockserver</module>
-				<module>testing-modules/test-containers</module>
-				<module>undertow</module>
-				<module>vaadin</module>
-				<module>vertx-and-rxjava</module>
-				<module>saas</module>
-				<module>deeplearning4j</module>
-				<module>lucene</module>
-				<module>vraptor</module>
-				<module>persistence-modules/java-cockroachdb</module>
-				<module>spring-security-thymeleaf</module>
-				<module>persistence-modules/java-jdbi</module>
-				<module>jersey</module>
-				<module>java-spi</module>
-				<module>performance-tests</module>
-				<module>twilio</module>
-				<module>spring-boot-ctx-fluent</module>
-				<module>java-ee-8-security-api</module>
-				<module>spring-webflux-amqp</module>
-				<module>antlr</module>
-				<module>maven-archetype</module>
-				<module>apache-meecrowave</module>
+                <module>hystrix</module>
+                <module>image-processing</module>
+                <module>immutables</module>
+                <module>persistence-modules/influxdb</module>
+                <module>jackson</module>
+                <module>vavr</module>
+                <module>java-lite</module>
+                <module>java-numbers</module>
+                <module>java-rmi</module>
+                <module>java-vavr-stream</module>
+                <module>javax-servlets</module>
+                <module>javaxval</module>
+                <module>jaxb</module>
+                <module>javafx</module>
+                <module>jgroups</module>
+                <module>jee-7</module>
+                <module>jee-7-security</module>
+                <module>jjwt</module>
+                <module>jsf</module>
+                <module>json-path</module>
+                <module>json</module>
+                <module>jsoup</module>
+                <module>jta</module>
+                <module>testing-modules/junit-5</module>
+                <module>testing-modules/junit5-migration</module>
+                <module>jws</module>
+                <module>libraries-data</module>
+                <module>linkrest</module>
+                <module>logging-modules/log-mdc</module>
+                <module>logging-modules/log4j</module>
+
+                <module>logging-modules/logback</module>
+                <module>lombok</module>
+                <module>mapstruct</module>
+
+                <module>maven</module>
+                <module>mesos-marathon</module>
+                <module>msf4j</module>
+                <module>testing-modules/mockito</module>
+                <module>testing-modules/mockito-2</module>
+                <module>testing-modules/mocks</module>
+                <module>mustache</module>
+                <module>mvn-wrapper</module>
+                <module>noexception</module>
+                <module>persistence-modules/orientdb</module>
+                <module>osgi</module>
+                <module>orika</module>
+                <module>patterns</module>
+                <module>pdf</module>
+                <module>protobuffer</module>
+                <module>persistence-modules/querydsl</module>
+                <module>reactor-core</module>
+                <module>persistence-modules/redis</module>
+                <module>testing-modules/rest-assured</module>
+                <module>testing-modules/rest-testing</module>
+                <module>resteasy</module>
+                <module>rxjava</module>
+                <module>rxjava-2</module>
+                <module>spring-swagger-codegen</module>
+                <module>testing-modules/selenium-junit-testng</module>
+                <module>persistence-modules/solr</module>
+                <module>spark-java</module>
+                <module>spring-4</module>
+                <module>spring-5-data-reactive</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-mvc</module>
+                <module>spring-5-security</module>
+                <module>spring-activiti</module>
+                <module>spring-akka</module>
+                <module>spring-amqp</module>
+                <module>spring-all</module>
+                <module>spring-amqp-simple</module>
+                <module>spring-apache-camel</module>
+                <module>spring-batch</module>
+                <module>spring-bom</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-camel</module>
+                <module>persistence-modules/spring-boot-persistence</module>
+                <module>spring-boot-security</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-logging-log4j2</module>
+                <module>spring-boot-disable-console-logging</module>
+                <module>spring-cloud-data-flow</module>
+                <module>spring-cloud</module>
+                <module>spring-cloud-bus</module>
+                <module>spring-core</module>
+                <module>spring-cucumber</module>
+                <module>spring-ejb</module>
+                <module>spring-aop</module>
+
+                <module>persistence-modules/spring-data-dynamodb</module>
+                <module>persistence-modules/spring-data-keyvalue</module>
+                <module>persistence-modules/spring-data-mongodb</module>
+                <module>persistence-modules/spring-data-neo4j</module>
+
+                <module>spring-data-rest</module>
+                <module>persistence-modules/spring-data-solr</module>
+                <module>spring-dispatcher-servlet</module>
+                <module>spring-exceptions</module>
+                <module>spring-freemarker</module>
+                <module>persistence-modules/spring-hibernate-3</module>
+
+                <module>persistence-modules/spring-hibernate-5</module>
+                <module>persistence-modules/spring-data-eclipselink</module>
+                <module>spring-integration</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-jersey</module>
+
+                <module>spring-jms</module>
+                <module>spring-jooq</module>
+                <module>persistence-modules/spring-jpa</module>
+                <module>spring-kafka</module>
+                <module>spring-katharsis</module>
+                <module>spring-ldap</module>
+                <module>spring-mockito</module>
+                <module>spring-mvc-forms-jsp</module>
+                <module>spring-mvc-forms-thymeleaf</module>
+                <module>spring-mvc-java</module>
+                <module>spring-mvc-velocity</module>
+                <module>spring-mvc-webflow</module>
+                <module>spring-mvc-xml</module>
+                <module>spring-mvc-kotlin</module>
+                <module>spring-protobuf</module>
+                <module>spring-quartz</module>
+                <module>spring-rest-angular</module>
+                <module>spring-rest-full</module>
+                <module>spring-rest-query-language</module>
+                <module>spring-rest</module>
+                <module>spring-resttemplate</module>
+                <module>spring-rest-simple</module>
+                <module>spring-security-acl</module>
+                <module>spring-security-cache-control</module>
+                <module>spring-security-client/spring-security-jsp-authentication</module>
+                <module>spring-security-client/spring-security-jsp-authorize</module>
+                <module>spring-security-client/spring-security-jsp-config</module>
+                <module>spring-security-client/spring-security-mvc</module>
+                <module>spring-security-client/spring-security-thymeleaf-authentication</module>
+                <module>spring-security-client/spring-security-thymeleaf-authorize</module>
+                <module>spring-security-client/spring-security-thymeleaf-config</module>
+                <module>spring-security-core</module>
+                <module>spring-security-mvc-boot</module>
+                <module>spring-security-mvc-digest-auth</module>
+                <module>spring-security-mvc-ldap</module>
+                <module>spring-security-mvc-login</module>
+                <module>spring-security-mvc-persisted-remember-me</module>
+                <module>spring-security-mvc-session</module>
+                <module>spring-security-mvc-socket</module>
+                <module>spring-security-openid</module>
+                <!--<module>spring-security-react</module> -->
+                <module>spring-security-rest-basic-auth</module>
+                <module>spring-security-rest-custom</module>
+                <module>spring-security-rest</module>
+                <module>spring-security-sso</module>
+                <module>spring-security-x509</module>
+                <module>spring-session</module>
+                <module>spring-sleuth</module>
+                <module>spring-social-login</module>
+                <module>spring-spel</module>
+                <module>spring-state-machine</module>
+                <module>spring-thymeleaf</module>
+                <module>spring-userservice</module>
+                <module>spring-zuul</module>
+                <module>spring-remoting</module>
+                <module>spring-reactor</module>
+                <module>spring-vertx</module>
+                <module>spring-vault</module>
+                <module>spring-jinq</module>
+                <module>spring-rest-embedded-tomcat</module>
+                <module>testing-modules/testing</module>
+                <module>testing-modules/testng</module>
+                <module>video-tutorials</module>
+
+                <module>xmlunit-2</module>
+                <module>struts-2</module>
+                <module>apache-velocity</module>
+                <module>apache-solrj</module>
+                <module>rabbitmq</module>
+
+                <module>persistence-modules/spring-data-gemfire</module>
+                <module>mybatis</module>
+                <module>spring-drools</module>
+                <module>drools</module>
+                <module>persistence-modules/liquibase</module>
+                <module>spring-boot-property-exp</module>
+                <module>testing-modules/mockserver</module>
+                <module>testing-modules/test-containers</module>
+                <module>undertow</module>
+                <module>vaadin</module>
+                <module>vertx-and-rxjava</module>
+                <module>saas</module>
+                <module>deeplearning4j</module>
+                <module>lucene</module>
+                <module>vraptor</module>
+                <module>persistence-modules/java-cockroachdb</module>
+                <module>spring-security-thymeleaf</module>
+                <module>persistence-modules/java-jdbi</module>
+                <module>jersey</module>
+                <module>java-spi</module>
+                <module>performance-tests</module>
+                <module>twilio</module>
+                <module>spring-boot-ctx-fluent</module>
+                <module>java-ee-8-security-api</module>
+                <module>spring-webflux-amqp</module>
+                <module>antlr</module>
+                <module>maven-archetype</module>
+                <module>apache-meecrowave</module>
 
                 <module>persistence-modules/spring-hibernate4</module>
                 <module>xml</module>
@@ -1535,28 +1545,28 @@
                 <module>persistence-modules/spring-data-redis</module>
 
                 <module>jmeter</module>
-				-->
+                -->
 
-				<!-- heavy -->
-				<!--
-				<module>libraries</module>
-				<module>geotools</module>
-				<module>jhipster/jhipster-monolithic</module>
-				<module>testing-modules/gatling</module>
-				<module>spring-boot</module>
-				<module>spring-boot-ops</module>
-				<module>spring-5</module>
-				<module>core-kotlin</module>
-				<module>core-java</module>
-				<module>google-web-toolkit</module>
+                <!-- heavy -->
+                <!--
+                <module>libraries</module>
+                <module>geotools</module>
+                <module>jhipster/jhipster-monolithic</module>
+                <module>testing-modules/gatling</module>
+                <module>spring-boot</module>
+                <module>spring-boot-ops</module>
+                <module>spring-5</module>
+                <module>core-kotlin</module>
+                <module>core-java</module>
+                <module>google-web-toolkit</module>
                 <module>spring-security-mvc-custom</module>
                 <module>core-java-concurrency</module>
-				-->
+                -->
 
                 <!-- 30:32 min -->
-			</modules>
+            </modules>
 
-		</profile>
+        </profile>
 
         <profile>
             <id>integration-heavy</id>
@@ -1566,28 +1576,15 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                        <exclude>**/*LiveTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
                         <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
+                            <excludes>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*IntTest.java</include>
+                            </includes>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -1641,12 +1638,15 @@
 		<gib.failOnMissingGitDir>false</gib.failOnMissingGitDir>
 		<gib.failOnError>false</gib.failOnError>
 		<!-- <gib.enabled>false</gib.enabled> -->
+        
 		<junit.version>4.12</junit.version>
 		<org.hamcrest.version>1.3</org.hamcrest.version>
 		<mockito.version>2.21.0</mockito.version>
+        
 		<!-- logging -->
 		<org.slf4j.version>1.7.21</org.slf4j.version>
 		<logback.version>1.1.7</logback.version>
+        
 		<!-- plugins -->
 		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>