Merge branch 'hotfix/2.3.16.2'
Conflicts:
apps/blank/pom.xml
apps/jboss-blank/pom.xml
apps/mailreader/pom.xml
apps/pom.xml
apps/portlet/pom.xml
apps/rest-showcase/pom.xml
apps/showcase/pom.xml
archetypes/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
core/src/main/resources/struts-default.xml
plugins/cdi/pom.xml
plugins/codebehind/pom.xml
plugins/config-browser/pom.xml
plugins/convention/pom.xml
plugins/dojo/pom.xml
plugins/dwr/pom.xml
plugins/embeddedjsp/pom.xml
plugins/gxp/pom.xml
plugins/jasperreports/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/pom.xml
plugins/jsf/pom.xml
plugins/json/pom.xml
plugins/junit/pom.xml
plugins/osgi/pom.xml
plugins/oval/pom.xml
plugins/pell-multipart/pom.xml
plugins/plexus/pom.xml
plugins/pom.xml
plugins/portlet-tiles/pom.xml
plugins/portlet/pom.xml
plugins/rest/pom.xml
plugins/sitegraph/pom.xml
plugins/sitemesh/pom.xml
plugins/spring/pom.xml
plugins/struts1/pom.xml
plugins/testng/pom.xml
plugins/tiles/pom.xml
plugins/tiles3/pom.xml
pom.xml
xwork-core/pom.xml
diff --git a/pom.xml b/pom.xml
index f0f950d..29846ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>struts2-plugins</artifactId>
<groupId>org.apache.struts</groupId>
- <version>2.3.16.3-SNAPSHOT</version>
+ <version>2.3.16.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/main/resources/template/ajax/theme.properties b/src/main/resources/template/ajax/theme.properties
index 4a1b3c1..b862fe5 100644
--- a/src/main/resources/template/ajax/theme.properties
+++ b/src/main/resources/template/ajax/theme.properties
@@ -18,3 +18,4 @@
# specific language governing permissions and limitations
# under the License.
#
+parent = xhtml
\ No newline at end of file
diff --git a/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java b/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
index e20722f..a3bf453 100644
--- a/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
+++ b/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java
@@ -119,8 +119,7 @@
session,
new ApplicationMap(pageContext.getServletContext()),
request,
- response,
- pageContext.getServletContext());
+ response);
// let's not set the locale -- there is a test that checks if Dispatcher actually picks this up...
// ... but generally we want to just use no locale (let it stay system default)
extraContext.remove(ActionContext.LOCALE);
