use thymeleaf version 3.0.2, fix job details page with div elements i…

…nstead of spans
otto-de · Nov 22, 2016 · c81e91f · c81e91f
1 parent fc4a45f
commit c81e91f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 # Release History
 
+## Release 0.79.1
+* **[edison]** Upgrade thymeleaf to version 3.0.2.RELEASE
+* **[edison-jobs]** jobdetails page uses div tags instead of spans
+
 ## Release 0.79.0
 * **[edison]** Upgrade spring boot to 1.4.2.RELEASE
 * **[edison]** Upgrade spring version to 4.3.4.RELEASE

diff --git a/build.gradle b/build.gradle
@@ -51,7 +51,7 @@ subprojects {
     // Minor Release: 0.X.0: Additional Features, updates from minor releases in Spring
     // Micro Release: 0.0.X: Bugfixes, non-breaking changes, updates from micro releases in Spring
     // DO NOT FORGET TO DOCUMENT CHANGES IN HISTORY.MD
-    version = '0.79.0'
+    version = '0.79.1'
 
     repositories {
         mavenCentral()

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -28,6 +28,10 @@ ext.libs = [
         metricsSpring: [
                 "com.ryantenney.metrics:metrics-spring:3.1.3",
                 "org.springframework:spring-context-support:" + springVersion],
+        thymeleaf3: [
+                'org.thymeleaf:thymeleaf:3.0.2.RELEASE',
+                'org.thymeleaf:thymeleaf-spring4:3.0.2.RELEASE',
+                'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.1.0' ],
         testUnit: [
                 "junit:junit:4.12",
                 "org.hamcrest:hamcrest-core:1.3",

diff --git a/edison-jobs/src/main/resources/templates/job.html b/edison-jobs/src/main/resources/templates/job.html
@@ -36,9 +36,7 @@ <h3 class="panel-title" th:text="${job.jobType}">title</h3>
                 <dd th:text="${job.lastUpdated}">&nbsp;</dd>
                 <dt>Messages</dt>
                 <dd>
-<pre class=".pre-scrollable">
-<span th:each="message : ${job.messages}" th:text="${message}" />
-</pre>
+                <pre class="pre-scrollable"><div th:each="message : ${job.messages}" th:text="${message}" ></div></pre>
                 </dd>
             </dl>
         </div>

diff --git a/edison-service/build.gradle b/edison-service/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     compile libs.bootstrap
 
     compile libs.springBootThymeleaf
+    compile libs.thymeleaf3
 
     testCompile project(":edison-testsupport")
 }