Update to Spring Boot 2.2.x

pom.xml

@@ -10,7 +10,7 @@
     <description>For when you have a Kafka cluster to monitor</description>
 
     <properties>
-        <spring.boot.version>2.1.8.RELEASE</spring.boot.version>
+        <spring.boot.version>2.2.10.RELEASE</spring.boot.version>
         <additionalparam>-Xdoclint:none</additionalparam>
 
         <!-- name of parameter changed in latest mvn javadoc plugin version-->
@@ -86,16 +86,6 @@
             <artifactId>lombok</artifactId>
             <version>1.18.8</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.28</version>
-        </dependency>
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
@@ -133,18 +123,21 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.undertow</groupId>
-            <artifactId>undertow-core</artifactId>
-            <version>2.0.26.Final</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/kafdrop/config/HealthCheckConfiguration.java

@@ -39,7 +39,7 @@ public HealthCheck(HealthEndpoint healthEndpoint) {
 
     @ManagedAttribute
     public Map getHealth() {
-      final var health = healthEndpoint.health();
+      final var health = (Health) healthEndpoint.health();
       final var healthMap = new LinkedHashMap<String, Object>();
       healthMap.put("status", getStatus(health));
       healthMap.put("detail", getDetails(health.getDetails()));

src/main/resources/templates/acl-overview.ftl → src/main/resources/templates/acl-overview.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "ACLs">
     <style type="text/css">
         .bs-table.overview td {

src/main/resources/templates/broker-detail.ftl → src/main/resources/templates/broker-detail.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Broker: ${broker.id?string}">
     <style type="text/css">
         .bs-table.overview td {

src/main/resources/templates/cluster-overview.ftl → src/main/resources/templates/cluster-overview.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Broker List"/>
 
 <script src="<@spring.url '/js/powerFilter.js'/>"></script>

src/main/resources/templates/consumer-detail.ftl → src/main/resources/templates/consumer-detail.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Consumer: ${consumer.groupId}"/>
 
 <#setting number_format="0">

src/main/resources/templates/error.ftl → src/main/resources/templates/error.ftlh

@@ -1,5 +1,5 @@
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "${error.error}"/>
 <h2>${error.error}</h2>
 <div id="errorHeader">

src/main/resources/templates/lib/template.ftl → src/main/resources/templates/lib/template.ftlh

@@ -32,13 +32,13 @@
     <#nested>
 </head>
 <body>
-<#include "../includes/header.ftl">
+<#include "../includes/header.ftlh">
 <div class="container">
     </#macro>
 
     <#macro footer>
 </div>
-<#include "../includes/footer.ftl">
+<#include "../includes/footer.ftlh">
 <#nested>
 </body>
 </html>

src/main/resources/templates/message-inspector.ftl → src/main/resources/templates/message-inspector.ftlh

@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Topic: ${topic.name}: Messages">
     <style type="text/css">
         h2 {

src/main/resources/templates/not-initialized.ftl → src/main/resources/templates/not-initialized.ftlh

@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Initializing...">
     <meta http-equiv="refresh" content="5">
 </@template.header>

src/main/resources/templates/topic-create.ftl → src/main/resources/templates/topic-create.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Topic create"/>
 
 <script src="<@spring.url '/js/powerFilter.js'/>"></script>

src/main/resources/templates/topic-detail.ftl → src/main/resources/templates/topic-detail.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 <@template.header "Topic: ${topic.name}">
     <style type="text/css">
         #action-bar {

src/main/resources/templates/topic-messages.ftl → src/main/resources/templates/topic-messages.ftlh

@@ -14,7 +14,7 @@
  limitations under the License.
 -->
 <#import "/spring.ftl" as spring />
-<#import "lib/template.ftl" as template>
+<#import "lib/template.ftlh" as template>
 
 <@template.header "Topic: ${topic.name}: Messages">
     <style type="text/css">