From 50c7d92793f5faf5fedada7e854e50f40c36b35b Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Thu, 31 Aug 2017 12:25:30 +0200
Subject: Exclude scala-xml from provided classpath

- To prevent import-package for its packages.
- scala-xml is only used to generate config classes, and is not
  needed or provided runtime.
- Add scala-xml in scope test where it's used in unit tests.
---
 application/pom.xml          | 5 +++++
 config-bundle/pom.xml        | 6 ++++++
 config-model/pom.xml         | 5 +++++
 config/pom.xml               | 5 +++++
 standalone-container/pom.xml | 5 +++++
 5 files changed, 26 insertions(+)

diff --git a/application/pom.xml b/application/pom.xml
index 2d9096e49f1..c5e8136628d 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -75,6 +75,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_${scala.major-version}</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <!-- All dependencies that should be visible in test classpath, but not compile classpath,
          for user projects must be added in compile scope here.
diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml
index 43c08aad726..618a12def22 100644
--- a/config-bundle/pom.xml
+++ b/config-bundle/pom.xml
@@ -33,6 +33,12 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>configgen</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.scala-lang.modules</groupId>
+          <artifactId>scala-xml_${scala.major-version}</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/config-model/pom.xml b/config-model/pom.xml
index 4da325a4dde..c1c08e6e702 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -308,6 +308,11 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_${scala.major-version}</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/config/pom.xml b/config/pom.xml
index af6afe0f6a6..f73c5b7bfd8 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -87,6 +87,11 @@
       <groupId>net.jpountz.lz4</groupId>
       <artifactId>lz4</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_${scala.major-version}</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index 85a401d6af3..9300181e00b 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -68,6 +68,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_${scala.major-version}</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
-- 
cgit v1.2.3