summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorOlli Virtanen <olli.virtanen@oath.com>2018-06-25 11:27:54 +0200
committerOlli Virtanen <olli.virtanen@oath.com>2018-06-25 11:27:54 +0200
commit0e5001395c46511a8b57b9721a0a8e341459e640 (patch)
tree76f99fa4b7b2b7866918928b20f6d15e57f98d99 /parent
parentab61e5ea77c483c0fe4fb6a3f266bd47f590988a (diff)
Remove Scala remnants from Maven build files
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml58
1 files changed, 0 insertions, 58 deletions
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>