diff --git a/examples/hawkbit-example-app/pom.xml b/examples/hawkbit-example-app/pom.xml
index f501d5529..15d802792 100644
--- a/examples/hawkbit-example-app/pom.xml
+++ b/examples/hawkbit-example-app/pom.xml
@@ -107,26 +107,6 @@
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-starter</artifactId>
       </dependency>
-      <!-- Log4j API and Core implementation required for binding -->
-      <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-api</artifactId>
-      </dependency>
-      <!-- Logging binding for java-util-logging e.g. Tomcat -->
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>jul-to-slf4j</artifactId>
-      </dependency>
-      <!-- Logging binding for Jakarta Commons Logging -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-      </dependency>
-      <!-- Logging binding for Log4J Logging -->
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>log4j-over-slf4j</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.springframework.security</groupId>
          <artifactId>spring-security-aspects</artifactId>
diff --git a/pom.xml b/pom.xml
index c05f8c692..899e3abbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
    <parent>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
-      <version>1.3.6.RELEASE</version>
+      <version>1.3.7.RELEASE</version>
    </parent>
 
    <groupId>org.eclipse.hawkbit</groupId>
@@ -61,18 +61,13 @@
    <properties>
       <java.version>1.8</java.version>
    
-      <spring.boot.version>1.3.6.RELEASE</spring.boot.version>
+      <spring.boot.version>1.3.7.RELEASE</spring.boot.version>
 
       <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
       <!-- Newer versions needed than defined in Boot-->
       <spring-cloud-connectors.version>1.2.0.RELEASE</spring-cloud-connectors.version>
-<<<<<<< Upstream, based on master
       <spring-amqp.version>1.6.1.RELEASE</spring-amqp.version>
-=======
-      <spring-amqp.version>1.6.0.RELEASE</spring-amqp.version>
-      <rabbitmq.version>3.6.2</rabbitmq.version>
-      <spring-security.version>4.1.1.RELEASE</spring-security.version>
->>>>>>> e285495 Fixed tests.
+      <spring-security.version>4.1.2.RELEASE</spring-security.version>
       <!--  Support for MongoDB 3 -->
       <mongodb.version>3.2.2</mongodb.version>
       <!-- Spring boot version overrides - END -->