Merge pull request obsidiandynamics#231 from kchibui/junit-5

kchibui · web-flow · commit ddac069c2641 · 2021-01-08T20:04:58.000+11:00
Junit 5, bootstrap 4.5.3 bundled with popper.js, jquery 3.5.1 slim to fix tooltip, updated copyright
diff --git a/pom.xml b/pom.xml
@@ -135,10 +135,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
@@ -169,14 +165,6 @@
             <version>2.9.2</version>
         </dependency>
 
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- Spring test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/static/js/bootstrap.bundle.min.js b/src/main/resources/static/js/bootstrap.bundle.min.js
diff --git a/src/main/resources/static/js/bootstrap.bundle.min.js.map b/src/main/resources/static/js/bootstrap.bundle.min.js.map
diff --git a/src/main/resources/static/js/bootstrap.min.js b/src/main/resources/static/js/bootstrap.min.js
diff --git a/src/main/resources/static/js/jquery-3.5.1.slim.min.js b/src/main/resources/static/js/jquery-3.5.1.slim.min.js
diff --git a/src/main/resources/static/js/jquery-3.5.1.slim.min.map b/src/main/resources/static/js/jquery-3.5.1.slim.min.map
diff --git a/src/main/resources/static/js/jquery.min.js b/src/main/resources/static/js/jquery.min.js
diff --git a/src/main/resources/static/js/popper.min.js b/src/main/resources/static/js/popper.min.js
diff --git a/src/main/resources/templates/acl-overview.ftlh b/src/main/resources/templates/acl-overview.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/broker-detail.ftlh b/src/main/resources/templates/broker-detail.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/cluster-overview.ftlh b/src/main/resources/templates/cluster-overview.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/consumer-detail.ftlh b/src/main/resources/templates/consumer-detail.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/includes/footer.ftlh b/src/main/resources/templates/includes/footer.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/includes/header.ftlh b/src/main/resources/templates/includes/header.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/lib/template.ftlh b/src/main/resources/templates/lib/template.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,9 +23,8 @@
     <link type="text/css" rel="stylesheet" href="<@spring.url '/css/font-awesome.min.css'/>"/>
     <link type="text/css" rel="stylesheet" href="<@spring.url '/css/global.css'/>"/>
 
-    <script src="<@spring.url '/js/jquery.min.js'/>"></script>
-    <script src="<@spring.url '/js/popper.min.js'/>"></script>
-    <script src="<@spring.url '/js/bootstrap.min.js'/>"></script>
+    <script src="<@spring.url '/js/jquery-3.5.1.slim.min.js'/>"></script>
+    <script src="<@spring.url '/js/bootstrap.bundle.min.js'/>"></script>
     <script src="<@spring.url '/js/global.js'/>"></script>
     <script async defer src="<@spring.url '/js/github-buttons.js'/>"></script>
 
diff --git a/src/main/resources/templates/message-inspector.ftlh b/src/main/resources/templates/message-inspector.ftlh
@@ -1,6 +1,6 @@
 <#ftl output_format="HTML">
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/not-initialized.ftlh b/src/main/resources/templates/not-initialized.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/topic-create.ftlh b/src/main/resources/templates/topic-create.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/topic-detail.ftlh b/src/main/resources/templates/topic-detail.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2016 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/main/resources/templates/topic-messages.ftlh b/src/main/resources/templates/topic-messages.ftlh
@@ -1,5 +1,5 @@
 <#--
- Copyright 2019 Kafdrop contributors.
+ Copyright 2021 Kafdrop contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/src/test/java/kafdrop/AbstractIntegrationTest.java b/src/test/java/kafdrop/AbstractIntegrationTest.java
@@ -1,19 +1,19 @@
 package kafdrop;
 
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.lifecycle.Startables;
 
 import java.util.List;
 import java.util.Map;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(initializers = AbstractIntegrationTest.Initializer.class)
 abstract class AbstractIntegrationTest {
