Author: painter
Date: Mon Oct 8 03:07:07 2018
New Revision: 1843103
URL: http://svn.apache.org/viewvc?rev=1843103&view=rev
Log:
Updating to servlet-api 4.0.1, Disable cache module for now (fails to build),
builds clean with jdk8 (broken for open-jdk-11, profiles?)
Modified:
turbine/fulcrum/trunk/hsqldb/src/test/test.properties
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test-jaas/WEB-INF/web.xml
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test/WEB-INF/web.xml
turbine/fulcrum/trunk/localization/pom.xml
turbine/fulcrum/trunk/parser/pom.xml
turbine/fulcrum/trunk/pom.xml
turbine/fulcrum/trunk/security/api/pom.xml
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/testcontainer/pom.xml
turbine/fulcrum/trunk/upload/pom.xml
Modified: turbine/fulcrum/trunk/hsqldb/src/test/test.properties
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/hsqldb/src/test/test.properties?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/hsqldb/src/test/test.properties (original)
+++ turbine/fulcrum/trunk/hsqldb/src/test/test.properties Mon Oct 8 03:07:07
2018
@@ -1,5 +1,5 @@
#HSQL Database Engine 1.8.0.10
-#Thu Oct 04 11:15:54 EDT 2018
+#Sun Oct 07 22:55:34 EDT 2018
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Mon Oct 8 03:07:07 2018
@@ -112,7 +112,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test-jaas/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test-jaas/WEB-INF/web.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
---
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test-jaas/WEB-INF/web.xml
(original)
+++
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test-jaas/WEB-INF/web.xml
Mon Oct 8 03:07:07 2018
@@ -1,8 +1,8 @@
-<web-app
- xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
- version="2.5">
+<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">
<display-name>JAAS Test</display-name>
Modified:
turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test/WEB-INF/web.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test/WEB-INF/web.xml
(original)
+++ turbine/fulcrum/trunk/jetty/src/test/jetty/webapps/test/WEB-INF/web.xml Mon
Oct 8 03:07:07 2018
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app
- xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
- version="2.5">
+<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">
<display-name>Test WebApp</display-name>
Modified: turbine/fulcrum/trunk/localization/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/pom.xml (original)
+++ turbine/fulcrum/trunk/localization/pom.xml Mon Oct 8 03:07:07 2018
@@ -90,7 +90,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/parser/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/pom.xml (original)
+++ turbine/fulcrum/trunk/parser/pom.xml Mon Oct 8 03:07:07 2018
@@ -81,7 +81,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: turbine/fulcrum/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pom.xml (original)
+++ turbine/fulcrum/trunk/pom.xml Mon Oct 8 03:07:07 2018
@@ -32,7 +32,9 @@
<inceptionYear>2001</inceptionYear>
<modules>
+ <!--
<module>cache</module>
+ -->
<module>commonsemail</module>
<module>configuration/impl</module>
<module>crypto</module>
Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Mon Oct 8 03:07:07 2018
@@ -57,7 +57,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Mon Oct 8 03:07:07 2018
@@ -104,7 +104,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Mon Oct 8 03:07:07 2018
@@ -83,7 +83,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Mon Oct 8 03:07:07 2018
@@ -82,7 +82,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Mon Oct 8 03:07:07 2018
@@ -73,7 +73,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Modified: turbine/fulcrum/trunk/upload/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/pom.xml?rev=1843103&r1=1843102&r2=1843103&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/pom.xml (original)
+++ turbine/fulcrum/trunk/upload/pom.xml Mon Oct 8 03:07:07 2018
@@ -81,7 +81,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
