Merge pull request #17472 from vespa-engine/gjoranv/move-deps-to-parent-pom

Move dependencies not exposed externally to parent pom.

2 files changed, 55 insertions, 78 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 0ab70723fac..5e4a45074ae 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -354,84 +354,6 @@
                 <artifactId>xml-apis</artifactId>
                 <version>${xml-apis.version}</version>
             </dependency>
-
-            <!--  NOTE: The dependencies below are either not provided from the jdisc container runtime, or should
-                        not be leaked as maven dependency via the 'container' artifact. Still, they 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>com.google.guava</groupId>
-                <artifactId>guava-testlib</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty.alpn</groupId>
-                <artifactId>alpn-api</artifactId>
-                <version>${jetty-alpn.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-alpn-java-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-continuation</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users -->
-                <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>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 5a8fbb5bbc6..184ab475722 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -413,6 +413,16 @@
                 <version>3.10.0</version>
             </dependency>
             <dependency>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-xml-provider</artifactId>
+                <version>${jackson2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-xml</artifactId>
+                <version>${jackson2.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.github.cverges.expect4j</groupId>
                 <artifactId>expect4j</artifactId>
                 <version>1.6</version>
@@ -431,6 +441,11 @@
                 <version>2.6.0</version>
             </dependency>
             <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava-testlib</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.jimfs</groupId>
                 <artifactId>jimfs</artifactId>
                 <version>1.1</version>
@@ -689,6 +704,46 @@
                 <version>9.2.0</version>
             </dependency>
             <dependency>
+                <groupId>org.eclipse.jetty.alpn</groupId>
+                <artifactId>alpn-api</artifactId>
+                <version>${jetty-alpn.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.http2</groupId>
+                <artifactId>http2-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-alpn-java-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-continuation</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlets</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-jmx</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
                 <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest -->