Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c652406

Browse filesBrowse files
committed
Refactor it-tests a bit
1 parent e422a12 commit c652406
Copy full SHA for c652406

File tree

Expand file treeCollapse file tree

42 files changed

+60
-57
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

42 files changed

+60
-57
lines changed
+26Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>it.scoverage-maven-plugin</groupId>
9+
<artifactId>integration_tests_parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
<relativePath>../integration_tests_parent/pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>integration_tests_Scala3_parent</artifactId>
15+
<version>1.0-SNAPSHOT</version>
16+
<packaging>pom</packaging>
17+
<name>Scoverage Plugin Integration Tests for Scala 3 Parent</name>
18+
<description>Scoverage Plugin Integration Tests for Scala 3 Parent</description>
19+
20+
<properties>
21+
<scala.compat.version>3</scala.compat.version>
22+
<scala.version>3.5.2</scala.version>
23+
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24+
</properties>
25+
26+
</project>

‎src/it/integration_tests_parent/pom.xml

Copy file name to clipboardExpand all lines: src/it/integration_tests_parent/pom.xml
+11-7Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,24 @@
1111
<name>Scoverage Plugin Integration Tests Parent</name>
1212
<description>Scoverage Plugin Integration Tests Parent</description>
1313

14+
<prerequisites>
15+
<maven>3.6.3</maven>
16+
</prerequisites>
17+
1418
<properties>
1519
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<junit.version>4.13.1</junit.version>
20+
<junit.version>4.13.2</junit.version>
1721
<scalatest.version>3.2.17</scalatest.version>
1822

19-
<compiler.plugin.version>3.11.0</compiler.plugin.version>
20-
<surefire.plugin.version>3.1.2</surefire.plugin.version>
21-
<scala.plugin.version>4.9.1</scala.plugin.version>
22-
<scalatest.plugin.version>2.0.0</scalatest.plugin.version>
23-
<project-info-reports.plugin.version>3.5.0</project-info-reports.plugin.version>
23+
<compiler.plugin.version>3.13.0</compiler.plugin.version>
24+
<surefire.plugin.version>3.5.2</surefire.plugin.version>
25+
<scala.plugin.version>4.9.2</scala.plugin.version>
26+
<scalatest.plugin.version>2.2.0</scalatest.plugin.version>
27+
<project-info-reports.plugin.version>3.8.0</project-info-reports.plugin.version>
2428
<site.plugin.version>3.21.0</site.plugin.version>
2529

2630
<scala.compat.version>2.13</scala.compat.version>
27-
<scala.minor.version>14</scala.minor.version>
31+
<scala.minor.version>15</scala.minor.version>
2832
<scala.version>${scala.compat.version}.${scala.minor.version}</scala.version>
2933
<scala.library.artifact.id>scala-library</scala.library.artifact.id>
3034
</properties>

‎src/it/test_ScalaMavenPlugin_Scala212_JUnit/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala2_12_JUnit/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<relativePath>../integration_tests_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala212_JUnit</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala2_12_JUnit</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and JUnit</name>

‎src/it/test_ScalaMavenPlugin_Scala212_ScalaTest/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala2_12_ScalaTest/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<relativePath>../integration_tests_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala212_ScalaTest</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala2_12_ScalaTest</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.12 and ScalaTest</name>

‎src/it/test_ScalaMavenPlugin_Scala213_JUnit/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala2_13_JUnit/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<relativePath>../integration_tests_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala213_JUnit</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala2_13_JUnit</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and JUnit</name>

‎src/it/test_ScalaMavenPlugin_Scala213_ScalaTest/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala2_13_ScalaTest/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<relativePath>../integration_tests_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala213_ScalaTest</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala2_13_ScalaTest</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 2.13 and ScalaTest</name>

‎src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest/pom.xml
+3-9Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,17 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</name>
1818
<description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest</description>
1919

20-
<properties>
21-
<scala.compat.version>3</scala.compat.version>
22-
<scala.version>3.3.1</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
</properties>
25-
2620
<build>
2721
<plugins>
2822
<plugin>

‎src/it/test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml renamed to ‎src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set/pom.xml
+4-6Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,26 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_ScalaMavenPlugin_Scala32Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
14+
<artifactId>test_ScalaMavenPlugin_Scala3_2_Plus_ScalaTest_ScalaVersion_Not_Set</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717
<name>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</name>
1818
<description>Test Scoverage Report using scala-maven-plugin, Scala 3.2+ and ScalaTest when scala.version is not set</description>
1919

2020
<properties>
21-
<scala.compat.version>3</scala.compat.version>
2221
<scala.version/>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
2422
</properties>
2523

2624
<dependencies>
2725
<dependency>
2826
<groupId>org.scala-lang</groupId>
2927
<artifactId>${scala.library.artifact.id}</artifactId>
30-
<version>3.3.1</version>
28+
<version>3.5.2</version>
3129
</dependency>
3230
</dependencies>
3331

‎src/it/test_Scala3_multimodule/module01/pom.xml renamed to ‎src/it/test_aggregate_Scala3/module01/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_aggregate_Scala3/module01/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<parent>
77
<groupId>it.scoverage-maven-plugin</groupId>
8-
<artifactId>test_Scala3_multimodule</artifactId>
8+
<artifactId>test_aggregate_Scala3</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>

‎src/it/test_Scala3_multimodule/pom.xml renamed to ‎src/it/test_aggregate_Scala3/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_aggregate_Scala3/pom.xml
+3-10Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,17 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>test_Scala3_multimodule</artifactId>
14+
<artifactId>test_aggregate_Scala3</artifactId>
1515
<version>1.0-SNAPSHOT</version>
1616
<packaging>pom</packaging>
1717
<name>Test Scala 3 Multi-Module</name>
1818
<description>Test Scala 3 Multi-Module</description>
1919

20-
<properties>
21-
<scala.compat.version>3</scala.compat.version>
22-
<scala.version>3.3.1</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25-
</properties>
26-
2720
<modules>
2821
<module>module01</module>
2922
</modules>

‎src/it/test_exclusion_Scala3_3_3/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_exclusion_Scala3_3_3/pom.xml
+2-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
1818
<description>Test Scoverage exclusion</description>
1919

2020
<properties>
21-
<scala.compat.version>3</scala.compat.version>
2221
<scala.version>3.3.3</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2522
</properties>
2623

2724
<build>

‎src/it/test_exclusion_Scala3_3_4/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_exclusion_Scala3_3_4/pom.xml
+2-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
1818
<description>Test Scoverage exclusion</description>
1919

2020
<properties>
21-
<scala.compat.version>3</scala.compat.version>
2221
<scala.version>3.3.4</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2522
</properties>
2623

2724
<build>

‎src/it/test_exclusion_Scala3_4_1/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_exclusion_Scala3_4_1/pom.xml
+2-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
1818
<description>Test Scoverage exclusion</description>
1919

2020
<properties>
21-
<scala.compat.version>3</scala.compat.version>
2221
<scala.version>3.4.1</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2522
</properties>
2623

2724
<build>

‎src/it/test_exclusion_Scala3_4_2/pom.xml

Copy file name to clipboardExpand all lines: src/it/test_exclusion_Scala3_4_2/pom.xml
+2-5Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>it.scoverage-maven-plugin</groupId>
9-
<artifactId>integration_tests_parent</artifactId>
9+
<artifactId>integration_tests_Scala3_parent</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../integration_tests_parent/pom.xml</relativePath>
11+
<relativePath>../integration_tests_Scala3_parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>test_exclusion</artifactId>
@@ -18,10 +18,7 @@
1818
<description>Test Scoverage exclusion</description>
1919

2020
<properties>
21-
<scala.compat.version>3</scala.compat.version>
2221
<scala.version>3.4.2</scala.version>
23-
<scala.library.artifact.id>scala3-library_3</scala.library.artifact.id>
24-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2522
</properties>
2623

2724
<build>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.