diff --git a/JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java b/JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java
index cb476b9d9e..a50028a9ae 100644
--- a/JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java
+++ b/JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java
@@ -28,14 +28,14 @@ public class Log {
                 System.out.println("Had " + count + " commits overall on current branch");
 
                 logs = git.log()
-                        .add(repository.resolve("remotes/origin/testbranch"))
+                        .add(repository.resolve(git.getRepository().getFullBranch()))
                         .call();
                 count = 0;
                 for (RevCommit rev : logs) {
                     System.out.println("Commit: " + rev /* + ", name: " + rev.getName() + ", id: " + rev.getId().getName() */);
                     count++;
                 }
-                System.out.println("Had " + count + " commits overall on test-branch");
+                System.out.println("Had " + count + " commits overall on "+git.getRepository().getFullBranch());
 
                 logs = git.log()
                         .all()
diff --git a/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java b/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
index ed7168b2c2..ad34890996 100644
--- a/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
+++ b/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
@@ -1,3 +1,5 @@
+package com.baeldung.jgit;
+
 import com.baeldung.jgit.helper.Helper;
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectReader;
diff --git a/pom.xml b/pom.xml
index eb60cb2e45..4e1e61961e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,165 +330,235 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
-                <module>asm</module>
-                <module>atomix</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>animal-sniffer-mvn-plugin</module>
                 <module>annotations</module>
+                <module>antlr</module>
+                <module>apache-avro</module>
+                <module>apache-bval</module>
+                <module>apache-curator</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-geode</module>
+                <module>apache-meecrowave</module>
                 <module>apache-opennlp</module>
+                <module>apache-poi</module>
+                <module>apache-pulsar</module>
+                <module>apache-shiro</module>
+                <module>apache-solrj</module>
+                <module>apache-spark</module>
+                <module>apache-thrift</module>
+                <module>apache-tika</module>
+                <module>apache-velocity</module>
+                <module>apache-zookeeper</module>
+                <module>asciidoctor</module>
+                <module>asm</module>
+                <module>atomix</module>
                 <module>autovalue</module>
+                <module>aws</module>
+                <module>aws-lambda</module>
                 <module>axon</module>
                 <module>azure</module>
-                <module>apache-velocity</module>
-                <module>apache-solrj</module>
-                <module>apache-meecrowave</module>
-                <module>antlr</module>
-                
-                <module>bootique</module>
-                
-                <module>cdi</module>
-                <module>core-java-collections</module>
-                <module>core-java-io</module>
-                <module>core-java-8</module>
-                <module>core-groovy</module>
-                <module>couchbase</module>
-                <!-- <module>core-java-concurrency</module> --> <!-- very long running? -->
-                <!-- <module>core-kotlin</module> --> <!-- long running? -->
-                <module>core-java</module>
-                <module>core-java-networking</module>
 
-                <module>dozer</module>
-                <module>disruptor</module>
-                <module>drools</module>
+                <module>bootique</module>
+
+                <module>cas/cas-secured-app</module>
+                <module>cas/cas-server</module>
+                <module>cdi</module>
+                <module>checker-plugin</module>
+                <module>core-groovy</module>
+                <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 --> 
+                <module>core-java-8</module>
+                <!--<module>core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <module>core-java-arrays</module>
+                <module>core-java-collections</module>
+                <module>core-java-concurrency-collections</module>
+                <module>core-java-io</module>
+                <module>core-java-lang</module>
+				<module>core-java-networking</module>
+                <module>core-java-sun</module>
+                <module>core-scala</module>
+                <module>couchbase</module>
+                <module>custom-pmd</module>
+                                
+                <module>dagger</module>
+                <module>data-structures</module>
+                <module>ddd</module>
                 <module>deeplearning4j</module>
+                <module>disruptor</module>
+                <module>dozer</module>
+                <module>drools</module>
+                <module>dubbo</module>             
                 
                 <module>ethereum</module>
                 
                 <module>feign</module>
                 <module>flips</module>
+                <module>flyway-cdi-extension</module>
                 
+                <module>geotools</module>
                 <module>google-cloud</module>
+                <module>google-web-toolkit</module>
+                <!-- <module>gradle</module> --> <!-- Not a maven project -->
+                <!-- <module>grails</module> --> <!-- Not a maven project -->
+                <module>graphql/graphql-java</module>
+                <module>grpc</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>guest</module> --> <!-- not to be built as its for guest articles  -->
                 <module>guice</module>
                 
                 <module>hazelcast</module>
-                <module>hystrix</module>
+                <module>helidon</module>
                 <module>httpclient</module>
+                <module>hystrix</module>
                 
                 <module>image-processing</module>
                 <module>immutables</module>
-                
+
                 <module>jackson</module>
-                <module>java-strings</module>
-                <!--<module>core-java-9</module> --> <!-- we haven't upgraded to java 9 -->
                 <module>java-collections-conversions</module>
                 <module>java-collections-maps</module>
-                <module>java-streams</module>
+                <!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <module>java-ee-8-security-api</module>
                 <module>java-lite</module>
                 <module>java-numbers</module>
                 <module>java-rmi</module>
+                <module>java-spi</module>
+                <module>java-streams</module>
+                <module>java-strings</module>
                 <module>java-vavr-stream</module>
+                <module>java-websocket</module>
+                <module>javafx</module>
                 <module>javax-servlets</module>
                 <module>javaxval</module>
                 <module>jaxb</module>
-                <module>javafx</module>
-                <module>jgroups</module>
                 <!-- JIRA-10842
                 <module>jee-7</module> -->
                 <module>jee-7-security</module>
+                <module>jersey</module>
+                <module>JGit</module>
+                <module>jgroups</module>
+                <module>jhipster</module>
+                <module>jib</module>
                 <module>jjwt</module>
+                <module>jmeter</module>
+                <module>jmh</module>
+                <module>jni</module>
+                <module>jooby</module>
                 <module>jsf</module>
-                <module>json-path</module>
                 <module>json</module>
+                <module>json-path</module>
                 <module>jsoup</module>
                 <module>jta</module>
-                <module>jws</module>
-                <module>jersey</module>
-                <module>java-spi</module>
-                <module>java-ee-8-security-api</module>
+
+                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+                <module>kotlin-libraries</module>
                 
-                <!-- <module>libraries</module> --> <!-- very long running -->
+                <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>libraries-data</module>
+                <module>libraries-security</module>
+                <module>libraries-server</module>
                 <module>linkrest</module>
-                <module>logging-modules/log-mdc</module>
                 <module>logging-modules/log4j</module>
+                <module>logging-modules/log4j2</module>
                 <module>logging-modules/logback</module>
+                <module>logging-modules/log-mdc</module>
                 <module>lombok</module>
                 <module>lucene</module>
-                
+
                 <module>mapstruct</module>
                 <module>maven</module>
+                <module>maven-archetype</module>
+                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+                <module>maven-polyglot/maven-polyglot-json-extension</module>
+                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
                 <module>mesos-marathon</module>
+                <module>metrics</module>
+                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+                <module>microprofile</module>
                 <module>msf4j</module>
+                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mvn-wrapper</module>
                 <module>mybatis</module>
-                <module>metrics</module>
-                <module>maven-archetype</module>
                 
                 <module>noexception</module>
                 
-                <module>osgi</module>
+                <module>optaplanner</module>
                 <module>orika</module>
-                                
+                <module>osgi</module>
+
                 <module>patterns</module>
                 <module>pdf</module>
-                <module>protobuffer</module>
                 <module>performance-tests</module>
+                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+                <module>protobuffer</module>
                 
+                <module>persistence-modules/activejdbc</module>
+                <module>persistence-modules/apache-cayenne</module>
+                <module>persistence-modules/core-java-persistence</module>
+                <module>persistence-modules/deltaspike</module>
+                <module>persistence-modules/flyway</module>
+                <module>persistence-modules/hbase</module>
+                <module>persistence-modules/hibernate5</module>
+                <module>persistence-modules/influxdb</module>
+                <module>persistence-modules/java-cassandra</module>
+                <module>persistence-modules/java-cockroachdb</module>
                 <module>persistence-modules/java-jdbi</module>
-                <module>persistence-modules/redis</module>
+                <module>persistence-modules/java-jpa</module>
+                <module>persistence-modules/java-mongodb</module>
+                <module>persistence-modules/jnosql</module>
+                <module>persistence-modules/liquibase</module>
                 <module>persistence-modules/orientdb</module>
                 <module>persistence-modules/querydsl</module>
-                <module>persistence-modules/apache-cayenne</module>
+                <module>persistence-modules/redis</module>
                 <module>persistence-modules/solr</module>
-                <module>persistence-modules/spring-data-dynamodb</module>
-                <module>persistence-modules/spring-data-keyvalue</module>
-                <module>persistence-modules/spring-data-neo4j</module>
-                <module>persistence-modules/spring-data-solr</module>
-                <module>persistence-modules/spring-hibernate-5</module>
-                <module>persistence-modules/spring-data-eclipselink</module>
-                <module>persistence-modules/spring-jpa</module>
-                <module>persistence-modules/spring-hibernate-3</module>
-                <module>persistence-modules/spring-data-gemfire</module>
+                <module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
                 <module>persistence-modules/spring-boot-persistence</module>
-                <module>persistence-modules/liquibase</module>
-                <module>persistence-modules/java-cockroachdb</module>
-                <module>persistence-modules/deltaspike</module>
-                <module>persistence-modules/hbase</module>
-                <module>persistence-modules/influxdb</module>
-                <module>persistence-modules/spring-hibernate4</module>
-                <module>persistence-modules/spring-data-mongodb</module> <!-- long -->
-                <module>persistence-modules/java-cassandra</module>
+                <module>persistence-modules/spring-boot-persistence-mongodb</module>
                 <module>persistence-modules/spring-data-cassandra</module>
+                <module>persistence-modules/spring-data-cassandra-reactive</module>
                 <module>persistence-modules/spring-data-couchbase-2</module>
+                <module>persistence-modules/spring-data-dynamodb</module>
+                <module>persistence-modules/spring-data-eclipselink</module>
+                <module>persistence-modules/spring-data-elasticsearch</module>
+                <module>persistence-modules/spring-data-gemfire</module>
+                <module>persistence-modules/spring-data-jpa</module>
+                <module>persistence-modules/spring-data-keyvalue</module>
+                <module>persistence-modules/spring-data-mongodb</module> <!-- long -->
+                <module>persistence-modules/spring-data-neo4j</module>
                 <module>persistence-modules/spring-data-redis</module>
-				<module>persistence-modules/spring-boot-persistence-mongodb</module>
-                
-                <module>reactor-core</module>
-                <module>resteasy</module>
-								<module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
+                <module>persistence-modules/spring-data-solr</module>
+                <module>persistence-modules/spring-hibernate-3</module>
+                <module>persistence-modules/spring-hibernate-5</module>
+                <module>persistence-modules/spring-hibernate4</module>
+                <module>persistence-modules/spring-jpa</module>
+                                
                 <module>rabbitmq</module>
-                
+                <!-- <module>raml</module> --> <!-- Not a maven project -->
+                <module>ratpack</module>
+                <module>reactor-core</module>
+                <module>rest-with-spark-java</module>
+                <module>resteasy</module>
+                <module>restx</module>
+                <!-- <module>rmi</module> --> <!-- Not a maven project -->
+                <module>rule-engines/easy-rules</module>
+                <module>rule-engines/openl-tablets</module>
+                <module>rule-engines/rulebook</module>
+				<module>rsocket</module>
+                <module>rxjava</module>
+                <module>rxjava-2</module>                                
+                                                 
 			</modules>
 
 		</profile>
@@ -528,98 +598,120 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
-                <module>spring-4</module>
-                <module>spring-5</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-5-security-oauth</module>
+                <module>saas</module>
+                <module>spark-java</module>
+                
+                <module>spring-4</module>
+                
+                <module>spring-5</module>
+                <module>spring-5-mvc</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-reactive-oauth</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-security</module>
+                <module>spring-5-security-oauth</module>
                 
-                <module>spring-aop</module>
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
-                <module>spring-amqp</module>
                 <module>spring-all</module>
+                <module>spring-amqp</module>
+                <module>spring-aop</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>spring-boot-security</module>
-                <module>spring-boot-mvc</module>
-                <module>spring-boot-logging-log4j2</module>
-                <module>spring-boot-disable-console-logging</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-ctx-fluent</module>
-                <module>spring-boot</module>
-                <module>spring-boot-ops</module>
                 
-                <module>spring-cloud-data-flow</module>
+                <module>spring-boot</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-angular-ecommerce</module>
+                <module>spring-boot-autoconfiguration</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-camel</module>
+                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+                <module>spring-boot-client</module>
+                <module>spring-boot-crud</module>
+                <module>spring-boot-ctx-fluent</module>
+                <module>spring-boot-custom-starter</module>
+                <module>spring-boot-disable-console-logging</module>
+                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+                <module>spring-boot-jasypt</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-logging-log4j2</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-ops</module>
+                <module>spring-boot-property-exp</module>
+                <module>spring-boot-security</module>
+                <module>spring-boot-vue</module>
+                
                 <module>spring-cloud</module>
                 <module>spring-cloud-bus</module>
+                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                <module>spring-cloud-data-flow</module>
+                
                 <module>spring-core</module>
                 <module>spring-cucumber</module>
+                
                 <module>spring-data-rest</module>
-                <module>spring-drools</module>
+                <module>spring-data-rest-querydsl</module>
                 <module>spring-dispatcher-servlet</module>
+                <module>spring-drools</module>
+                
                 <module>spring-ejb</module>
                 <module>spring-exceptions</module>
                 
                 <module>spring-freemarker</module>
+                
+                <module>spring-groovy</module>
+                
                 <module>spring-integration</module>
                 
-                <module>spring-jinq</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-jersey</module>
+                <module>spring-jinq</module>
                 <module>spring-jms</module>
                 <module>spring-jooq</module>
+                
                 <module>spring-kafka</module>
                 <module>spring-katharsis</module>
+                
                 <module>spring-ldap</module>
                 
+                <module>spring-mobile</module>
                 <module>spring-mockito</module>
+                <module>spring-mustache</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
+                <module>spring-mvc-kotlin</module>
+                <module>spring-mvc-simple</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
                 <module>spring-mvc-xml</module>
-                <module>spring-mvc-kotlin</module>
+                <module>spring-mybatis</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-remoting</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-reactive-kotlin</module>
                 <module>spring-reactor</module>
-                <module>spring-vertx</module>
-                <module>spring-vault</module>
+                <module>spring-remoting</module>
+                <module>spring-rest</module>
+                <module>spring-rest-angular</module>
                 <module>spring-rest-embedded-tomcat</module>
-                <module>spring-swagger-codegen</module>
-                <module>spring-webflux-amqp</module> <!-- long -->
+                <module>spring-rest-full</module>
+                <module>spring-rest-hal-browser</module>
+                <module>spring-rest-query-language</module>
+                <module>spring-rest-shell</module>
+                <module>spring-rest-simple</module>
+                <module>spring-rest-template</module>
+                <module>spring-resttemplate</module>
+                <module>spring-roo</module>
                 
-                <module>spring-static-resources</module>
-                <module>spring-security-thymeleaf</module>
                 <module>spring-security-acl</module>
+                <module>spring-security-angular/server</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>
@@ -627,8 +719,10 @@
                 <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-custom</module>
                 <module>spring-security-mvc-digest-auth</module>
                 <module>spring-security-mvc-ldap</module>
                 <module>spring-security-mvc-login</module>
@@ -637,65 +731,73 @@
                 <module>spring-security-mvc-socket</module>
                 <module>spring-security-openid</module>
                 <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+                <module>spring-security-rest</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-stormpath</module>
+                <module>spring-security-thymeleaf</module>
                 <module>spring-security-x509</module>
-                <module>spring-security-mvc-custom</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-static-resources</module>
+                <module>spring-swagger-codegen</module>
                 
-                <module>spark-java</module>
-                <module>saas</module>
+                <module>spring-thymeleaf</module>
+                
+                <module>spring-userservice</module>
+                
+                <module>spring-vault</module>
+                <module>spring-vertx</module>
+                
+                <module>spring-webflux-amqp</module> <!-- long -->
+                
+                <module>spring-zuul</module>
+                
+                <module>sse-jaxrs</module>
+                <module>static-analysis</module>
+                <module>stripe</module>
+                <module>structurizr</module>
                 <module>struts-2</module>
                 
-                <module>testing-modules/selenium-junit-testng</module>
+                <module>testing-modules/gatling</module>
                 <module>testing-modules/groovy-spock</module>
+                <module>testing-modules/junit-5</module>
+                <module>testing-modules/junit5-migration</module>
+                <module>testing-modules/load-testing-comparison</module>
                 <module>testing-modules/mockito</module>
                 <module>testing-modules/mockito-2</module>
                 <module>testing-modules/mocks</module>
+                <module>testing-modules/mockserver</module>
+                <module>testing-modules/parallel-tests-junit</module>
                 <module>testing-modules/rest-assured</module>
                 <module>testing-modules/rest-testing</module>
-                <module>testing-modules/junit-5</module>
-                <module>testing-modules/junit5-migration</module>
+                <!-- <module>testing-modules/runjunitfromjava</module> --> <!-- Not a maven project -->
+                <module>testing-modules/selenium-junit-testng</module>
+                <module>testing-modules/spring-testing</module>
+                <module>testing-modules/test-containers</module>
                 <module>testing-modules/testing</module>
                 <module>testing-modules/testng</module>
-                <module>testing-modules/mockserver</module>
-                <module>testing-modules/test-containers</module>
+                                
                 <module>twilio</module>
+                <module>Twitter4J</module>
                 
                 <module>undertow</module>
                 
-                <module>video-tutorials</module>
-                <module>vaadin</module>
-                <module>vertx-and-rxjava</module>
-                <module>vraptor</module>
-                <module>vertx</module>
                 <module>vavr</module>
+                <module>vertx</module>
+                <module>vertx-and-rxjava</module>
+                <module>video-tutorials</module>
+                <module>vraptor</module>
+                
+                <module>wicket</module>
                 
-                <module>xmlunit-2</module>
                 <module>xml</module>
-                
-                <!-- problematic -->
-                <!--
-                <module>logging-modules/log4j2</module>
-                <module>jmeter</module>
-                -->
-
-                <!-- heavy -->
-                <!--
-                
-                <module>geotools</module>
-                <module>jhipster/jhipster-monolithic</module>
-                <module>testing-modules/gatling</module>
-                <module>google-web-toolkit</module>
-                
-                -->
-                
-                <!-- very long running - temporarily disabled -->
-                <!-- 
-                <module>spring-amqp-simple</module>
-                <module>spring-5-data-reactive</module>
-                -->
+                <module>xmlunit-2</module>
+                <module>xstream</module>
                 
             </modules>
 
@@ -845,7 +947,7 @@
 				<module>spring-swagger-codegen/spring-swagger-codegen-app</module>
 				<module>spring-thymeleaf</module>
 				<module>spring-userservice</module>
-				<module>spring-vault                                   </module>
+				<module>spring-vault</module>
 				<module>spring-vertx</module>
 				<module>spring-zuul/spring-zuul-foos-resource</module>
 				<module>persistence-modules/spring-data-dynamodb</module>
@@ -856,6 +958,61 @@
 
 		</profile>
 
+        <profile>
+            <id>default-heavy</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <forkCount>3</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <excludes>
+                                <exclude>**/*IntegrationTest.java</exclude>
+                                <exclude>**/*IntTest.java</exclude>
+                                <exclude>**/*LongRunningUnitTest.java</exclude>
+                                <exclude>**/*ManualTest.java</exclude>
+                                <exclude>**/*JdbcTest.java</exclude>
+                                <exclude>**/*LiveTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <modules>
+                <module>parent-boot-1</module>
+                <module>parent-boot-2</module>
+                <module>parent-boot-2.0-temp</module>
+                <module>parent-spring-4</module>
+                <module>parent-spring-5</module>
+                <module>parent-java</module>
+                <module>parent-kotlin</module>
+                
+                <module>core-java</module>                
+                <module>core-java-concurrency</module> <!-- very long running? -->
+                <module>core-kotlin</module> <!-- long running? -->
+
+                <module>jenkins/hello-world</module>
+                <module>jws</module>
+
+                <module>libraries</module> <!-- very long running -->
+
+                <module>persistence-modules/hibernate5</module>
+                <module>persistence-modules/java-jpa</module>
+                <module>persistence-modules/jnosql</module>             
+
+                <module>spring-5-data-reactive</module> <!-- very long running. Fixing in BAEL-10891  -->
+                <module>spring-amqp-simple</module> <!-- very long running. Fixing in BAEL-10891 -->
+                
+                <module>vaadin</module>            
+            </modules>
+        </profile>
+        
         <profile>
             <id>integration-lite-first</id>
 
@@ -887,165 +1044,236 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
-                <module>asm</module>
-                <module>atomix</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>animal-sniffer-mvn-plugin</module>
                 <module>annotations</module>
+                <module>antlr</module>
+                <module>apache-avro</module>
+                <module>apache-bval</module>
+                <module>apache-curator</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-geode</module>
+                <module>apache-meecrowave</module>
                 <module>apache-opennlp</module>
+                <module>apache-poi</module>
+                <module>apache-pulsar</module>
+                <module>apache-shiro</module>
+                <module>apache-solrj</module>
+                <module>apache-spark</module>
+                <module>apache-thrift</module>
+                <module>apache-tika</module>
+                <module>apache-velocity</module>
+                <module>apache-zookeeper</module>
+                <module>asciidoctor</module>
+                <module>asm</module>
+                <module>atomix</module>
                 <module>autovalue</module>
+                <module>aws</module>
+                <module>aws-lambda</module>
                 <module>axon</module>
                 <module>azure</module>
-                <module>apache-velocity</module>
-                <module>apache-solrj</module>
-                <module>apache-meecrowave</module>
-                <module>antlr</module>
-                
+
                 <module>bootique</module>
-                
+
+                <module>cas/cas-secured-app</module>
+                <module>cas/cas-server</module>
                 <module>cdi</module>
-                <module>core-java-collections</module>
-                <module>core-java-io</module>
-                <module>core-java-8</module>
+                <module>checker-plugin</module>
                 <module>core-groovy</module>
-                <module>couchbase</module>
-                <!-- <module>core-java-concurrency</module> --> <!-- very long running? -->
-                <!-- <module>core-kotlin</module> --> <!-- long running? -->
-                <module>core-java</module>
+                <!-- <module>core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+                <!-- <module>core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 --> 
+                <module>core-java-8</module>
+                <!--<module>core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <module>core-java-arrays</module>
+                <module>core-java-collections</module>
+                <module>core-java-concurrency-collections</module>
+                <module>core-java-io</module>
+                <module>core-java-lang</module>
                 <module>core-java-networking</module>
-                
-                <module>dozer</module>
-                <module>disruptor</module>
-                <module>drools</module>
+                <module>core-java-sun</module>
+                <module>core-scala</module>
+                <module>couchbase</module>
+                <module>custom-pmd</module>
+                                
+                <module>dagger</module>
+                <module>data-structures</module>
+                <module>ddd</module>
                 <module>deeplearning4j</module>
+                <module>disruptor</module>
+                <module>dozer</module>
+                <module>drools</module>
+                <module>dubbo</module>             
                 
                 <module>ethereum</module>
                 
                 <module>feign</module>
                 <module>flips</module>
+                <module>flyway-cdi-extension</module>
                 
+                <module>geotools</module>
                 <module>google-cloud</module>
+                <module>google-web-toolkit</module>
+                <!-- <module>gradle</module> --> <!-- Not a maven project -->
+                <!-- <module>grails</module> --> <!-- Not a maven project -->
+                <module>graphql/graphql-java</module>
+                <module>grpc</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>guest</module> --> <!-- not to be built as its for guest articles  -->
                 <module>guice</module>
                 
                 <module>hazelcast</module>
-                <module>hystrix</module>
+                <module>helidon</module>
                 <module>httpclient</module>
+                <module>hystrix</module>
                 
                 <module>image-processing</module>
                 <module>immutables</module>
-                
+
                 <module>jackson</module>
-                <module>java-strings</module>
-                <!--<module>core-java-9</module> --> <!-- we haven't upgraded to java 9 -->
                 <module>java-collections-conversions</module>
                 <module>java-collections-maps</module>
-                <module>java-streams</module>
+                <!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+                <module>java-ee-8-security-api</module>
                 <module>java-lite</module>
                 <module>java-numbers</module>
                 <module>java-rmi</module>
+                <module>java-spi</module>
+                <module>java-streams</module>
+                <module>java-strings</module>
                 <module>java-vavr-stream</module>
+                <module>java-websocket</module>
+                <module>javafx</module>
                 <module>javax-servlets</module>
                 <module>javaxval</module>
                 <module>jaxb</module>
-                <module>javafx</module>
-                <module>jgroups</module>
                 <!-- JIRA-10842
                 <module>jee-7</module> -->
                 <module>jee-7-security</module>
+                <module>jersey</module>
+                <module>JGit</module>
+                <module>jgroups</module>
+                <module>jhipster</module>
+                <module>jib</module>
                 <module>jjwt</module>
+                <module>jmeter</module>
+                <module>jmh</module>
+                <module>jni</module>
+                <module>jooby</module>
                 <module>jsf</module>
-                <module>json-path</module>
                 <module>json</module>
+                <module>json-path</module>
                 <module>jsoup</module>
                 <module>jta</module>
-                <module>jws</module>
-                <module>jersey</module>
-                <module>java-spi</module>
-                <module>java-ee-8-security-api</module>
+
+                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+                <module>kotlin-libraries</module>
                 
-                <!-- <module>libraries</module> --> <!-- very long running -->
+                <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>libraries-data</module>
+                <module>libraries-security</module>
+                <module>libraries-server</module>
                 <module>linkrest</module>
-                <module>logging-modules/log-mdc</module>
                 <module>logging-modules/log4j</module>
+                <module>logging-modules/log4j2</module>
                 <module>logging-modules/logback</module>
+                <module>logging-modules/log-mdc</module>
                 <module>lombok</module>
                 <module>lucene</module>
-                
+
                 <module>mapstruct</module>
                 <module>maven</module>
+                <module>maven-archetype</module>
+                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+                <module>maven-polyglot/maven-polyglot-json-extension</module>
+                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
                 <module>mesos-marathon</module>
+                <module>metrics</module>
+                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+                <module>microprofile</module>
                 <module>msf4j</module>
+                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
                 <module>mvn-wrapper</module>
                 <module>mybatis</module>
-                <module>metrics</module>
-                <module>maven-archetype</module>
                 
                 <module>noexception</module>
                 
-                <module>osgi</module>
+                <module>optaplanner</module>
                 <module>orika</module>
-                                
+                <module>osgi</module>
+
                 <module>patterns</module>
                 <module>pdf</module>
-                <module>protobuffer</module>
                 <module>performance-tests</module>
+                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
+                <module>protobuffer</module>
                 
+                <module>persistence-modules/activejdbc</module>
+                <module>persistence-modules/apache-cayenne</module>
+                <module>persistence-modules/core-java-persistence</module>
+                <module>persistence-modules/deltaspike</module>
+                <module>persistence-modules/flyway</module>
+                <module>persistence-modules/hbase</module>
+                <module>persistence-modules/hibernate5</module>
+                <module>persistence-modules/influxdb</module>
+                <module>persistence-modules/java-cassandra</module>
+                <module>persistence-modules/java-cockroachdb</module>
                 <module>persistence-modules/java-jdbi</module>
-                <module>persistence-modules/redis</module>
+                <module>persistence-modules/java-jpa</module>
+                <module>persistence-modules/java-mongodb</module>
+                <module>persistence-modules/jnosql</module>
+                <module>persistence-modules/liquibase</module>
                 <module>persistence-modules/orientdb</module>
                 <module>persistence-modules/querydsl</module>
-                <module>persistence-modules/apache-cayenne</module>
+                <module>persistence-modules/redis</module>
                 <module>persistence-modules/solr</module>
-                <module>persistence-modules/spring-data-dynamodb</module>
-                <module>persistence-modules/spring-data-keyvalue</module>
-                <module>persistence-modules/spring-data-neo4j</module>
-                <module>persistence-modules/spring-data-solr</module>
-                <module>persistence-modules/spring-hibernate-5</module>
-                <module>persistence-modules/spring-data-eclipselink</module>
-                <module>persistence-modules/spring-jpa</module>
-                <module>persistence-modules/spring-hibernate-3</module>
-                <module>persistence-modules/spring-data-gemfire</module>
+                <module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
                 <module>persistence-modules/spring-boot-persistence</module>
-                <module>persistence-modules/liquibase</module>
-                <module>persistence-modules/java-cockroachdb</module>
-                <module>persistence-modules/deltaspike</module>
-                <module>persistence-modules/hbase</module>
-                <module>persistence-modules/influxdb</module>
-                <module>persistence-modules/spring-hibernate4</module>
-                <module>persistence-modules/spring-data-mongodb</module> <!-- long -->
-                <module>persistence-modules/java-cassandra</module>
+                <module>persistence-modules/spring-boot-persistence-mongodb</module>
                 <module>persistence-modules/spring-data-cassandra</module>
+                <module>persistence-modules/spring-data-cassandra-reactive</module>
                 <module>persistence-modules/spring-data-couchbase-2</module>
+                <module>persistence-modules/spring-data-dynamodb</module>
+                <module>persistence-modules/spring-data-eclipselink</module>
+                <module>persistence-modules/spring-data-elasticsearch</module>
+                <module>persistence-modules/spring-data-gemfire</module>
+                <module>persistence-modules/spring-data-jpa</module>
+                <module>persistence-modules/spring-data-keyvalue</module>
+                <module>persistence-modules/spring-data-mongodb</module> <!-- long -->
+                <module>persistence-modules/spring-data-neo4j</module>
                 <module>persistence-modules/spring-data-redis</module>
-                
-                <module>reactor-core</module>
-                <module>resteasy</module>
-								<module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
+                <module>persistence-modules/spring-data-solr</module>
+                <module>persistence-modules/spring-hibernate-3</module>
+                <module>persistence-modules/spring-hibernate-5</module>
+                <module>persistence-modules/spring-hibernate4</module>
+                <module>persistence-modules/spring-jpa</module>
+                                
                 <module>rabbitmq</module>
-                
-            </modules>
+                <!-- <module>raml</module> --> <!-- Not a maven project -->
+                <module>ratpack</module>
+                <module>reactor-core</module>
+                <module>rest-with-spark-java</module>
+                <module>resteasy</module>
+                <module>restx</module>
+                <!-- <module>rmi</module> --> <!-- Not a maven project -->
+                <module>rule-engines/easy-rules</module>
+                <module>rule-engines/openl-tablets</module>
+                <module>rule-engines/rulebook</module>
+                <module>rsocket</module>
+                <module>rxjava</module>
+                <module>rxjava-2</module>                                
+                                                 
+             </modules>
 
         </profile>
 
@@ -1080,98 +1308,120 @@
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
-                <module>spring-4</module>
-                <module>spring-5</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-5-security-oauth</module>
+                <module>saas</module>
+                <module>spark-java</module>
+                
+                <module>spring-4</module>
+                
+                <module>spring-5</module>
+                <module>spring-5-mvc</module>
+                <module>spring-5-reactive</module>
+                <module>spring-5-reactive-client</module>
+                <module>spring-5-reactive-oauth</module>
+                <module>spring-5-reactive-security</module>
+                <module>spring-5-security</module>
+                <module>spring-5-security-oauth</module>
                 
-                <module>spring-aop</module>
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
-                <module>spring-amqp</module>
                 <module>spring-all</module>
+                <module>spring-amqp</module>
+                <module>spring-aop</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>spring-boot-security</module>
-                <module>spring-boot-mvc</module>
-                <module>spring-boot-logging-log4j2</module>
-                <module>spring-boot-disable-console-logging</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-ctx-fluent</module>
-                <module>spring-boot</module>
-                <module>spring-boot-ops</module>
                 
-                <module>spring-cloud-data-flow</module>
+                <module>spring-boot</module>
+                <module>spring-boot-admin</module>
+                <module>spring-boot-angular-ecommerce</module>
+                <module>spring-boot-autoconfiguration</module>
+                <module>spring-boot-bootstrap</module>
+                <module>spring-boot-camel</module>
+                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+                <module>spring-boot-client</module>
+                <module>spring-boot-crud</module>
+                <module>spring-boot-ctx-fluent</module>
+                <module>spring-boot-custom-starter</module>
+                <module>spring-boot-disable-console-logging</module>
+                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+                <module>spring-boot-jasypt</module>
+                <module>spring-boot-keycloak</module>
+                <module>spring-boot-logging-log4j2</module>
+                <module>spring-boot-mvc</module>
+                <module>spring-boot-ops</module>
+                <module>spring-boot-property-exp</module>
+                <module>spring-boot-security</module>
+                <module>spring-boot-vue</module>
+                
                 <module>spring-cloud</module>
                 <module>spring-cloud-bus</module>
+                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                <module>spring-cloud-data-flow</module>
+                
                 <module>spring-core</module>
                 <module>spring-cucumber</module>
+                
                 <module>spring-data-rest</module>
-                <module>spring-drools</module>
+                <module>spring-data-rest-querydsl</module>
                 <module>spring-dispatcher-servlet</module>
+                <module>spring-drools</module>
+                
                 <module>spring-ejb</module>
                 <module>spring-exceptions</module>
                 
                 <module>spring-freemarker</module>
+                
+                <module>spring-groovy</module>
+                
                 <module>spring-integration</module>
                 
-                <module>spring-jinq</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-jersey</module>
+                <module>spring-jinq</module>
                 <module>spring-jms</module>
                 <module>spring-jooq</module>
+                
                 <module>spring-kafka</module>
                 <module>spring-katharsis</module>
+                
                 <module>spring-ldap</module>
                 
+                <module>spring-mobile</module>
                 <module>spring-mockito</module>
+                <module>spring-mustache</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
+                <module>spring-mvc-kotlin</module>
+                <module>spring-mvc-simple</module>
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
                 <module>spring-mvc-xml</module>
-                <module>spring-mvc-kotlin</module>
+                <module>spring-mybatis</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-remoting</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-reactive-kotlin</module>
                 <module>spring-reactor</module>
-                <module>spring-vertx</module>
-                <module>spring-vault</module>
+                <module>spring-remoting</module>
+                <module>spring-rest</module>
+                <module>spring-rest-angular</module>
                 <module>spring-rest-embedded-tomcat</module>
-                <module>spring-swagger-codegen</module>
-                <module>spring-webflux-amqp</module> <!-- long -->
+                <module>spring-rest-full</module>
+                <module>spring-rest-hal-browser</module>
+                <module>spring-rest-query-language</module>
+                <module>spring-rest-shell</module>
+                <module>spring-rest-simple</module>
+                <module>spring-rest-template</module>
+                <module>spring-resttemplate</module>
+                <module>spring-roo</module>
                 
-                <module>spring-static-resources</module>
-                <module>spring-security-thymeleaf</module>
                 <module>spring-security-acl</module>
+                <module>spring-security-angular/server</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>
@@ -1179,8 +1429,10 @@
                 <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-custom</module>
                 <module>spring-security-mvc-digest-auth</module>
                 <module>spring-security-mvc-ldap</module>
                 <module>spring-security-mvc-login</module>
@@ -1189,65 +1441,73 @@
                 <module>spring-security-mvc-socket</module>
                 <module>spring-security-openid</module>
                 <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+                <module>spring-security-rest</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-stormpath</module>
+                <module>spring-security-thymeleaf</module>
                 <module>spring-security-x509</module>
-                <module>spring-security-mvc-custom</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-static-resources</module>
+                <module>spring-swagger-codegen</module>
                 
-                <module>spark-java</module>
-                <module>saas</module>
+                <module>spring-thymeleaf</module>
+                
+                <module>spring-userservice</module>
+                
+                <module>spring-vault</module>
+                <module>spring-vertx</module>
+                
+                <module>spring-webflux-amqp</module> <!-- long -->
+                
+                <module>spring-zuul</module>
+                
+                <module>sse-jaxrs</module>
+                <module>static-analysis</module>
+                <module>stripe</module>
+                <module>structurizr</module>
                 <module>struts-2</module>
                 
-                <module>testing-modules/selenium-junit-testng</module>
+                <module>testing-modules/gatling</module>
                 <module>testing-modules/groovy-spock</module>
+                <module>testing-modules/junit-5</module>
+                <module>testing-modules/junit5-migration</module>
+                <module>testing-modules/load-testing-comparison</module>
                 <module>testing-modules/mockito</module>
                 <module>testing-modules/mockito-2</module>
                 <module>testing-modules/mocks</module>
+                <module>testing-modules/mockserver</module>
+                <module>testing-modules/parallel-tests-junit</module>
                 <module>testing-modules/rest-assured</module>
                 <module>testing-modules/rest-testing</module>
-                <module>testing-modules/junit-5</module>
-                <module>testing-modules/junit5-migration</module>
+                <!-- <module>testing-modules/runjunitfromjava</module> --> <!-- Not a maven project -->
+                <module>testing-modules/selenium-junit-testng</module>
+                <module>testing-modules/spring-testing</module>
+                <module>testing-modules/test-containers</module>
                 <module>testing-modules/testing</module>
                 <module>testing-modules/testng</module>
-                <module>testing-modules/mockserver</module>
-                <module>testing-modules/test-containers</module>
+                                
                 <module>twilio</module>
+                <module>Twitter4J</module>
                 
                 <module>undertow</module>
                 
-                <module>video-tutorials</module>
-                <module>vaadin</module>
-                <module>vertx-and-rxjava</module>
-                <module>vraptor</module>
-                <module>vertx</module>
                 <module>vavr</module>
+                <module>vertx</module>
+                <module>vertx-and-rxjava</module>
+                <module>video-tutorials</module>
+                <module>vraptor</module>
+                
+                <module>wicket</module>
                 
-                <module>xmlunit-2</module>
                 <module>xml</module>
-                
-                <!-- problematic -->
-                <!--
-                <module>logging-modules/log4j2</module>
-                <module>jmeter</module>
-                -->
-
-                <!-- heavy -->
-                <!--
-                
-                <module>geotools</module>
-                <module>jhipster/jhipster-monolithic</module>
-                <module>testing-modules/gatling</module>
-                <module>google-web-toolkit</module>
-                
-                -->
-                
-                <!-- very long running - temporarily disabled -->
-                <!-- 
-                <module>spring-amqp-simple</module>
-                <module>spring-5-data-reactive</module>
-                -->
+                <module>xmlunit-2</module>
+                <module>xstream</module>
                 
             </modules>
 
@@ -1282,9 +1542,25 @@
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
                 <module>parent-java</module>
-				<module>parent-kotlin</module>
+                <module>parent-kotlin</module>
                 
-                <!-- TODO: after we look at the build times on the new Jenkins -->
+                <module>core-java</module>                
+                <module>core-java-concurrency</module> <!-- very long running? -->
+                <module>core-kotlin</module> <!-- long running? -->
+
+                <module>jenkins/hello-world</module>
+                <module>jws</module>
+
+                <module>libraries</module> <!-- very long running -->
+
+                <module>persistence-modules/hibernate5</module>
+                <module>persistence-modules/java-jpa</module>
+                <module>persistence-modules/jnosql</module>             
+
+                <module>spring-5-data-reactive</module> <!-- very long running. Fixing in BAEL-10891  -->
+                <module>spring-amqp-simple</module> <!-- very long running. Fixing in BAEL-10891 -->
+                
+                <module>vaadin</module>
             </modules>
 
         </profile>
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 28db4a7a3d..39cda888c5 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -35,7 +35,7 @@
         <module>spring-cloud-archaius</module>
         <module>spring-cloud-functions</module>        
         <module>spring-cloud-vault</module>
-		<module>spring-cloud-security</module>
+		<!-- <module>spring-cloud-security</module> --> <!-- Fixing in BAEL-10887 -->
 		<module>spring-cloud-task</module>
         <module>spring-cloud-zuul</module>
     </modules>
diff --git a/structurizr/pom.xml b/structurizr/pom.xml
index 76b1e355f1..b9f9b68717 100644
--- a/structurizr/pom.xml
+++ b/structurizr/pom.xml
@@ -2,7 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>structurizr</artifactId>
 	<name>structurizr</name>
 
@@ -26,32 +25,24 @@
         <dependency>
             <groupId>com.structurizr</groupId>
             <artifactId>structurizr-client</artifactId>
-            <version>${structurizr-client.version}</version>
+            <version>${structurizr.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-analysis</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-plantuml</artifactId>
+            <version>${structurizr.version}</version>
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
-        </repository>
-    </repositories>
-
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <structurizr.version>1.0.0-RC3</structurizr.version>
-        <structurizr-client.version>0.6.0</structurizr-client.version>
-        <spring.version>4.3.8.RELEASE</spring.version>
+        <structurizr.version>1.0.0-RC5</structurizr.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java b/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
index 6eb0c7de73..b33a1d9a77 100644
--- a/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
+++ b/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
@@ -4,12 +4,10 @@ import java.io.File;
 import java.io.StringWriter;
 
 import com.structurizr.Workspace;
-import com.structurizr.api.StructurizrClient;
-import com.structurizr.api.StructurizrClientException;
-import com.structurizr.componentfinder.ComponentFinder;
-import com.structurizr.componentfinder.ReferencedTypesSupportingTypesStrategy;
-import com.structurizr.componentfinder.SourceCodeComponentFinderStrategy;
-import com.structurizr.componentfinder.SpringComponentFinderStrategy;
+import com.structurizr.analysis.ComponentFinder;
+import com.structurizr.analysis.ReferencedTypesSupportingTypesStrategy;
+import com.structurizr.analysis.SourceCodeComponentFinderStrategy;
+import com.structurizr.analysis.SpringComponentFinderStrategy;
 import com.structurizr.io.WorkspaceWriterException;
 import com.structurizr.io.plantuml.PlantUMLWriter;
 import com.structurizr.model.Component;
@@ -112,11 +110,6 @@ public class StructurizrSimple {
         view.addAllContainers();
     }
 
-    private static void uploadToExternal(Workspace workspace) throws StructurizrClientException {
-        StructurizrClient client = new StructurizrClient("e94bc0c9-76ef-41b0-8de7-82afc1010d04", "78d555dd-2a31-487c-952c-50508f1da495");
-        client.putWorkspace(32961L, workspace);
-    }
-
     private static void exportToPlantUml(View view) throws WorkspaceWriterException {
         StringWriter stringWriter = new StringWriter();
         PlantUMLWriter plantUMLWriter = new PlantUMLWriter();