diff options
| author | gjoranv <gv@oath.com> | 2017-08-31 12:25:30 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2017-08-31 16:42:19 +0200 |
| commit | 2bcc584022f761efa9968a3c126608b559b8fedb (patch) | |
| tree | 55886bc3e9be78b82971e9f06884ca98d7e5099d | |
| parent | f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff (diff) | |
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.
| -rw-r--r-- | application/pom.xml | 5 | ||||
| -rw-r--r-- | config-bundle/pom.xml | 6 | ||||
| -rw-r--r-- | config-model/pom.xml | 5 | ||||
| -rwxr-xr-x | config/pom.xml | 5 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 5 |
5 files changed, 26 insertions, 0 deletions
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> |