Merge pull request #373 from JCgH4164838Gh792C124B5/local_26x_TagBodyEscapeCtrl
Proposed fix for WW-5022 (escape html tag body control flag)
diff --git a/bundles/admin/src/main/resources/static/js/shell.js b/bundles/admin/src/main/resources/static/js/shell.js
index eb7877d..8f3486e 100644
--- a/bundles/admin/src/main/resources/static/js/shell.js
+++ b/bundles/admin/src/main/resources/static/js/shell.js
@@ -29,8 +29,8 @@
result_div.appendChild(document.createElement('br'));
for (var line_index in result_array) {
- var result_wrap = document.createElement('pre')
- line = document.createTextNode(result_array[line_index]);
+ var result_wrap = document.createElement('pre');
+ var line = document.createTextNode(result_array[line_index]);
result_wrap.appendChild(line);
result_div.appendChild(result_wrap);
result_div.appendChild(document.createElement('br'));
diff --git a/core/src/site/confluence/ww-template-autoexport.html b/core/src/site/confluence/ww-template-autoexport.html
index 7ed5eb2..0d0c24f 100644
--- a/core/src/site/confluence/ww-template-autoexport.html
+++ b/core/src/site/confluence/ww-template-autoexport.html
@@ -92,7 +92,7 @@
<body onload="init()">
<table border="0" cellpadding="2" cellspacing="0" width="100%">
<tr class="topBar">
- <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+ <td align="left" valign="middle" class="topBarDiv" nowrap>
$autoexport.breadcrumbs($page)
</td>
<td align="right" valign="middle" nowrap>
diff --git a/pom.xml b/pom.xml
index 6c1704a..43c40c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,18 +98,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
- <spring.platformVersion>4.3.24.RELEASE</spring.platformVersion>
- <ognl.version>3.2.10</ognl.version>
+ <!-- dependency versions in alphanumeric order -->
<asm.version>7.1</asm.version>
+ <jackson.version>2.10.0</jackson.version>
+ <log4j2.version>2.12.1</log4j2.version>
+ <ognl.version>3.2.10</ognl.version>
+ <slf4j.version>1.7.28</slf4j.version>
+ <spring.platformVersion>4.3.25.RELEASE</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>
- <log4j2.version>2.11.1</log4j2.version>
- <jackson.version>2.9.9</jackson.version>
- <!-- FIXME: drop once a new 2.9.10 will be out and all packages will be in sync -->
- <jackson-databind.version>2.9.9.3</jackson-databind.version>
<!-- Site generation -->
- <fluido-skin.version>1.7</fluido-skin.version>
+ <fluido-skin.version>1.8</fluido-skin.version>
<!-- Sonar -->
<sonar.host.url>https://builds.apache.org/analysis/</sonar.host.url>
@@ -223,7 +223,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
+ <version>0.8.4</version>
<executions>
<execution>
<id>prepare-agent</id>
@@ -1070,12 +1070,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.26</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.26</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -1136,7 +1136,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-databind.version}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -1149,7 +1149,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>4.1</version>
+ <version>4.2</version>
</dependency>
<dependency>
