Skip to content

Commit b3176e4

Browse files
gslowikowskigslowikowski
committed
Upgrade SCoverage Maven Plugin version from 1.4.1 to 1.4.11-SNAPSHOT 
1 parent 9a239bd commit b3176e4

File tree

42 files changed

+251
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+251
-87
lines changed

‎aggregation/module01/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>aggregation</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎aggregation/module02/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>aggregation</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎aggregation/module03/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>aggregation</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎aggregation/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>aggregation</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>pom</packaging>
2727

2828
<name>SCoverage Maven Samples : Aggregation</name>
@@ -41,7 +41,7 @@ under the License.
4141
<surefire.plugin.version>2.22.1</surefire.plugin.version>
4242

4343
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
44-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
44+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4545
</properties>
4646

4747
<modules>

‎different-test-frameworks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage</groupId>
2424
<artifactId>scoverage-maven-samples</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎different-test-frameworks/scalatest/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
2424
<artifactId>scalatest</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<name>SCoverage Maven Samples : Different Test Frameworks : ScalaTest</name>
@@ -43,7 +43,7 @@ under the License.
4343

4444
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
4545
<scalatest.plugin.version>1.0</scalatest.plugin.version>
46-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
46+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4747
</properties>
4848

4949
<dependencies>

‎different-test-frameworks/specs2/pom.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
2424
<artifactId>scecs2</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<name>SCoverage Maven Samples : Different Test Frameworks : Specs2</name>
@@ -44,7 +44,7 @@ under the License.
4444
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
4545
<specs2.plugin.version>0.4.4</specs2.plugin.version>
4646

47-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
47+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4848
</properties>
4949

5050
<dependencies>
@@ -104,6 +104,20 @@ under the License.
104104
<groupId>com.mmakowski</groupId>
105105
<artifactId>specs2-maven-plugin</artifactId>
106106
<version>${specs2.plugin.version}</version>
107+
<!-- 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 -->
108+
<!-- (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) -->
109+
<dependencies>
110+
<dependency>
111+
<groupId>com.github.scala-incubator.io</groupId>
112+
<artifactId>scala-io-core_2.11</artifactId>
113+
<version>0.4.3-1</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.github.scala-incubator.io</groupId>
117+
<artifactId>scala-io-file_2.11</artifactId>
118+
<version>0.4.3-1</version>
119+
</dependency>
120+
</dependencies>
107121
<executions>
108122
<execution>
109123
<id>test</id>

‎different-test-frameworks/surefire/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.different-test-frameworks</groupId>
2424
<artifactId>surefire</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<name>SCoverage Maven Samples : Different Test Frameworks : Surefire</name>
@@ -43,7 +43,7 @@ under the License.
4343
<surefire.plugin.version>2.22.1</surefire.plugin.version>
4444

4545
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
46-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
46+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4747
</properties>
4848

4949
<dependencies>

‎integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>integration-tests</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<name>SCoverage Maven Samples : Integration Tests</name>
@@ -41,7 +41,7 @@ under the License.
4141
<surefire.plugin.version>2.22.1</surefire.plugin.version>
4242

4343
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
44-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
44+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4545
</properties>
4646

4747
<dependencies>

‎integration-tests/src/main/scala/service/HelloService.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ object HelloService
44
{
55
def hello =
66
{
7-
"Hello" // tested by unit test
7+
"Hello" // covered by unit test
88
}
99

1010
def hello2 =
1111
{
12-
"Hello2" // tested by integration test
12+
"Hello2" // covered by integration test
1313
}
1414

1515
}

‎integration-tests/src/test/scala/service/HelloServiceIT.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import org.junit.Assert.assertEquals
66
class HelloServiceIT
77
{
88
@Test
9-
def test1()
10-
{
11-
assertEquals("Hello2", HelloService.hello2)
12-
}
9+
def test1() = assertEquals("Hello2", HelloService.hello2)
1310

1411
}

‎integration-tests/src/test/scala/service/HelloServiceTest.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import org.junit.Assert.assertEquals
66
class HelloServiceTest
77
{
88
@Test
9-
def test1()
10-
{
11-
assertEquals("Hello", HelloService.hello)
12-
}
9+
def test1() = assertEquals("Hello", HelloService.hello)
1310

1411
}

‎playframework/multimodule/admin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>multimodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/multimodule/common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>multimodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/multimodule/main/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>multimodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/multimodule/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>multimodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>pom</packaging>
2727

2828
<name>SCoverage Maven Samples : Play! Framework : MultiModule</name>
@@ -42,7 +42,7 @@ under the License.
4242

4343
<play2.plugin.version>1.0.0-rc5</play2.plugin.version>
4444
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
45-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
45+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4646
</properties>
4747

4848
<modules>

‎playframework/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage</groupId>
2424
<artifactId>scoverage-maven-samples</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/singlemodule/helloworld/helloworld-scala-2.10/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.helloworld</groupId>
2424
<artifactId>helloworld-scala-2.10</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>play2</packaging>
2727

2828
<name>SCoverage Maven Samples : Play! Framework : SingleModule : Hello World : Scala 2.10</name>
@@ -58,7 +58,7 @@ under the License.
5858

5959
<play2.plugin.version>1.0.0-rc5</play2.plugin.version>
6060
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
61-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
61+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
6262
</properties>
6363

6464
<dependencies>
@@ -158,6 +158,7 @@ under the License.
158158
<artifactId>scoverage-maven-plugin</artifactId>
159159
<version>${scoverage.plugin.version}</version>
160160
<configuration>
161+
<scalacPluginVersion>1.4.1</scalacPluginVersion> <!-- latest plugin version supporting Scala 2.10 -->
161162
<!-- uncomment if you don't want templates coverage
162163
<excludedPackages>views.html.*</excludedPackages> -->
163164
<excludedFiles>.*?routes_(routing|reverseRouting)</excludedFiles>

‎playframework/singlemodule/helloworld/helloworld-scala-2.11/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.helloworld</groupId>
2424
<artifactId>helloworld-scala-2.11</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>play2</packaging>
2727

2828
<name>SCoverage Maven Samples : Play! Framework : SingleModule : Hello World : Scala 2.11</name>
@@ -41,7 +41,7 @@ under the License.
4141

4242
<play2.plugin.version>1.0.0-rc5</play2.plugin.version>
4343
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
44-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
44+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4545
</properties>
4646

4747
<dependencies>

‎playframework/singlemodule/helloworld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>singlemodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/singlemodule/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples</groupId>
2424
<artifactId>play</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/singlemodule/zentasks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage.scoverage-maven-samples.play</groupId>
2424
<artifactId>singlemodule</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎playframework/singlemodule/zentasks/zentasks-scala-2.10/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.zentasks</groupId>
2424
<artifactId>zentasks-scala-2.10</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>play2</packaging>
2727

2828
<name>SCoverage Maven Samples : Play! Framework : SingleModule : Zentasks : Scala 2.10</name>
@@ -59,7 +59,7 @@ under the License.
5959

6060
<play2.plugin.version>1.0.0-rc5</play2.plugin.version>
6161
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
62-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
62+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
6363
</properties>
6464

6565
<dependencies>
@@ -190,6 +190,7 @@ under the License.
190190
<artifactId>scoverage-maven-plugin</artifactId>
191191
<version>${scoverage.plugin.version}</version>
192192
<configuration>
193+
<scalacPluginVersion>1.4.1</scalacPluginVersion> <!-- latest plugin version supporting Scala 2.10 -->
193194
<!-- uncomment if you don't want templates coverage
194195
<excludedPackages>views.html.*</excludedPackages> -->
195196
<excludedFiles>.*?routes_(routing|reverseRouting)</excludedFiles>

‎playframework/singlemodule/zentasks/zentasks-scala-2.11/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.play.singlemodule.zentasks</groupId>
2424
<artifactId>zentasks-scala-2.11</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>play2</packaging>
2727

2828
<name>SCoverage Maven Samples : Play! Framework : SingleModule : Zentasks : Scala 2.11</name>
@@ -42,7 +42,7 @@ under the License.
4242

4343
<play2.plugin.version>1.0.0-rc5</play2.plugin.version>
4444
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
45-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
45+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4646
</properties>
4747

4848
<dependencies>

‎simple/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<parent>
2323
<groupId>org.scoverage</groupId>
2424
<artifactId>scoverage-maven-samples</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>
@@ -36,6 +36,7 @@ under the License.
3636
<module>sbt-compiler-plugin-scala-2.10</module>
3737
<module>sbt-compiler-plugin-scala-2.11</module>
3838
<module>sbt-compiler-plugin-scala-2.12</module>
39+
<module>sbt-compiler-plugin-scala-2.13</module>
3940
<module>scala-plugin-scala-2.10</module>
4041
<module>scala-plugin-scala-2.11</module>
4142
<module>scala-plugin-scala-2.12</module>

‎simple/sbt-compiler-plugin-scala-2.10/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ under the License.
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>org.scoverage.scoverage-maven-samples.simple</groupId>
2424
<artifactId>sbt-compiler-plugin-scala-2.10</artifactId>
25-
<version>1.4.2-SNAPSHOT</version>
25+
<version>1.4.11-SNAPSHOT</version>
2626
<packaging>jar</packaging>
2727

2828
<name>SCoverage Maven Samples : Simple : using SBT Compiler Maven Plugin and Scala 2.10</name>
@@ -42,7 +42,7 @@ under the License.
4242
<surefire.plugin.version>2.22.1</surefire.plugin.version>
4343

4444
<sbt-compiler.plugin.version>1.0.0</sbt-compiler.plugin.version>
45-
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
45+
<scoverage.plugin.version>1.4.11-SNAPSHOT</scoverage.plugin.version>
4646
</properties>
4747

4848
<dependencies>
@@ -100,6 +100,9 @@ under the License.
100100
<groupId>org.scoverage</groupId>
101101
<artifactId>scoverage-maven-plugin</artifactId>
102102
<version>${scoverage.plugin.version}</version>
103+
<configuration>
104+
<scalacPluginVersion>1.4.1</scalacPluginVersion> <!-- latest plugin version supporting Scala 2.10 -->
105+
</configuration>
103106
</plugin>
104107
</plugins>
105108

0 commit comments

Comments
 (0)