From 1c1cf0fdc91507f83b9c828df5e3f6a2e279d253 Mon Sep 17 00:00:00 2001
From: Juan Vaccari <juan.vaccari@gfk.com>
Date: Thu, 11 Jul 2019 23:54:29 +0100
Subject: [PATCH 1/2] BAEL-2928 - Create new spring-di project with examples
 for Qualifier annotation article

---
 pom.xml                                       |   4 +
 spring-di/pom.xml                             | 101 ++++++++++++++++++
 .../main/java/org/baeldung/sample/App.java    |  11 ++
 .../java/org/baeldung/sample/AppConfig.java   |  10 ++
 .../main/java/org/baeldung/sample/Bar.java    |   5 +
 .../org/baeldung/sample/BarFormatter.java     |  13 +++
 .../main/java/org/baeldung/sample/Foo.java    |   5 +
 .../main/java/org/baeldung/sample/FooDAO.java |   5 +
 .../org/baeldung/sample/FooFormatter.java     |  13 +++
 .../java/org/baeldung/sample/FooService.java  |  17 +++
 .../java/org/baeldung/sample/Formatter.java   |   7 ++
 .../org/baeldung/sample/FormatterType.java    |  17 +++
 .../sample/FooServiceIntegrationTest.java     |  22 ++++
 13 files changed, 230 insertions(+)
 create mode 100644 spring-di/pom.xml
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/App.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/AppConfig.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/Bar.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/BarFormatter.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/Foo.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/FooDAO.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/FooFormatter.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/FooService.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/Formatter.java
 create mode 100644 spring-di/src/main/java/org/baeldung/sample/FormatterType.java
 create mode 100644 spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java

diff --git a/pom.xml b/pom.xml
index f24a307d9e..45c84ffb11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -669,6 +669,8 @@
                 <module>spring-data-rest-querydsl</module>
                 <module>spring-dispatcher-servlet</module>
                 <module>spring-drools</module>
+                <module>spring-di</module>
+
 
                 <module>spring-ehcache</module>
                 <module>spring-ejb</module>
@@ -871,6 +873,7 @@
 				<module>spring-data-rest</module>
 				<module>spring-dispatcher-servlet</module>
 				<module>spring-drools</module>
+				<module>spring-di</module>
 				<module>spring-ehcache</module>
 				<module>spring-freemarker</module>
 				<module>persistence-modules/spring-hibernate-3</module>
@@ -1336,6 +1339,7 @@
                 <module>spring-data-rest-querydsl</module>
                 <module>spring-dispatcher-servlet</module>
                 <module>spring-drools</module>
+                <module>spring-di</module>
 
 				<module>spring-ehcache</module>
                 <module>spring-ejb</module>
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
new file mode 100644
index 0000000000..62456ba31c
--- /dev/null
+++ b/spring-di/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <artifactId>spring-di</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${org.springframework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${org.springframework.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <finalName>spring-di</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+    <properties>
+        <start-class>org.baeldung.org.baeldung.sample.App</start-class>
+        <!-- Spring -->
+        <org.springframework.version>5.0.6.RELEASE</org.springframework.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-di/src/main/java/org/baeldung/sample/App.java b/spring-di/src/main/java/org/baeldung/sample/App.java
new file mode 100644
index 0000000000..17fc49fc8c
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/App.java
@@ -0,0 +1,11 @@
+package org.baeldung.sample;
+
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+public class App {
+    public static void main(String[] args) {
+        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(AppConfig.class);
+        FooService fooService = ctx.getBean(FooService.class);
+        fooService.doStuff();
+    }
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/AppConfig.java b/spring-di/src/main/java/org/baeldung/sample/AppConfig.java
new file mode 100644
index 0000000000..8a177d2611
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/AppConfig.java
@@ -0,0 +1,10 @@
+package org.baeldung.sample;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan("org.baeldung.sample")
+public class AppConfig {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Bar.java b/spring-di/src/main/java/org/baeldung/sample/Bar.java
new file mode 100644
index 0000000000..54e8d54418
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Bar.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Bar {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java b/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java
new file mode 100644
index 0000000000..8396653970
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/BarFormatter.java
@@ -0,0 +1,13 @@
+package org.baeldung.sample;
+
+import org.springframework.stereotype.Component;
+
+@FormatterType("Bar")
+@Component
+public class BarFormatter implements Formatter {
+
+    public String format() {
+        return "bar";
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Foo.java b/spring-di/src/main/java/org/baeldung/sample/Foo.java
new file mode 100644
index 0000000000..562a00121a
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Foo.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class Foo {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooDAO.java b/spring-di/src/main/java/org/baeldung/sample/FooDAO.java
new file mode 100644
index 0000000000..151c0c38de
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooDAO.java
@@ -0,0 +1,5 @@
+package org.baeldung.sample;
+
+public class FooDAO {
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java b/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java
new file mode 100644
index 0000000000..68cb7f81f2
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooFormatter.java
@@ -0,0 +1,13 @@
+package org.baeldung.sample;
+
+import org.springframework.stereotype.Component;
+
+@FormatterType("Foo")
+@Component
+public class FooFormatter implements Formatter {
+
+    public String format() {
+        return "foo";
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FooService.java b/spring-di/src/main/java/org/baeldung/sample/FooService.java
new file mode 100644
index 0000000000..711711f205
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FooService.java
@@ -0,0 +1,17 @@
+package org.baeldung.sample;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FooService {
+
+    @Autowired
+    @FormatterType("Foo")
+    private Formatter formatter;
+
+    public String doStuff() {
+        return formatter.format();
+    }
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/Formatter.java b/spring-di/src/main/java/org/baeldung/sample/Formatter.java
new file mode 100644
index 0000000000..ab29c2b848
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/Formatter.java
@@ -0,0 +1,7 @@
+package org.baeldung.sample;
+
+public interface Formatter {
+
+    String format();
+
+}
diff --git a/spring-di/src/main/java/org/baeldung/sample/FormatterType.java b/spring-di/src/main/java/org/baeldung/sample/FormatterType.java
new file mode 100644
index 0000000000..a00a9750bf
--- /dev/null
+++ b/spring-di/src/main/java/org/baeldung/sample/FormatterType.java
@@ -0,0 +1,17 @@
+package org.baeldung.sample;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Qualifier
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FormatterType {
+
+    String value();
+
+}
diff --git a/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java b/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
new file mode 100644
index 0000000000..6b518395a1
--- /dev/null
+++ b/spring-di/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java
@@ -0,0 +1,22 @@
+package org.baeldung.sample;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class, loader = AnnotationConfigContextLoader.class)
+public class FooServiceIntegrationTest {
+
+    @Autowired
+    FooService fooService;
+
+    @Test
+    public void whenFooFormatterType_thenReturnFoo() {
+        Assert.assertEquals("foo", fooService.doStuff());
+    }
+}

From c1920ddaaba38796b3105ec3fb3f2eb50acc2df9 Mon Sep 17 00:00:00 2001
From: Juan Vaccari <juan.vaccari@gfk.com>
Date: Mon, 5 Aug 2019 17:48:18 +0100
Subject: [PATCH 2/2] BAEL-2928 - Solve conflicts in pom.xml

---
 pom.xml | 1687 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 846 insertions(+), 841 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45c84ffb11..0f7e0edd3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
+		 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>parent-modules</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-    <name>parent-modules</name>
+	<name>parent-modules</name>
 	<packaging>pom</packaging>
 
-    <modules>
-        <module>quarkus</module>
-    </modules>
-
 	<dependencies>
 		<!-- logging -->
 		<dependency>
@@ -57,11 +53,11 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
 			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
-        </dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
@@ -123,22 +119,22 @@
 					</excludes>
 				</configuration>
 				<dependencies>
-                                    <dependency>
-	                                <groupId>org.junit.platform</groupId>
-	                                <artifactId>junit-platform-surefire-provider</artifactId>
-	                                <version>${junit-platform.version}</version>
-	                            </dependency>
-	                            <dependency>
-	                                <groupId>org.junit.jupiter</groupId>
-	                                <artifactId>junit-jupiter-engine</artifactId>
-	                                <version>${junit-jupiter.version}</version>
-	                            </dependency>
-                                    <dependency>
-                                        <groupId>org.junit.vintage</groupId>
-                                        <artifactId>junit-vintage-engine</artifactId>
-  	                                <version>${junit-jupiter.version}</version>
-                                    </dependency>
-                                </dependencies>
+					<dependency>
+						<groupId>org.junit.platform</groupId>
+						<artifactId>junit-platform-surefire-provider</artifactId>
+						<version>${junit-platform.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit-jupiter.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.junit.vintage</groupId>
+						<artifactId>junit-vintage-engine</artifactId>
+						<version>${junit-jupiter.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -312,6 +308,10 @@
 						<configuration>
 							<forkCount>3</forkCount>
 							<reuseForks>true</reuseForks>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
 							<excludes>
 								<exclude>**/*IntegrationTest.java</exclude>
 								<exclude>**/*IntTest.java</exclude>
@@ -328,66 +328,67 @@
 
 			<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>akka-http</module> --> <!-- Unit test is failing -->
-                <module>akka-streams</module>
-                <module>algorithms-genetic</module>
-                <module>algorithms-miscellaneous-1</module>
-                <module>algorithms-miscellaneous-2</module>
-                <module>algorithms-miscellaneous-3</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-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>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
+				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+				<module>akka-streams</module>
+				<module>algorithms-genetic</module>
+				<module>algorithms-miscellaneous-1</module>
+				<module>algorithms-miscellaneous-2</module>
+				<module>algorithms-miscellaneous-3</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-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>blade</module>
+				<module>blade</module>
 
-                <module>bootique</module>
+				<module>bootique</module>
 
-                <module>cas</module>
-                <module>cdi</module>
-                <module>checker-plugin</module>
-                <module>core-groovy</module>
-                <module>core-groovy-2</module>
-		<module>core-groovy-collections</module>
-                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
-                <module>core-java-modules/core-java-8</module>
-                <module>core-java-modules/core-java-8-2</module>
+				<module>cas</module>
+				<module>cdi</module>
+				<module>checker-plugin</module>
+				<module>core-groovy</module>
+				<module>core-groovy-2</module>
+				<module>core-groovy-collections</module>
+				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
+				<module>core-java-modules/core-java-8</module>
+				<module>core-java-modules/core-java-8-2</module>
 				<module>core-java-modules/core-java-lambdas</module>
                 <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
                 <module>core-java-modules/core-java-arrays</module>
+                <module>core-java-modules/core-java-arrays-2</module>
                 <module>core-java-modules/core-java-collections</module>
                 <module>core-java-modules/core-java-collections-list</module>
                 <module>core-java-modules/core-java-collections-list-2</module>
@@ -422,7 +423,6 @@
                 <module>drools</module>
                 <module>dubbo</module>
 
-                <module>easy-random</module>
                 <module>ethereum</module>
 
                 <module>feign</module>
@@ -462,12 +462,14 @@
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
                 <module>java-lite</module>
                 <module>java-numbers</module>
+                <module>java-numbers-2</module>
                 <module>java-rmi</module>
                 <module>java-spi</module>
                 <module>java-streams</module>
                 <!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <module>java-strings</module>
                 <module>java-strings-2</module>
+                <module>java-strings-ops</module>
                 <module>java-vavr-stream</module>
                 <module>java-websocket</module>
                 <module>javafx</module>
@@ -476,329 +478,326 @@
                 <module>jaxb</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>jhipster-5</module>
-                <module>jib</module>
-                <module>jjwt</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-                <module>jni</module>
-                <module>jooby</module>
-                <module>jsf</module>
-                <module>json</module>
-                <module>json-path</module>
-                <module>jsoup</module>
-                <module>jta</module>
+				<module>jee-7-security</module>
+				<module>jersey</module>
+				<module>jgit</module>
+				<module>jgroups</module>
+				<module>jhipster-5</module>
+				<module>jib</module>
+				<module>jjwt</module>
+				<module>jmeter</module>
+				<module>jmh</module>
+				<module>jni</module>
+				<module>jooby</module>
+				<module>jsf</module>
+				<module>json</module>
+				<module>json-path</module>
+				<module>jsoup</module>
+				<module>jta</module>
 
-                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-                <module>kotlin-libraries</module>
-                <module>kotlin-libraries-2</module>
+				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+				<module>kotlin-libraries</module>
+				<module>kotlin-libraries-2</module>
 
-                <!-- <module>lagom</module> --> <!-- Not a maven project -->
-                <module>libraries</module>
-                <module>libraries-2</module>
-                <module>libraries-data</module>
-                <module>libraries-apache-commons</module>
-                <module>libraries-primitive</module>
-                <module>libraries-security</module>
-                <module>libraries-server</module>
-                <module>libraries-http</module>
-                <module>linkrest</module>
-                <module>logging-modules</module>
-                <module>lombok</module>
-                <module>lucene</module>
+				<!-- <module>lagom</module> --> <!-- Not a maven project -->
+				<module>libraries</module>
+				<module>libraries-2</module>
+				<module>libraries-data</module>
+				<module>libraries-apache-commons</module>
+				<module>libraries-primitive</module>
+				<module>libraries-security</module>
+				<module>libraries-server</module>
+				<module>libraries-http</module>
+				<module>libraries-io</module>
+				<module>linkrest</module>
+				<module>logging-modules</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>mybatis</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>mybatis</module>
 
 
-                <module>optaplanner</module>
-                <module>orika</module>
-                <module>osgi</module>
+				<module>optaplanner</module>
+				<module>orika</module>
+				<module>osgi</module>
 
-                <module>patterns</module>
-                <module>pdf</module>
-                <module>performance-tests</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
-                <module>protobuffer</module>
+				<module>patterns</module>
+				<module>pdf</module>
+				<module>performance-tests</module>
+				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
+				<module>protobuffer</module>
 
-                <module>persistence-modules</module>
-		<module>quarkus</module>
+				<module>persistence-modules</module>
+				<module>quarkus</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</module>
+				<module>rabbitmq</module>
+				<!-- <module>raml</module> --> <!-- Not a maven project -->
+				<module>ratpack</module>
+				<module>reactor-core</module>
+				<module>resteasy</module>
+				<module>restx</module>
+				<!-- <module>rmi</module> --> <!-- Not a maven project -->
+				<module>rule-engines</module>
 				<module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
-			    <module>software-security/sql-injection-samples</module>
+				<module>rxjava</module>
+				<module>rxjava-2</module>
+				<module>software-security/sql-injection-samples</module>
 
 				<module>tensorflow-java</module>
 				<module>spring-boot-flowable</module>
 				<module>spring-security-kerberos</module>
-				<module>morphia</module>
-
+				<module>oauth2-framework-impl</module>
 			</modules>
 
 		</profile>
 
-        <profile>
-            <id>default-second</id>
-            <build>
-                <plugins>
+		<profile>
+			<id>default-second</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>
+					<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>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
+							<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>
+				</plugins>
+			</build>
 
-            <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>
+			<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>saas</module>
-                <module>spark-java</module>
+				<module>saas</module>
+				<module>spark-java</module>
 
-                <module>spring-4</module>
+				<module>spring-4</module>
 
-                <module>spring-5</module>
-                <module>spring-5-webflux</module>
-                <module>spring-5-data-reactive</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-5-security-cognito</module>
+				<module>spring-5</module>
+				<module>spring-5-webflux</module>
+				<module>spring-5-data-reactive</module>
+				<module>spring-5-mvc</module>
+				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</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-5-security-cognito</module>
 
-                <module>spring-activiti</module>
-                <module>spring-akka</module>
-                <module>spring-all</module>
-                <module>spring-amqp</module>
-                <module>spring-amqp-simple</module>
-                <module>spring-aop</module>
-                <module>spring-apache-camel</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
+				<module>spring-activiti</module>
+				<module>spring-akka</module>
+				<module>spring-all</module>
+				<module>spring-amqp</module>
+				<module>spring-amqp-simple</module>
+				<module>spring-aop</module>
+				<module>spring-apache-camel</module>
+				<module>spring-batch</module>
+				<module>spring-bom</module>
 
-                <module>spring-boot</module>
-                <module>spring-boot-admin</module>
-                <module>spring-boot-angular</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</module>
+				<module>spring-boot-admin</module>
+				<module>spring-boot-angular</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-mvc-birt</module>
-                <module>spring-boot-ops</module>
-                <module>spring-boot-ops-2</module>
-                <module>spring-boot-rest</module>
-                <module>spring-boot-data</module>
-                <module>spring-boot-parent</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-security</module>
-                <module>spring-boot-testing</module>
-                <module>spring-boot-vue</module>
-                <module>spring-boot-libraries</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-kotlin</module>
+				<module>spring-boot-logging-log4j2</module>
+				<module>spring-boot-mvc</module>
+				<module>spring-boot-mvc-birt</module>
+				<module>spring-boot-ops</module>
+				<module>spring-boot-ops-2</module>
+				<module>spring-boot-rest</module>
+				<module>spring-boot-data</module>
+				<module>spring-boot-parent</module>
+				<module>spring-boot-property-exp</module>
+				<module>spring-boot-security</module>
+				<module>spring-boot-testing</module>
+				<module>spring-boot-vue</module>
+				<module>spring-boot-libraries</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-cloud</module> --> <!-- BAEL-14304 -->
+				<!-- <module>spring-cloud-bus</module> --> <!-- BAEL-14304 -->
+				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                                <!-- <module>spring-cloud-data-flow</module> --> <!-- BAEL-14304 -->
 
-                <module>spring-core</module>
-                <module>spring-core-2</module>
-                <module>spring-cucumber</module>
+				<module>spring-core</module>
+				<module>spring-core-2</module>
+				<module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-querydsl</module>
-                <module>spring-dispatcher-servlet</module>
-                <module>spring-drools</module>
-                <module>spring-di</module>
+				<module>spring-data-rest</module>
+				<!-- <module>spring-data-rest-querydsl</module> --> <!-- BAEL-14304 -->
+				<module>spring-dispatcher-servlet</module>
+				<module>spring-drools</module>
+				<module>spring-di</module>
 
+				<module>spring-ehcache</module>
+				<!-- <module>spring-ejb</module> BAEL-14304 -->
+				<module>spring-exceptions</module>
 
-                <module>spring-ehcache</module>
-                <module>spring-ejb</module>
-                <module>spring-exceptions</module>
+				<module>spring-freemarker</module>
 
-                <module>spring-freemarker</module>
+				<module>spring-groovy</module>
 
-                <module>spring-groovy</module>
+				<module>spring-integration</module>
 
-                <module>spring-integration</module>
+				<module>spring-jenkins-pipeline</module>
+				<module>spring-jersey</module>
+				<module>spring-jinq</module>
+				<module>spring-jms</module>
+				<module>spring-jooq</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-kafka</module>
-                <module>spring-katharsis</module>
+				<module>spring-ldap</module>
 
-                <module>spring-ldap</module>
+				<module>spring-mobile</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-kotlin</module>
+				<module>spring-mvc-simple</module>
+				<module>spring-mvc-simple-2</module>
+				<module>spring-mvc-velocity</module>
+				<module>spring-mvc-webflow</module>
+				<module>spring-mvc-xml</module>
 
-                <module>spring-mobile</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-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
-                <module>spring-mvc-velocity</module>
-                <module>spring-mvc-webflow</module>
-                <module>spring-mvc-xml</module>
+				<module>spring-protobuf</module>
+				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
 
-                <module>spring-protobuf</module>
-                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+				<module>spring-quartz</module>
 
-                <module>spring-quartz</module>
+				<module>spring-reactive-kotlin</module>
+				<module>spring-reactor</module>
+				<module>spring-remoting</module>
+				<module>spring-rest</module>
+				<module>spring-rest-angular</module>
+				<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-resttemplate</module>
+				<module>spring-roo</module>
+				<module>spring-security-acl</module>
+				<module>spring-security-angular/server</module>
+				<module>spring-security-cache-control</module>
 
-                <module>spring-reactive-kotlin</module>
-                <module>spring-reactor</module>
-                <module>spring-remoting</module>
-                <module>spring-rest</module>
-                <module>spring-rest-angular</module>
-                <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-resttemplate</module>
-                <module>spring-roo</module>
-                <module>spring-security-acl</module>
-                <module>spring-security-angular/server</module>
-                <module>spring-security-cache-control</module>
-
-                <module>spring-security-client</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-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-jsonview</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> --> <!-- 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-sso</module>
-                <module>spring-security-stormpath</module>
-                <module>spring-security-thymeleaf</module>
-                <module>spring-security-x509</module>
-                <module>spring-session</module>
-                <module>spring-sleuth</module>
-                <module>spring-soap</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>spring-security-mvc-ldap</module>
+				<module>spring-security-mvc-login</module>
+				<module>spring-security-mvc-persisted-remember-me</module>
+				<module>spring-security-mvc</module>
+				<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-sso</module>
+				<module>spring-security-stormpath</module>
+				<module>spring-security-thymeleaf</module>
+				<module>spring-security-x509</module>
+				<!-- <module>spring-session</module> BAEL-14304 -->
+				<module>spring-sleuth</module>
+				<module>spring-soap</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>spring-thymeleaf</module>
+				<module>spring-thymeleaf</module>
 
-                <module>spring-userservice</module>
+				<!-- <module>spring-vault</module> BAEL-14304 -->
+				<module>spring-vertx</module>
 
-                <module>spring-vault</module>
-                <module>spring-vertx</module>
+				<!-- <module>spring-webflux-amqp</module> BAEL-14304 --> <!-- long --> 
 
-                <module>spring-webflux-amqp</module> <!-- long -->
+				<module>spring-zuul</module>
 
-                <module>spring-zuul</module>
+				<module>static-analysis</module>
+				<module>stripe</module>
+				<module>structurizr</module>
+				<module>struts-2</module>
 
-                <module>static-analysis</module>
-                <module>stripe</module>
-                <module>structurizr</module>
-                <module>struts-2</module>
+				<module>testing-modules</module>
 
-                <module>testing-modules</module>
+				<module>twilio</module>
+				<module>twitter4j</module>
 
-                <module>twilio</module>
-                <module>Twitter4J</module>
+				<module>undertow</module>
 
-                <module>undertow</module>
+				<module>vertx</module>
+				<module>vertx-and-rxjava</module>
+				<module>video-tutorials</module>
+				<module>vraptor</module>
 
-                <module>vavr</module>
-                <module>vertx</module>
-                <module>vertx-and-rxjava</module>
-                <module>video-tutorials</module>
-                <module>vraptor</module>
+				<module>wicket</module>
 
-                <module>wicket</module>
-
-                <module>xml</module>
-                <module>xmlunit-2</module>
-                <module>xstream</module>
+				<module>xml</module>
+				<module>xstream</module>
 
 				<module>tensorflow-java</module>
 				<module>spring-boot-flowable</module>
 				<module>spring-security-kerberos</module>
-				<module>morphia</module>
 
-            </modules>
+			</modules>
 
-        </profile>
+		</profile>
 
 		<profile>
 			<id>spring-context</id>
@@ -825,6 +824,7 @@
 				<module>spring-5</module>
 				<module>spring-5-data-reactive</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</module>
 				<module>spring-5-reactive-client</module>
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-security</module>
@@ -843,6 +843,7 @@
 				<module>spring-boot-camel</module>
 				<module>spring-boot-client</module>
 				<module>spring-boot-custom-starter</module>
+				<module>spring-boot-di</module>
 		 		<module>greeter-spring-boot-autoconfigure</module>
 				<module>greeter-spring-boot-sample-app</module>
 				<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
@@ -909,14 +910,13 @@
 				<module>spring-security-acl</module>
 				<module>spring-security-angular</module>
 				<module>spring-security-cache-control</module>
-				<module>spring-security-client</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-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
+				<module>spring-security-mvc</module>
 				<module>spring-security-mvc-socket</module>
 				<module>spring-security-rest</module>
 				<module>spring-security-sso</module>
@@ -931,7 +931,6 @@
 				<module>spring-state-machine</module>
 				<module>spring-swagger-codegen/spring-swagger-codegen-app</module>
 				<module>spring-thymeleaf</module>
-				<module>spring-userservice</module>
 				<module>spring-vault</module>
 				<module>spring-vertx</module>
 				<module>spring-zuul/spring-zuul-foos-resource</module>
@@ -947,572 +946,576 @@
 
 		</profile>
 
-        <profile>
-            <id>default-heavy</id>
-            <build>
-                <plugins>
+		<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>
+					<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>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
+							<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>
+				</plugins>
+			</build>
 
-            <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>
+			<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>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
-                <module>core-kotlin</module> <!-- long running? -->
-                <module>core-kotlin-2</module>
-                <module>core-kotlin-io</module>
+				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+				<module>core-kotlin</module> <!-- long running? -->
+				<module>core-kotlin-2</module>
+				<module>core-kotlin-io</module>
 
-                <module>jenkins/hello-world</module>
-                <module>jws</module>
+				<module>jenkins/hello-world</module>
+				<module>jhipster</module>
+				<module>jws</module>
 
-                <module>libraries</module> <!-- very long running -->
+				<module>libraries</module> <!-- very long running -->
+				<module>persistence-modules/hibernate5</module>
+				<module>persistence-modules/hibernate-mapping</module>
+				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
+				<module>persistence-modules/java-mongodb</module>
+				<module>persistence-modules/jnosql</module>
 
-                <module>persistence-modules/hibernate5</module>
-		<module>persistence-modules/hibernate-mapping</module>
-                <module>persistence-modules/java-jpa</module>
-                <module>persistence-modules/java-mongodb</module>
-                <module>persistence-modules/jnosql</module>
+				<module>vaadin</module>
+				<module>vavr</module>
+			</modules>
+		</profile>
 
-                <module>vaadin</module>
-            </modules>
-        </profile>
+		<profile>
+			<id>integration-lite-first</id>
 
-        <profile>
-            <id>integration-lite-first</id>
+			<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>
 
-            <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>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
+				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+				<module>akka-streams</module>
+				<module>algorithms-genetic</module>
+				<module>algorithms-miscellaneous-1</module>
+				<module>algorithms-miscellaneous-2</module>
+				<module>algorithms-miscellaneous-3</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-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>
 
-            <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>akka-http</module> --> <!-- Unit test is failing -->
-                <module>akka-streams</module>
-                <module>algorithms-genetic</module>
-                <module>algorithms-miscellaneous-1</module>
-                <module>algorithms-miscellaneous-2</module>
-                <module>algorithms-miscellaneous-3</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-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>bootique</module>
 
-                <module>bootique</module>
+				<module>cas</module>
+				<module>cdi</module>
+				<module>checker-plugin</module>
+				<module>core-groovy</module>
+				<module>core-groovy-2</module>
+				<module>core-groovy-collections</module>
+				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+				<module>core-java-modules/core-java-8</module>
+				<module>core-java-modules/core-java-8-2</module>
+				<!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
+				<module>core-java-modules/core-java-arrays</module>
+				<module>core-java-modules/core-java-arrays-2</module>
+				<module>core-java-modules/core-java-collections</module>
+				<module>core-java-modules/core-java-collections-list</module>
+				<module>core-java-modules/core-java-collections-list-2</module>
+				<module>core-java-modules/core-java-collections-array-list</module>
+				<module>core-java-modules/core-java-collections-set</module>
+				<module>core-java-modules/core-java-concurrency-basic</module>
+				<module>core-java-modules/core-java-concurrency-collections</module>
+				<module>core-java-modules/core-java-io</module>
+				<module>core-java-modules/core-java-nio</module>
+				<module>core-java-modules/core-java-security</module>
+				<module>core-java-modules/core-java-lang-syntax</module>
+				<module>core-java-modules/core-java-lang</module>
+				<module>core-java-modules/core-java-lang-oop</module>
+				<module>core-java-modules/core-java-lang-oop-2</module>
+				<module>core-java-modules</module>
+				<module>core-java-modules/core-java-networking</module>
+				<module>core-java-modules/core-java-perf</module>
+				<module>core-java-modules/core-java-sun</module>
+				<module>core-scala</module>
+				<module>couchbase</module>
+				<module>custom-pmd</module>
 
-                <module>cas</module>
-                <module>cdi</module>
-                <module>checker-plugin</module>
-                <module>core-groovy</module>
-                <module>core-groovy-2</module>
-                <module>core-groovy-collections</module>
-                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <module>core-java-modules/core-java-8</module>
-                <module>core-java-modules/core-java-8-2</module>
-                <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
-                <module>core-java-modules/core-java-arrays</module>
-                <module>core-java-modules/core-java-collections</module>
-                <module>core-java-modules/core-java-collections-list</module>
-                <module>core-java-modules/core-java-collections-list-2</module>
-                <module>core-java-modules/core-java-collections-array-list</module>
-                <module>core-java-modules/core-java-collections-set</module>
-                <module>core-java-modules/core-java-concurrency-basic</module>
-                <module>core-java-modules/core-java-concurrency-collections</module>
-                <module>core-java-modules/core-java-io</module>
-                <module>core-java-modules/core-java-nio</module>
-                <module>core-java-modules/core-java-security</module>
-                <module>core-java-modules/core-java-lang-syntax</module>
-                <module>core-java-modules/core-java-lang</module>
-                <module>core-java-modules/core-java-lang-oop</module>
-                <module>core-java-modules/core-java-lang-oop-2</module>
-                <module>core-java-modules</module>
-                <module>core-java-modules/core-java-networking</module>
-                <module>core-java-modules/core-java-perf</module>
-                <module>core-java-modules/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>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>ethereum</module>
+				<module>feign</module>
+				<module>flyway-cdi-extension</module>
 
-                <module>feign</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</module>
+				<!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
+				<module>guice</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</module>
-                <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
-                <module>guice</module>
+				<module>hazelcast</module>
+				<module>helidon</module>
+				<module>httpclient</module>
+				<module>httpclient-simple</module>
+				<module>hystrix</module>
 
-                <module>hazelcast</module>
-                <module>helidon</module>
-                <module>httpclient</module>
-                <module>httpclient-simple</module>
-                <module>hystrix</module>
+				<module>image-processing</module>
+				<module>immutables</module>
 
-                <module>image-processing</module>
-                <module>immutables</module>
-
-                <module>jackson</module>
-                <module>jackson-2</module>
-                <module>jackson-simple</module>
-                <module>java-collections-conversions</module>
-                <module>java-collections-maps</module>
-                <module>java-collections-maps-2</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-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <module>java-strings</module>
-                <module>java-strings-2</module>
-                <module>java-vavr-stream</module>
-                <module>java-websocket</module>
-                <module>javafx</module>
-                <module>javax-servlets</module>
-                <module>javaxval</module>
-                <module>jaxb</module>
-                <!-- JIRA-10842
+				<module>jackson</module>
+				<module>jackson-2</module>
+				<module>jackson-simple</module>
+				<module>java-collections-conversions</module>
+				<module>java-collections-maps</module>
+				<module>java-collections-maps-2</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-numbers-2</module>
+				<module>java-rmi</module>
+				<module>java-spi</module>
+				<module>java-streams</module>
+				<!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<module>java-strings</module>
+				<module>java-strings-2</module>
+				<module>java-strings-ops</module>
+				<module>java-vavr-stream</module>
+				<module>java-websocket</module>
+				<module>javafx</module>
+				<module>javax-servlets</module>
+				<module>javaxval</module>
+				<module>jaxb</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>jhipster-5</module>
-                <module>jib</module>
-                <module>jjwt</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-                <module>jni</module>
-                <module>jooby</module>
-                <module>jsf</module>
-                <module>json</module>
-                <module>json-path</module>
-                <module>jsoup</module>
-                <module>jta</module>
+				<module>jee-7-security</module>
+				<module>jersey</module>
+				<module>jgit</module>
+				<module>jgroups</module>
+				<module>jhipster-5</module>
+				<module>jib</module>
+				<module>jjwt</module>
+				<module>jmeter</module>
+				<module>jmh</module>
+				<module>jni</module>
+				<module>jooby</module>
+				<module>jsf</module>
+				<module>json</module>
+				<module>json-path</module>
+				<module>jsoup</module>
+				<module>jta</module>
 
-                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-                <module>kotlin-libraries</module>
+				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+				<module>kotlin-libraries</module>
 
-                <!-- <module>lagom</module> --> <!-- Not a maven project -->
-                <module>libraries</module>
-                <module>libraries-data</module>
-                <module>libraries-apache-commons</module>
-                <module>libraries-security</module>
-                <module>libraries-server</module>
-                <module>libraries-http</module>
-                <module>linkrest</module>
-                <module>logging-modules</module>
-                <module>lombok</module>
-                <module>lucene</module>
+				<!-- <module>lagom</module> --> <!-- Not a maven project -->
+				<module>libraries</module>
+				<module>libraries-data</module>
+				<module>libraries-apache-commons</module>
+				<module>libraries-security</module>
+				<module>libraries-server</module>
+				<module>libraries-http</module>
+				<module>linkrest</module>
+				<module>logging-modules</module>
+				<module>lombok</module>
+				<module>lucene</module>
 
-                <module>mapstruct</module>
-                <module>maven</module>
-                <!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
-                <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>mybatis</module>
+				<module>mapstruct</module>
+				<module>maven</module>
+				<!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
+				<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>mybatis</module>
 
 
-                <module>optaplanner</module>
-                <module>orika</module>
-                <module>osgi</module>
+				<module>optaplanner</module>
+				<module>orika</module>
+				<module>osgi</module>
 
-                <module>patterns</module>
-                <module>pdf</module>
-                <module>performance-tests</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
-                <module>protobuffer</module>
+				<module>patterns</module>
+				<module>pdf</module>
+				<module>performance-tests</module>
+				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
+				<module>protobuffer</module>
 
-                <module>persistence-modules</module>
+				<module>persistence-modules</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</module>
-                <module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
+				<module>rabbitmq</module>
+				<!-- <module>raml</module> --> <!-- Not a maven project -->
+				<module>ratpack</module>
+				<module>reactor-core</module>
+				<module>resteasy</module>
+				<module>restx</module>
+				<!-- <module>rmi</module> --> <!-- Not a maven project -->
+				<module>rule-engines</module>
+				<module>rsocket</module>
+				<module>rxjava</module>
+				<module>rxjava-2</module>
+				<module>oauth2-framework-impl</module>
 
-             </modules>
+			</modules>
 
-        </profile>
+		</profile>
 
-        <profile>
-            <id>integration-lite-second</id>
+		<profile>
+			<id>integration-lite-second</id>
 
-            <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>
+			<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>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</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>saas</module>
-                <module>spark-java</module>
+				<module>saas</module>
+				<module>spark-java</module>
 
-                <module>spring-4</module>
+				<module>spring-4</module>
 
-                <module>spring-5</module>
-                <module>spring-5-data-reactive</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-5-security-cognito</module>
-                <module>spring-activiti</module>
-                <module>spring-akka</module>
-                <module>spring-all</module>
-                <module>spring-amqp</module>
-                <module>spring-amqp-simple</module>
-                <module>spring-aop</module>
-                <module>spring-apache-camel</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
+				<module>spring-5</module>
+				<module>spring-5-data-reactive</module>
+				<module>spring-5-mvc</module>
+				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</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-5-security-cognito</module>
+				<module>spring-activiti</module>
+				<module>spring-akka</module>
+				<module>spring-all</module>
+				<module>spring-amqp</module>
+				<module>spring-amqp-simple</module>
+				<module>spring-aop</module>
+				<module>spring-apache-camel</module>
+				<module>spring-batch</module>
+				<module>spring-bom</module>
 
-                <module>spring-boot</module>
-                <module>spring-boot-admin</module>
-                <module>spring-boot-angular</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-mvc-birt</module>
-                <module>spring-boot-ops</module>
-                <module>spring-boot-ops-2</module>
-                <module>spring-boot-rest</module>
-                <module>spring-boot-data</module>
-                <module>spring-boot-parent</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-security</module>
-                <module>spring-boot-vue</module>
+				<module>spring-boot</module>
+				<module>spring-boot-admin</module>
+				<module>spring-boot-angular</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-mvc-birt</module>
+				<module>spring-boot-ops</module>
+				<module>spring-boot-ops-2</module>
+				<module>spring-boot-rest</module>
+				<module>spring-boot-data</module>
+				<module>spring-boot-parent</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-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-core-2</module>
-                <module>spring-cucumber</module>
+				<module>spring-core</module>
+				<module>spring-core-2</module>
+				<module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-querydsl</module>
-                <module>spring-dispatcher-servlet</module>
-                <module>spring-drools</module>
-                <module>spring-di</module>
+				<module>spring-data-rest</module>
+				<module>spring-data-rest-querydsl</module>
+				<module>spring-dispatcher-servlet</module>
+				<module>spring-drools</module>
+				<module>spring-di</module>
 
 				<module>spring-ehcache</module>
-                <module>spring-ejb</module>
-                <module>spring-exceptions</module>
+				<module>spring-ejb</module>
+				<module>spring-exceptions</module>
 
-                <module>spring-freemarker</module>
+				<module>spring-freemarker</module>
 
-                <module>spring-groovy</module>
+				<module>spring-groovy</module>
 
-                <module>spring-integration</module>
+				<module>spring-integration</module>
 
-                <module>spring-jenkins-pipeline</module>
-                <module>spring-jersey</module>
-                <module>spring-jinq</module>
-                <module>spring-jms</module>
-                <module>spring-jooq</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-kafka</module>
+				<module>spring-katharsis</module>
 
-                <module>spring-ldap</module>
+				<module>spring-ldap</module>
 
-                <module>spring-mobile</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-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
-                <module>spring-mvc-velocity</module>
-                <module>spring-mvc-webflow</module>
-                <module>spring-mvc-xml</module>
+				<module>spring-mobile</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-kotlin</module>
+				<module>spring-mvc-simple</module>
+				<module>spring-mvc-simple-2</module>
+				<module>spring-mvc-velocity</module>
+				<module>spring-mvc-webflow</module>
+				<module>spring-mvc-xml</module>
 
-                <module>spring-protobuf</module>
-                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+				<module>spring-protobuf</module>
+				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
 
-                <module>spring-quartz</module>
+				<module>spring-quartz</module>
 
-                <module>spring-reactive-kotlin</module>
-                <module>spring-reactor</module>
-                <module>spring-remoting</module>
-                <module>spring-rest</module>
-                <module>spring-rest-angular</module>
-                <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-resttemplate</module>
-                <module>spring-roo</module>
+				<module>spring-reactive-kotlin</module>
+				<module>spring-reactor</module>
+				<module>spring-remoting</module>
+				<module>spring-rest</module>
+				<module>spring-rest-angular</module>
+				<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-resttemplate</module>
+				<module>spring-roo</module>
 
-                <module>spring-security-acl</module>
-                <module>spring-security-angular/server</module>
-                <module>spring-security-cache-control</module>
+				<module>spring-security-acl</module>
+				<module>spring-security-angular/server</module>
+				<module>spring-security-cache-control</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>
+				<module>spring-security-mvc-persisted-remember-me</module>
+				<module>spring-security-mvc</module>
+				<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-sso</module>
+				<module>spring-security-stormpath</module>
+				<module>spring-security-thymeleaf</module>
+				<module>spring-security-x509</module>
+				<module>spring-session</module>
+				<module>spring-sleuth</module>
+				<module>spring-soap</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>spring-security-client</module>
+				<module>spring-thymeleaf</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>
-                <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> --> <!-- 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-sso</module>
-                <module>spring-security-stormpath</module>
-                <module>spring-security-thymeleaf</module>
-                <module>spring-security-x509</module>
-                <module>spring-session</module>
-                <module>spring-sleuth</module>
-                <module>spring-soap</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>spring-vault</module>
+				<module>spring-vertx</module>
 
-                <module>spring-thymeleaf</module>
+				<module>spring-webflux-amqp</module> <!-- long -->
 
-                <module>spring-userservice</module>
+				<module>spring-zuul</module>
 
-                <module>spring-vault</module>
-                <module>spring-vertx</module>
+				<module>static-analysis</module>
+				<module>stripe</module>
+				<module>structurizr</module>
+				<module>struts-2</module>
 
-                <module>spring-webflux-amqp</module> <!-- long -->
+				<module>testing-modules</module>
 
-                <module>spring-zuul</module>
+				<module>twilio</module>
+				<module>twitter4j</module>
 
-                <module>static-analysis</module>
-                <module>stripe</module>
-                <module>structurizr</module>
-                <module>struts-2</module>
+				<module>undertow</module>
 
-                <module>testing-modules</module>
+				<module>vertx</module>
+				<module>vertx-and-rxjava</module>
+				<module>video-tutorials</module>
+				<module>vraptor</module>
 
-                <module>twilio</module>
-                <module>Twitter4J</module>
+				<module>wicket</module>
 
-                <module>undertow</module>
+				<module>xml</module>
+				<module>xstream</module>
+			</modules>
 
-                <module>vavr</module>
-                <module>vertx</module>
-                <module>vertx-and-rxjava</module>
-                <module>video-tutorials</module>
-                <module>vraptor</module>
+		</profile>
 
-                <module>wicket</module>
+		<profile>
+			<id>integration-heavy</id>
 
-                <module>xml</module>
-                <module>xmlunit-2</module>
-                <module>xstream</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>
 
-            </modules>
+			<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>
 
-        </profile>
+				<module>core-java-modules/core-java</module>
+				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+				<module>core-kotlin</module> <!-- long running? -->
+				<module>core-kotlin-2</module>
 
-        <profile>
-            <id>integration-heavy</id>
+				<module>jenkins/hello-world</module>
+				<module>jhipster</module>
+				<module>jws</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>libraries</module> <!-- very long running -->
 
-            <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>persistence-modules/hibernate5</module>
+				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
+				<module>persistence-modules/java-mongodb</module>
+				<module>persistence-modules/jnosql</module>
 
-                <module>core-java-modules/core-java</module>
-                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
-                <module>core-kotlin</module> <!-- long running? -->
-                <module>core-kotlin-2</module>
+				<module>vaadin</module>
+				<module>vavr</module>
+			</modules>
 
-                <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/java-mongodb</module>
-                <module>persistence-modules/jnosql</module>
-
-                <module>vaadin</module>
-            </modules>
-
-        </profile>
+		</profile>
 
 
 	</profiles>
@@ -1546,7 +1549,7 @@
 		<logback.version>1.1.7</logback.version>
 
 		<!-- plugins -->
-                <!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
+		<!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
 		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
@@ -1561,6 +1564,7 @@
 		<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
 		<commons-io.version>2.5</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
+		<commons-lang3.version>3.5</commons-lang3.version>
 		<commons-cli.version>1.4</commons-cli.version>
 		<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
 		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -1582,4 +1586,5 @@
 		<lombok.version>1.16.12</lombok.version>
 		<h2.version>1.4.197</h2.version>
 	</properties>
-</project>
+
+</project>
\ No newline at end of file