Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-9696

parent-boot-2/pom.xml

@@ -17,7 +17,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-       			<version>2.0.4.RELEASE</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -41,7 +41,7 @@
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>2.0.4.RELEASE</version>
+					<version>${spring-boot.version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -73,6 +73,6 @@
         <rest-assured.version>3.1.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.11.RELEASE</thin.version>
+        <spring-boot.version>2.0.5.RELEASE</spring-boot.version>
     </properties>
-
-</project>
+</project>

pom.xml

@@ -491,7 +491,6 @@
 				<module>spring-core</module>
 				<module>spring-cucumber</module>
 				<module>spring-ejb</module>
-				<module>spring-ejb/spring-ejb-client</module>
 				<module>spring-aop</module>
 				<module>persistence-modules/spring-data-cassandra</module>
 				<module>persistence-modules/spring-data-couchbase-2</module>
@@ -1034,7 +1033,6 @@
 				<module>spring-core</module>
 				<module>spring-cucumber</module>
 				<module>spring-ejb</module>
-				<module>spring-ejb/spring-ejb-client</module>
 				<module>spring-aop</module>
 				<module>persistence-modules/spring-data-cassandra</module>
 				<module>persistence-modules/spring-data-couchbase-2</module>
@@ -1393,7 +1391,6 @@
 				<module>spring-core</module>
 				<module>spring-cucumber</module>
 				<module>spring-ejb</module>
-				<module>spring-ejb/spring-ejb-client</module>
 				<module>spring-aop</module>
 
 				<module>persistence-modules/spring-data-dynamodb</module>

spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml

@@ -7,11 +7,23 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>spring-boot-custom-starter</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../spring-boot-custom-starter</relativePath>
     </parent>
+	
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -19,9 +31,27 @@
             <artifactId>greeter-spring-boot-starter</artifactId>
             <version>${greeter-starter.version}</version>
         </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
+	
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<version>${spring-boot.version}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 
     <properties>
+	    <spring-boot.version>1.5.15.RELEASE</spring-boot.version>
         <greeter-starter.version>0.0.1-SNAPSHOT</greeter-starter.version>
     </properties>
 

spring-boot-custom-starter/pom.xml

@@ -18,5 +18,6 @@
         <module>greeter-spring-boot-starter</module>
         <module>greeter-spring-boot-sample-app</module>
     </modules>
+	
 
 </project>

spring-ejb/pom.xml

@@ -73,6 +73,7 @@
     <modules>
         <module>ejb-remote-for-spring</module>
         <module>ejb-beans</module>
+		<module>spring-ejb-client</module>
     </modules>
     
     <properties>

spring-ejb/spring-ejb-client/pom.xml

@@ -10,11 +10,22 @@
     <description>Spring EJB Client</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <groupId>com.baeldung.spring.ejb</groupId>
+        <artifactId>spring-ejb</artifactId>
+        <version>1.0.1</version>
     </parent>
+	
+	<dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+       			<version>2.0.4.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -54,6 +65,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.0.4.RELEASE</version>
             </plugin>
         </plugins>
     </build>