fix conflicts

spring-boot-exceptions/pom.xml

@@ -17,10 +17,6 @@
     <name>pass-exception-to-client-json-spring-boot</name>
     <description>Baeldung article code on how to pass exceptions to client in JSON format using Spring Boot</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>