diff options
| -rw-r--r-- | application/pom.xml | 5 | ||||
| -rw-r--r-- | bundle-plugin-test/pom.xml | 4 | ||||
| -rw-r--r-- | bundle-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | config-model/pom.xml | 4 | ||||
| -rw-r--r-- | configgen/pom.xml | 4 | ||||
| -rw-r--r-- | container-core/pom.xml | 4 | ||||
| -rw-r--r-- | container-di/pom.xml | 9 | ||||
| -rw-r--r-- | container-jersey2/pom.xml | 5 | ||||
| -rw-r--r-- | container-test-jars/bundle-with-provided-bundle/pom.xml | 4 | ||||
| -rw-r--r-- | container-test-jars/jersey-resources/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 12 | ||||
| -rw-r--r-- | scalalib/pom.xml | 4 | ||||
| -rw-r--r-- | service-monitor/pom.xml | 4 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 5 | ||||
| -rw-r--r-- | vespa-application-maven-plugin/pom.xml | 4 |
15 files changed, 36 insertions, 40 deletions
diff --git a/application/pom.xml b/application/pom.xml index 5276e8e48b2..90e7698d395 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -115,9 +115,8 @@ </configuration> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.14.1</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <configuration> <args> <arg>-unchecked</arg> diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index c2c3b966648..2d407c9749d 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -56,8 +56,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 7b00ee7dbf2..4c39d32131a 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -99,8 +99,8 @@ </resources> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> diff --git a/config-model/pom.xml b/config-model/pom.xml index 7a5dae9fff3..c185e8de709 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -524,8 +524,8 @@ </configuration> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <configuration> <args> <arg>-unchecked</arg> diff --git a/configgen/pom.xml b/configgen/pom.xml index f6671928ec5..a7219ae4b72 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -71,8 +71,8 @@ </configuration> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <configuration> <args> <arg>-unchecked</arg> diff --git a/container-core/pom.xml b/container-core/pom.xml index ff69558bb2a..79d8fc1f199 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -204,8 +204,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <id>compile</id> diff --git a/container-di/pom.xml b/container-di/pom.xml index c86518cd59b..fab28843f1f 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -131,9 +131,8 @@ </executions> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.14.1</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <id>compile</id> @@ -206,8 +205,8 @@ </configuration> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <configuration> <compilerPlugins> <compilerPlugin> diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml index f98efcfe26e..8f579e49876 100644 --- a/container-jersey2/pom.xml +++ b/container-jersey2/pom.xml @@ -61,9 +61,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.14.1</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <id>compile</id> diff --git a/container-test-jars/bundle-with-provided-bundle/pom.xml b/container-test-jars/bundle-with-provided-bundle/pom.xml index ecda9d0ef18..d0b378de8ba 100644 --- a/container-test-jars/bundle-with-provided-bundle/pom.xml +++ b/container-test-jars/bundle-with-provided-bundle/pom.xml @@ -44,8 +44,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> diff --git a/container-test-jars/jersey-resources/pom.xml b/container-test-jars/jersey-resources/pom.xml index 75f3d68f2c6..33a3f03a962 100644 --- a/container-test-jars/jersey-resources/pom.xml +++ b/container-test-jars/jersey-resources/pom.xml @@ -31,8 +31,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> @@ -223,9 +223,9 @@ <version>1.0-alpha-2</version> </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.15.2</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <version>3.2.2</version> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> @@ -248,9 +248,9 @@ <pluginExecutions> <pluginExecution> <pluginExecutionFilter> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <versionRange>[2.15.2,)</versionRange> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <versionRange>[3.2.2,)</versionRange> <goals> <goal>add-source</goal> <goal>testCompile</goal> diff --git a/scalalib/pom.xml b/scalalib/pom.xml index 16a22db723c..df45b7d23a5 100644 --- a/scalalib/pom.xml +++ b/scalalib/pom.xml @@ -37,8 +37,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index f90de6e4d56..a23760c435b 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -94,8 +94,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index e8de65a42e5..21122c04a0e 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -97,9 +97,8 @@ </plugin> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.14.1</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <configuration> <args> <arg>-unchecked</arg> diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 6d2b65cc067..57ef584ece0 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -54,8 +54,8 @@ <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> <executions> <execution> <goals> |