This is an automated email from the ASF dual-hosted git repository.
painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new 359b6df Rollback servlet-api dependencies to 3.1 until next release
359b6df is described below
commit 359b6dfffc4a7fc729294271a9c9311152827011
Author: jlpainter <[email protected]>
AuthorDate: Tue Oct 9 10:24:23 2018 -0400
Rollback servlet-api dependencies to 3.1 until next release
---
src/main/resources/archetype-resources/pom.xml | 2 +-
.../archetype-resources/src/main/webapp/WEB-INF/web.xml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/archetype-resources/pom.xml
b/src/main/resources/archetype-resources/pom.xml
index 5874ab4..7e95fc3 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -285,7 +285,7 @@ under the License.
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 045b05a..3c1b0bc 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
license agreements. See the NOTICE file distributed with this work for
additional
information regarding copyright ownership. The ASF licenses this file
to
@@ -9,11 +9,11 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
-<web-app version="4.0"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<!--
======================================================================== -->
<!-- -->
<!-- Web Application descriptor -->
