diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-07 16:32:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 16:32:47 +0200 |
| commit | 5efb70634240624efe29bc5a556c0d8cdb11b2c8 (patch) | |
| tree | c4f8c8786b4fa6b91b17220d7986ccc8e3fd5e95 | |
| parent | 2347c374696c935f0a09a0654e3e376b9436d6dd (diff) | |
| parent | 74fe8e7d84e7da5ae70335e9363b9b8130c5568f (diff) | |
Merge pull request #3366 from vespa-engine/revert-3358-origin/gjoranv/exclude-scala-xml2
Revert "Exclude scala-xml from provided classpath"
| -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, 0 insertions, 26 deletions
diff --git a/application/pom.xml b/application/pom.xml index c5e8136628d..2d9096e49f1 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -75,11 +75,6 @@ <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 618a12def22..43c08aad726 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -33,12 +33,6 @@ <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 c1c08e6e702..4da325a4dde 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -308,11 +308,6 @@ <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 f73c5b7bfd8..af6afe0f6a6 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -87,11 +87,6 @@ <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 9300181e00b..85a401d6af3 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -68,11 +68,6 @@ <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> |