diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-14 11:23:29 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-14 11:23:29 +0200 |
commit | d359e43f98dc5d9c52f68d01590e7c884ef8cc37 (patch) | |
tree | 7bb24dacd904017bfd99cadf8fd554d409c09de4 /container-disc | |
parent | 53f821ab8ce9940dca4639738d0ca997016e47ed (diff) |
Ensure all required Jetty packages are present in container-disc's manifest
Add explicit jdisc_jetty dependency so that bundle-plugin can generate
necessary import-package statements for all Jetty bundles.
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/pom.xml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 349d3f7bae1..6e7d39585df 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -58,16 +58,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-core</artifactId> <version>${project.version}</version> @@ -124,6 +114,17 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_jetty</artifactId> + <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 --> |