From 2617686ec04537efd42719ac69e2611b9d962ba3 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Mon, 3 Dec 2018 12:10:40 +0000
Subject: [PATCH] ATS-137: Update to Spring Boot 2.1.1 (Spring 5.1.3) -
 including Micrometer 1.1.1

- also remove earlier workaround for Java 11 (see ATS-71)
---
 alfresco-transformer-base/pom.xml | 27 ---------------------------
 pom.xml                           | 14 ++------------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 6019d919..ea03749a 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -42,33 +42,6 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-transform-data-model</artifactId>
         </dependency>
-
-        <!-- ATS-71: override mockito & byte-buddy (for JDK 11) -->
-        <!-- Revisit (& remove if possible) when we upgrade Spring Boot Starter Parent (eg. 2.0.5 to 2.1) -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>2.22.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>1.9.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-agent</artifactId>
-            <version>1.9.0</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 21cbe9fe..3ca0c5d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.1.1.RELEASE</version>
         <relativePath />
     </parent>
 
@@ -19,7 +19,7 @@
         <image.tag>latest</image.tag>
         <dependency.pdfbox.version>2.0.8</dependency.pdfbox.version>
         <dependency.fabric8.version>3.5.37</dependency.fabric8.version>
-        <dependency.spring-boot.version>2.0.5.RELEASE</dependency.spring-boot.version>
+        <dependency.spring-boot.version>2.1.1.RELEASE</dependency.spring-boot.version>
         <dependency.alfresco-core.version>7.3</dependency.alfresco-core.version>
         <dependency.alfresco-data-model.version>8.8</dependency.alfresco-data-model.version>
         <dependency.alfresco-jodconverter-core.version>3.0.1.1</dependency.alfresco-jodconverter-core.version>
@@ -75,16 +75,6 @@
                 <artifactId>cxf-rt-transports-http</artifactId>
                 <version>3.2.6</version>
             </dependency>
-
-
-            <!-- ATS-71: override mockito & byte-buddy (for JDK 11) -->
-            <!-- Revisit (& remove if possible) when we upgrade Spring Boot Starter Parent (eg. 2.0.5 to 2.1) -->
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>2.22.0</version>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>