diff options
| -rw-r--r-- | config-bundle/pom.xml | 7 | ||||
| -rwxr-xr-x | config/pom.xml | 5 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 8 | ||||
| -rw-r--r-- | container-dev/pom.xml | 21 | ||||
| -rw-r--r-- | container-jersey2/pom.xml | 20 | ||||
| -rw-r--r-- | container-test-jars/bundle-with-provided-bundle/pom.xml | 26 | ||||
| -rw-r--r-- | fat-model-dependencies/pom.xml | 4 | ||||
| -rw-r--r-- | parent/pom.xml | 58 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 4 |
9 files changed, 0 insertions, 153 deletions
diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index 07262141801..61d1065bee4 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -34,13 +34,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>configgen</artifactId> <version>${project.version}</version> - <!-- TODO: uncomment when the oldest available config-model uses the Java version of createClassName() - <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/pom.xml b/config/pom.xml index 291c96514d1..612541899b2 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -88,11 +88,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/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 482c1c395de..4d9c1e94ed9 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -370,13 +370,6 @@ <version>${mimepull.version}</version> </dependency> <dependency> - <!-- NOT provided from Jdisc runtime, but any project that has unit tests based on - the 'application' framework MUST use our version. --> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> @@ -465,7 +458,6 @@ <guice.version>3.0</guice.version> <jaxb.version>2.2.7</jaxb.version> <jetty.version>9.4.10.v20180503</jetty.version> - <scala.version>2.11.12</scala.version> <!-- When updating this, the scala.major-version in parent must also be updated! --> <slf4j.version>1.7.5</slf4j.version> <!-- These must be kept in sync with version used by current jersey2.version. --> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index ff67e8db9fe..fe5f852a226 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -96,10 +96,6 @@ <artifactId>commons-lang</artifactId> </exclusion> <exclusion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </exclusion> @@ -121,12 +117,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-jersey2</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -197,17 +187,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>config-bundle</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </exclusion> - <exclusion> - <!-- TODO: Remove exclusion when scala-xml is excluded in config-bundle pom --> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_${scala.major-version}</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container, diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index c5ed7d872bf..70189e65f00 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -57,26 +57,6 @@ <build> <plugins> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>compile</id> - <goals> - <goal>compile</goal> - </goals> - <phase>compile</phase> - </execution> - <execution> - <id>test-compile</id> - <goals> - <goal>testCompile</goal> - </goals> - <phase>test-compile</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> diff --git a/container-test-jars/bundle-with-provided-bundle/pom.xml b/container-test-jars/bundle-with-provided-bundle/pom.xml index d0b378de8ba..e133ee955dd 100644 --- a/container-test-jars/bundle-with-provided-bundle/pom.xml +++ b/container-test-jars/bundle-with-provided-bundle/pom.xml @@ -29,11 +29,6 @@ </dependency> <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> - - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespa_jersey2</artifactId> <version>${project.version}</version> @@ -44,27 +39,6 @@ <build> <plugins> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - <configuration> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - </args> - </configuration> - </plugin> - - <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 0011d108b98..68abc36c678 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -204,10 +204,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.major-version}</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_http_service</artifactId> <version>${project.version}</version> diff --git a/parent/pom.xml b/parent/pom.xml index aa75c124579..a939a40f784 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -226,19 +226,6 @@ <version>1.0.0</version> </plugin> <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.2.2</version> - <configuration> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - <arg>-Xfatal-warnings</arg> - </args> - </configuration> - </plugin> - <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <version>${project.version}</version> @@ -317,35 +304,6 @@ <includePluginDependencies>true</includePluginDependencies> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/scala</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-test-source</id> - <phase>generate-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>src/test/scala</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </profile> @@ -616,21 +574,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-parser-combinators_${scala.major-version}</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_${scala.major-version}</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.major-version}</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <version>4.0.6.RELEASE</version> @@ -700,7 +643,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <test.hide>true</test.hide> <doclint>all</doclint> - <scala.major-version>2.11</scala.major-version> <!-- TODO: factorylib magic for maven cache bootstrapping prevents moving this to container-dep-versions. --> <surefire.version>2.21.0</surefire.version> </properties> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index f31072aec6e..608d72c72f2 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -14,10 +14,6 @@ <packaging>container-plugin</packaging> <dependencies> <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-provisioning</artifactId> <version>${project.version}</version> |