diff options
| -rw-r--r-- | container-dependency-versions/pom.xml | 3 | ||||
| -rw-r--r-- | container-disc/pom.xml | 8 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-3party-bundles/pom.xml | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index dc41a68eb48..709f9dc333a 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -88,6 +88,7 @@ <version>${javax.inject.version}</version> </dependency> <dependency> + <!-- TODO Vespa 9 Stop providing servlet-api 3.x --> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet-api.version}</version> @@ -241,8 +242,6 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <jaxb.version>2.3.0</jaxb.version> - <jetty.version>9.4.46.v20220331</jetty.version> - <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.json.version>20090211</org.json.version> <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> <xml-apis.version>1.4.01</xml-apis.version> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 37e62541da3..95f54e5d932 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -144,11 +144,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> <!-- end WARNING --> <!-- ensure that transitive Jackson dependencies are not included in compile scope --> @@ -210,8 +205,7 @@ bcpkix-jdk15on-${bouncycastle.version}.jar, bcprov-jdk15on-${bouncycastle.version}.jar, - <!-- TODO Vespa 8: embed these in container-core/disc, saving a lot of dep management. --> - <!-- Check if those listed in container-dep-versions are not used by hosted apps! --> + <!-- TODO Vespa 9 Stop providing servlet-api 3.x --> javax.servlet-api-3.1.0.jar, <!-- Aries SPIFly repackaged --> diff --git a/parent/pom.xml b/parent/pom.xml index dd97589bdda..58daca2fe57 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1004,6 +1004,8 @@ <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava --> <gson.version>2.8.9</gson.version> <hdrhistogram.version>2.1.12</hdrhistogram.version> + <jetty.version>9.4.46.v20220331</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <jna.version>5.11.0</jna.version> <junit.version>5.8.1</junit.version> <maven-archiver.version>3.5.2</maven-archiver.version> diff --git a/vespa-3party-bundles/pom.xml b/vespa-3party-bundles/pom.xml index b1ed6457c94..a286f4bedb8 100644 --- a/vespa-3party-bundles/pom.xml +++ b/vespa-3party-bundles/pom.xml @@ -28,7 +28,11 @@ <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> </dependency> - + <dependency> + <!-- TODO Vespa 9 Stop providing servlet-api 3.x --> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </dependency> </dependencies> <build> |