diff options
| author | gjoranv <gv@oath.com> | 2017-12-01 16:09:12 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2017-12-01 16:09:12 +0100 |
| commit | 4d14446ee08f268800c22b96fa4d15a659469b76 (patch) | |
| tree | c84b9a89d2e7dc145c451a42f34079d9fd9d71bf /container-dependency-versions | |
| parent | 644dfe78df379c51e37f6da502295c4f50808877 (diff) | |
Move all deps using properties from container-dep-versions up
.. from parent to container-dep-versions.
- The aim was to have only deps provided runtime from jdisc in
container-dep-versions, but this is not possible because
factorylib reads the text in parent/pom.xml (and now
container-dep-versions/pom.xml) to build a pom model used to
bootstrap the maven cache on factory. Hence all deps using
properties declared in a pom also have to reside in the same pom.
Diffstat (limited to 'container-dependency-versions')
| -rw-r--r-- | container-dependency-versions/pom.xml | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 5007e91c916..5479cace414 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -341,6 +341,59 @@ <artifactId>xml-apis</artifactId> <version>1.4.01</version> </dependency> + + <!-- NOTE: The dependencies below are not provided from the jdisc container runtime, but had to be moved + here from 'parent' because factorylib reads the text in parent/pom.xml and this pom file to + build a pom model used to bootstrap the maven cache on factory. Hence all deps using properties + declared in this pom also have to reside in this pom. + See factorylib:com.yahoo.vespa.dependencies.pom.list.Main.--> + <!-- TODO: move these back to parent/pom.xml when the above does not hold anymore. --> + + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-xml-provider</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>${jackson2.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <!-- NOT provided from jdisc runtime --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty.version}</version> + </dependency> + + <!-- Please don't add deps here, but instead above the NOTE. --> + </dependencies> </dependencyManagement> |