Update Tomcat & Servlet API to 3.1.0
diff --git a/examples/jaxrsCxfPluginWebapp/pom.xml b/examples/jaxrsCxfPluginWebapp/pom.xml
index f4273d4..2335b1b 100644
--- a/examples/jaxrsCxfPluginWebapp/pom.xml
+++ b/examples/jaxrsCxfPluginWebapp/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/simpleWebapp/pom.xml b/examples/simpleWebapp/pom.xml
index 96864d1..343f7c7 100644
--- a/examples/simpleWebapp/pom.xml
+++ b/examples/simpleWebapp/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/springPreauthWebapp/pom.xml b/examples/springPreauthWebapp/pom.xml
index 6ba4ea6..d9dbc0f 100644
--- a/examples/springPreauthWebapp/pom.xml
+++ b/examples/springPreauthWebapp/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/springWebapp/pom.xml b/examples/springWebapp/pom.xml
index 4bf5657..f278989 100644
--- a/examples/springWebapp/pom.xml
+++ b/examples/springWebapp/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/websphereWebapp/pom.xml b/examples/websphereWebapp/pom.xml
index 85f0af5..3990ff0 100644
--- a/examples/websphereWebapp/pom.xml
+++ b/examples/websphereWebapp/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/examples/wsclientWebapp/webapp/pom.xml b/examples/wsclientWebapp/webapp/pom.xml
index c1b63ab..1a40eb1 100644
--- a/examples/wsclientWebapp/webapp/pom.xml
+++ b/examples/wsclientWebapp/webapp/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml
index ee0b494..437892b 100644
--- a/plugins/core/pom.xml
+++ b/plugins/core/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/plugins/cxf/pom.xml b/plugins/cxf/pom.xml
index f993849..0947f3b 100644
--- a/plugins/cxf/pom.xml
+++ b/plugins/cxf/pom.xml
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index a4352a4..f0aea09 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml
index 3cf2729..feb529b 100644
--- a/plugins/websphere/pom.xml
+++ b/plugins/websphere/pom.xml
@@ -35,10 +35,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <!--<version>${servlet.version}</version>-->
- <version>3.1.0</version>
- <!--<type>jar</type>-->
- <!--<scope>compile</scope>-->
+ <version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
diff --git a/pom.xml b/pom.xml
index c82b77c..58ba451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,13 +63,13 @@
<kerby.version>1.1.1</kerby.version>
<log4j.version>1.2.17</log4j.version>
<openjpa.version>3.1.0</openjpa.version>
- <servlet.version>2.5</servlet.version>
+ <servlet.version>3.1.0</servlet.version>
<slf4j.version>1.7.28</slf4j.version>
<spring.version>4.3.25.RELEASE</spring.version>
<spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
<spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
- <tomcat.version>9.0.22</tomcat.version>
+ <tomcat.version>9.0.24</tomcat.version>
<wss4j.version>2.2.4</wss4j.version>
<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index 32770cd..4b5fe39 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index 8830299..60bda7b 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/federation/oidcIdpWebapp/pom.xml b/systests/federation/oidcIdpWebapp/pom.xml
index 7baf187..d30e618 100644
--- a/systests/federation/oidcIdpWebapp/pom.xml
+++ b/systests/federation/oidcIdpWebapp/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/federation/samlIdpWebapp/pom.xml b/systests/federation/samlIdpWebapp/pom.xml
index bbfc369..8fe22a4 100644
--- a/systests/federation/samlIdpWebapp/pom.xml
+++ b/systests/federation/samlIdpWebapp/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/federation/samlWebapp/pom.xml b/systests/federation/samlWebapp/pom.xml
index 7cb4145..d8fea6c 100644
--- a/systests/federation/samlWebapp/pom.xml
+++ b/systests/federation/samlWebapp/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/jetty9/pom.xml b/systests/jetty9/pom.xml
index 96c822e..e4b63ca 100644
--- a/systests/jetty9/pom.xml
+++ b/systests/jetty9/pom.xml
@@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <tomcat8.version>8.5.34</tomcat8.version>
+ <tomcat8.version>8.5.45</tomcat8.version>
</properties>
<dependencies>
<dependency>
@@ -88,7 +88,7 @@
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
@@ -208,7 +208,7 @@
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>target/rp/</outputDirectory>
- </artifactItem>
+ </artifactItem>
<artifactItem>
<groupId>org.apache.cxf.fediz.systests.webapps</groupId>
<artifactId>fediz-systests-webapps-springPreauth</artifactId>
@@ -216,7 +216,7 @@
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>target/rp/</outputDirectory>
- </artifactItem>
+ </artifactItem>
</artifactItems>
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
<outputDirectory>target</outputDirectory>
@@ -238,7 +238,7 @@
</goals>
<configuration>
<outputDirectory>${basedir}/target/tomcat/idp/webapps/fediz-idp/WEB-INF/classes</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>${basedir}/src/test/resources/realma</directory>
<includes>
@@ -246,8 +246,8 @@
</includes>
<filtering>true</filtering>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
<execution>
<id>copy-customised-sts-config</id>
@@ -257,7 +257,7 @@
</goals>
<configuration>
<outputDirectory>${basedir}/target/tomcat/idp/webapps/fediz-idp-sts/WEB-INF</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>${basedir}/src/test/resources/realma</directory>
<includes>
@@ -265,9 +265,9 @@
</includes>
<filtering>false</filtering>
</resource>
- </resources>
- <overwrite>true</overwrite>
- </configuration>
+ </resources>
+ <overwrite>true</overwrite>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -306,5 +306,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/systests/webapps/cxfWebapp/pom.xml b/systests/webapps/cxfWebapp/pom.xml
index 355629c..158b935 100644
--- a/systests/webapps/cxfWebapp/pom.xml
+++ b/systests/webapps/cxfWebapp/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/webapps/simpleWebapp/pom.xml b/systests/webapps/simpleWebapp/pom.xml
index cc05f21..3fe435f 100644
--- a/systests/webapps/simpleWebapp/pom.xml
+++ b/systests/webapps/simpleWebapp/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/webapps/springPreauthWebapp/pom.xml b/systests/webapps/springPreauthWebapp/pom.xml
index 41f3b82..17a1566 100644
--- a/systests/webapps/springPreauthWebapp/pom.xml
+++ b/systests/webapps/springPreauthWebapp/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/systests/webapps/springWebapp/pom.xml b/systests/webapps/springWebapp/pom.xml
index 2c5a16a..4cd4218 100644
--- a/systests/webapps/springWebapp/pom.xml
+++ b/systests/webapps/springWebapp/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
