Upgrade SCoverage Maven Plugin version from 1.4.1 to 1.4.11-SNAPSHOT

scoverage · Jan 22, 2022 · 018dc0c · 018dc0c
1 parent 9a239bd
commit 018dc0c
Show file tree

Hide file tree

Showing 43 changed files with 252 additions and 88 deletions.
diff --git a/aggregation/module01/pom.xml b/aggregation/module01/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples</groupId>
         <artifactId>aggregation</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/aggregation/module02/pom.xml b/aggregation/module02/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples</groupId>
         <artifactId>aggregation</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/aggregation/module03/pom.xml b/aggregation/module03/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples</groupId>
         <artifactId>aggregation</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/aggregation/pom.xml b/aggregation/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples</groupId>
     <artifactId>aggregation</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SCoverage Maven Samples : Aggregation</name>
@@ -41,7 +41,7 @@ under the License.
         <surefire.plugin.version>2.22.1</surefire.plugin.version>
 
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <modules>

diff --git a/different-test-frameworks/pom.xml b/different-test-frameworks/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage</groupId>
         <artifactId>scoverage-maven-samples</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/different-test-frameworks/scalatest/pom.xml b/different-test-frameworks/scalatest/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
     <artifactId>scalatest</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SCoverage Maven Samples : Different Test Frameworks : ScalaTest</name>
@@ -43,7 +43,7 @@ under the License.
 
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
         <scalatest.plugin.version>1.0</scalatest.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>

diff --git a/different-test-frameworks/specs2/pom.xml b/different-test-frameworks/specs2/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
     <artifactId>scecs2</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SCoverage Maven Samples : Different Test Frameworks : Specs2</name>
@@ -44,7 +44,7 @@ under the License.
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
         <specs2.plugin.version>0.4.4</specs2.plugin.version>
 
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>
@@ -104,6 +104,20 @@ under the License.
                 <groupId>com.mmakowski</groupId>
                 <artifactId>specs2-maven-plugin</artifactId>
                 <version>${specs2.plugin.version}</version>
+                <!-- Override dependencies in order to avoid an error in https://repo.maven.apache.org/maven2/com/github/scala-incubator/io/scala-io-file_2.11/0.4.3/scala-io-file_2.11-0.4.3.pom -->
+                <!-- (org.scala-lang.modules:scala-parser-combinators_2.11 depenedncy defined twice with different versions, version 1.0.0 does not exist in the repository) -->
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.scala-incubator.io</groupId>
+                        <artifactId>scala-io-core_2.11</artifactId>
+                        <version>0.4.3-1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.github.scala-incubator.io</groupId>
+                        <artifactId>scala-io-file_2.11</artifactId>
+                        <version>0.4.3-1</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>test</id>

diff --git a/different-test-frameworks/surefire/pom.xml b/different-test-frameworks/surefire/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
     <artifactId>surefire</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SCoverage Maven Samples : Different Test Frameworks : Surefire</name>
@@ -43,7 +43,7 @@ under the License.
         <surefire.plugin.version>2.22.1</surefire.plugin.version>
 
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SCoverage Maven Samples : Integration Tests</name>
@@ -41,7 +41,7 @@ under the License.
         <surefire.plugin.version>2.22.1</surefire.plugin.version>
 
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/src/main/scala/service/HelloService.scala b/integration-tests/src/main/scala/service/HelloService.scala
@@ -4,12 +4,12 @@ object HelloService
 {
   def hello =
   {
-    "Hello"  // tested by unit test
+    "Hello"  // covered by unit test
   }
 
   def hello2 =
   {
-    "Hello2"  // tested by integration test
+    "Hello2"  // covered by integration test
   }
 
 }
diff --git a/integration-tests/src/test/scala/service/HelloServiceIT.scala b/integration-tests/src/test/scala/service/HelloServiceIT.scala
@@ -6,9 +6,6 @@ import org.junit.Assert.assertEquals
 class HelloServiceIT
 {
     @Test
-    def test1()
-    {
-        assertEquals("Hello2", HelloService.hello2)
-    }
+    def test1() = assertEquals("Hello2", HelloService.hello2)
 
 }
diff --git a/integration-tests/src/test/scala/service/HelloServiceTest.scala b/integration-tests/src/test/scala/service/HelloServiceTest.scala
@@ -6,9 +6,6 @@ import org.junit.Assert.assertEquals
 class HelloServiceTest
 {
     @Test
-    def test1()
-    {
-        assertEquals("Hello", HelloService.hello)
-    }
+    def test1() = assertEquals("Hello", HelloService.hello)
 
 }
diff --git a/playframework/multimodule/admin/pom.xml b/playframework/multimodule/admin/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
         <artifactId>multimodule</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/multimodule/common/pom.xml b/playframework/multimodule/common/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
         <artifactId>multimodule</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/multimodule/main/pom.xml b/playframework/multimodule/main/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
         <artifactId>multimodule</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/multimodule/pom.xml b/playframework/multimodule/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
     <artifactId>multimodule</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SCoverage Maven Samples : Play! Framework : MultiModule</name>
@@ -42,7 +42,7 @@ under the License.
 
         <play2.plugin.version>1.0.0-rc5</play2.plugin.version>
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <modules>

diff --git a/playframework/pom.xml b/playframework/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage</groupId>
         <artifactId>scoverage-maven-samples</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/singlemodule/helloworld/helloworld-scala-2.10/pom.xml b/playframework/singlemodule/helloworld/helloworld-scala-2.10/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.helloworld</groupId>
     <artifactId>helloworld-scala-2.10</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>play2</packaging>
 
     <name>SCoverage Maven Samples : Play! Framework : SingleModule : Hello World : Scala 2.10</name>
@@ -58,7 +58,7 @@ under the License.
 
         <play2.plugin.version>1.0.0-rc5</play2.plugin.version>
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>
@@ -158,6 +158,7 @@ under the License.
                     <artifactId>scoverage-maven-plugin</artifactId>
                     <version>${scoverage.plugin.version}</version>
                     <configuration>
+                        <scalacPluginVersion>1.4.1</scalacPluginVersion> <!-- latest plugin version supporting Scala 2.10 -->
                         <!-- uncomment if you don't want templates coverage
                         <excludedPackages>views.html.*</excludedPackages> -->
                         <excludedFiles>.*?routes_(routing|reverseRouting)</excludedFiles>

diff --git a/playframework/singlemodule/helloworld/helloworld-scala-2.11/pom.xml b/playframework/singlemodule/helloworld/helloworld-scala-2.11/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.helloworld</groupId>
     <artifactId>helloworld-scala-2.11</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>play2</packaging>
 
     <name>SCoverage Maven Samples : Play! Framework : SingleModule : Hello World : Scala 2.11</name>
@@ -41,7 +41,7 @@ under the License.
 
         <play2.plugin.version>1.0.0-rc5</play2.plugin.version>
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>

diff --git a/playframework/singlemodule/helloworld/pom.xml b/playframework/singlemodule/helloworld/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
         <artifactId>singlemodule</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/singlemodule/pom.xml b/playframework/singlemodule/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples</groupId>
         <artifactId>play</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/singlemodule/zentasks/pom.xml b/playframework/singlemodule/zentasks/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage.scoverage-maven-samples.play</groupId>
         <artifactId>singlemodule</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/playframework/singlemodule/zentasks/zentasks-scala-2.10/pom.xml b/playframework/singlemodule/zentasks/zentasks-scala-2.10/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.zentasks</groupId>
     <artifactId>zentasks-scala-2.10</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>play2</packaging>
 
     <name>SCoverage Maven Samples : Play! Framework : SingleModule : Zentasks : Scala 2.10</name>
@@ -59,7 +59,7 @@ under the License.
 
         <play2.plugin.version>1.0.0-rc5</play2.plugin.version>
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>
@@ -190,6 +190,7 @@ under the License.
                     <artifactId>scoverage-maven-plugin</artifactId>
                     <version>${scoverage.plugin.version}</version>
                     <configuration>
+                        <scalacPluginVersion>1.4.1</scalacPluginVersion> <!-- latest plugin version supporting Scala 2.10 -->
                         <!-- uncomment if you don't want templates coverage
                         <excludedPackages>views.html.*</excludedPackages> -->
                         <excludedFiles>.*?routes_(routing|reverseRouting)</excludedFiles>

diff --git a/playframework/singlemodule/zentasks/zentasks-scala-2.11/pom.xml b/playframework/singlemodule/zentasks/zentasks-scala-2.11/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.zentasks</groupId>
     <artifactId>zentasks-scala-2.11</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>play2</packaging>
 
     <name>SCoverage Maven Samples : Play! Framework : SingleModule : Zentasks : Scala 2.11</name>
@@ -42,7 +42,7 @@ under the License.
 
         <play2.plugin.version>1.0.0-rc5</play2.plugin.version>
         <sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
-        <scoverage.plugin.version>1.4.1</scoverage.plugin.version>
+        <scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage</groupId>
     <artifactId>scoverage-maven-samples</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.11-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SCoverage Maven Samples</name>

diff --git a/simple/pom.xml b/simple/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>org.scoverage</groupId>
         <artifactId>scoverage-maven-samples</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.11-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -36,6 +36,7 @@ under the License.
         <module>sbt-compiler-plugin-scala-2.10</module>
         <module>sbt-compiler-plugin-scala-2.11</module>
         <module>sbt-compiler-plugin-scala-2.12</module>
+        <module>sbt-compiler-plugin-scala-2.13</module>
         <module>scala-plugin-scala-2.10</module>
         <module>scala-plugin-scala-2.11</module>
         <module>scala-plugin-scala-2.12</module>