diff options
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/pom.xml | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 760044dc0da..e537b8f1c35 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> @@ -118,6 +108,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 --> @@ -194,6 +195,14 @@ jetty-servlets-${jetty.version}.jar, jetty-util-${jetty.version}.jar, jetty-util-ajax-${jetty.version}.jar, + <!-- Spifly (required for OSGi service loader used by Jetty) --> + org.apache.aries.spifly.dynamic.bundle-${spifly.version}.jar, + asm-${asm.version}.jar, + asm-analysis-${asm.version}.jar, + asm-commons-${asm.version}.jar, + asm-tree-${asm.version}.jar, + asm-util-${asm.version}.jar, + <!-- Spifly end --> <!-- Misc 3rd party bundles --> bcpkix-jdk15on-${bouncycastle.version}.jar, bcprov-jdk15on-${bouncycastle.version}.jar, |