From 5227348692bfef0ea6eef2223a80e343e583aea4 Mon Sep 17 00:00:00 2001
From: Alessio Stalla <alessiostalla@gmail.com>
Date: Sun, 27 Oct 2019 10:17:53 +0100
Subject: [PATCH] #BAEL-10229 Fix the build (restore the Ethereum module as it
 was because it's mixing different Spring and Spring Boot versions)

---
 ethereum/pom.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index f340c311a8..148909e787 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -1,31 +1,35 @@
 <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">
+         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.ethereum</groupId>
     <artifactId>ethereum</artifactId>
     <name>ethereum</name>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
+
         <!-- Spring Boot Dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <version>${spring.boot.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
+            <version>${spring.boot.version}</version>
         </dependency>
 
         <!-- Spring Dependencies -->
@@ -109,6 +113,12 @@
         </dependency>
 
         <!-- Spring Testing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <version>${spring.boot.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -198,12 +208,11 @@
     <properties>
         <ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
         <web3j.core.version>3.3.1</web3j.core.version>
-        <spring.version>5.1.9.RELEASE</spring.version>
+        <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
         <mockito.version>2.21.0</mockito.version>
         <jsonpath.version>2.4.0</jsonpath.version>
         <logback.version>1.2.3</logback.version>
         <slf4j.version>1.7.25</slf4j.version>
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
-
 </project>