This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new c690b79 SHIRO-696 - Upgrade Jetty
new 876c853 Merge pull request #142 from coheigea/jetty_upgrade
c690b79 is described below
commit c690b79e9afb29948dfacdac993a2b771558c40f
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Jun 6 12:53:00 2019 +0100
SHIRO-696 - Upgrade Jetty
---
.../guice3/src/main/webapp/WEB-INF/web.xml | 6 ++--
.../guice4/src/main/webapp/WEB-INF/web.xml | 6 ++--
integration-tests/support/pom.xml | 35 +++++++++++++++++++++-
pom.xml | 6 ++--
samples/guice/src/main/webapp/WEB-INF/web.xml | 6 ++--
samples/servlet-plugin/pom.xml | 6 ----
samples/web/src/main/webapp/WEB-INF/web.xml | 6 ++--
7 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/integration-tests/guice3/src/main/webapp/WEB-INF/web.xml
b/integration-tests/guice3/src/main/webapp/WEB-INF/web.xml
index 46567d4..b158ae4 100644
--- a/integration-tests/guice3/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/guice3/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<listener>
<listener-class>org.apache.shiro.samples.guice.SampleShiroGuiceBootstrap</listener-class>
diff --git a/integration-tests/guice4/src/main/webapp/WEB-INF/web.xml
b/integration-tests/guice4/src/main/webapp/WEB-INF/web.xml
index 46567d4..b158ae4 100644
--- a/integration-tests/guice4/src/main/webapp/WEB-INF/web.xml
+++ b/integration-tests/guice4/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<listener>
<listener-class>org.apache.shiro.samples.guice.SampleShiroGuiceBootstrap</listener-class>
diff --git a/integration-tests/support/pom.xml
b/integration-tests/support/pom.xml
index 5e6ace4..32f63cd 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -64,6 +64,16 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>${jetty.version}</version>
</dependency>
@@ -76,6 +86,29 @@
<dependency>
<groupId>com.github.mjeanroy</groupId>
<artifactId>junit-servers-jetty</artifactId>
+ <!-- Exclude Jetty 9.2 artifacts -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -94,4 +127,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 9b4682a..1f940cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<hazelcast.version>3.12</hazelcast.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
<jdk.version>1.8</jdk.version>
- <jetty.version>9.3.0.M1</jetty.version>
+ <jetty.version>9.4.18.v20190429</jetty.version>
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
modules' OSGi metadata: -->
<quartz.version>1.6.1</quartz.version>
@@ -105,14 +105,14 @@
<spring-boot.version>1.5.19.RELEASE</spring-boot.version>
<guice.version>3.0</guice.version>
<jaxrs.api.version>2.0.1</jaxrs.api.version>
- <htmlunit.version>2.23</htmlunit.version>
+ <htmlunit.version>2.35.0</htmlunit.version>
<!-- Test 3rd-party dependencies: -->
<easymock.version>3.4</easymock.version>
<gmaven.version>1.5</gmaven.version>
<groovy.version>2.4.7</groovy.version>
<junit.version>4.12</junit.version>
- <junit.server.jetty.version>0.4.2</junit.server.jetty.version>
+ <junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>4.2.21.Final</hibernate.version>
<hibernate.annotations.version>3.5.6-Final</hibernate.annotations.version>
<taglib.standard.version>1.1.2</taglib.standard.version>
diff --git a/samples/guice/src/main/webapp/WEB-INF/web.xml
b/samples/guice/src/main/webapp/WEB-INF/web.xml
index 46567d4..b158ae4 100644
--- a/samples/guice/src/main/webapp/WEB-INF/web.xml
+++ b/samples/guice/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<listener>
<listener-class>org.apache.shiro.samples.guice.SampleShiroGuiceBootstrap</listener-class>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index 3c9c373..700dca0 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -107,12 +107,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.mjeanroy</groupId>
- <artifactId>junit-servers-jetty</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.shiro.integrationtests</groupId>
<artifactId>shiro-its-support</artifactId>
<scope>test</scope>
diff --git a/samples/web/src/main/webapp/WEB-INF/web.xml
b/samples/web/src/main/webapp/WEB-INF/web.xml
index e4839d1..379b042 100644
--- a/samples/web/src/main/webapp/WEB-INF/web.xml
+++ b/samples/web/src/main/webapp/WEB-INF/web.xml
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee";
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<listener>
<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
