diff --git a/pitest-maven-verification/pom.xml b/pitest-maven-verification/pom.xml
index 654c6b30b..4f44874a3 100644
--- a/pitest-maven-verification/pom.xml
+++ b/pitest-maven-verification/pom.xml
@@ -59,7 +59,7 @@
org.apache.maven
maven-artifact
- ${maven.version}
+ 3.8.6
org.apache.maven
@@ -107,4 +107,13 @@
test
+
+
+
+ org.apache.maven
+ maven-core
+ 3.8.6
+
+
+
diff --git a/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml
index 591656b69..40a71c153 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml
index 34d256fda..266344a61 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml
index 7e1baa189..949901224 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml
index 6922abea7..147fef5c2 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml
index 6507ae48c..0cbc6b01c 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml
@@ -20,7 +20,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml
index 18d573df9..44ee215a5 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-skip/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml
index f8014f2f0..f17fedbc4 100644
--- a/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml
+++ b/pitest-maven-verification/src/test/resources/pit-site-timestamped/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-site-plugin
- 3.4
+ 3.12.0
diff --git a/pitest-maven/pom.xml b/pitest-maven/pom.xml
index f272790c0..353a2050a 100644
--- a/pitest-maven/pom.xml
+++ b/pitest-maven/pom.xml
@@ -46,7 +46,7 @@
org.apache.maven.plugins
maven-plugin-plugin
- 3.5
+ 3.6.4
default-descriptor
@@ -82,18 +82,19 @@
org.apache.maven
maven-plugin-api
- ${maven.version}
+ 3.8.6
+ provided
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.4
+ 3.6.4
provided
org.apache.maven.reporting
maven-reporting-api
- ${maven.version}
+ 3.1.0
@@ -110,18 +111,18 @@
org.codehaus.plexus
plexus-utils
- 3.3.0
+ 3.3.1
org.apache.maven.reporting
maven-reporting-impl
- 2.0.4.3
-
-
- org.apache.maven
- maven-project
- ${maven.version}
+ 3.1.0
+
+ backport-util-concurrent
+ backport-util-concurrent
+ 3.1
+
org.apache.maven.scm
maven-scm-api
@@ -159,12 +160,14 @@
org.apache.maven
maven-artifact
- ${maven.version}
+ 3.8.6
+ provided
org.apache.maven
maven-toolchain
${maven.version}
+ provided
org.slf4j
@@ -185,9 +188,21 @@
- org.apache.maven.shared
+ org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 1.1
+ 3.3.0
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.11
+ test
+
+
+ org.apache.maven
+ maven-compat
+ 3.8.6
test
@@ -195,5 +210,21 @@
1.9.4
+ 3.0.0-M7
+
+
+
+ org.codehaus.plexus
+ plexus-interpolation
+ 1.21
+
+
+ org.apache.maven
+ maven-core
+ 3.8.6
+ provided
+
+
+
diff --git a/pitest-maven/src/main/java/org/pitest/maven/report/AbstractPitAggregationReportMojo.java b/pitest-maven/src/main/java/org/pitest/maven/report/AbstractPitAggregationReportMojo.java
index 1daa72b7d..bff5b5b36 100644
--- a/pitest-maven/src/main/java/org/pitest/maven/report/AbstractPitAggregationReportMojo.java
+++ b/pitest-maven/src/main/java/org/pitest/maven/report/AbstractPitAggregationReportMojo.java
@@ -14,6 +14,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -61,8 +62,8 @@ protected void executeReport(final Locale locale)
}
final ReportAggregator reportAggregator = reportAggregationBuilder
- .inputCharSet(this.getInputEncoding())
- .outputCharset(this.getOutputEncoding())
+ .inputCharSet(Charset.forName(this.getInputEncoding()))
+ .outputCharset(Charset.forName(this.getOutputEncoding()))
.resultOutputStrategy(new DirectoryResultOutputStrategy(
getReportsDirectory().getAbsolutePath(),
new UndatedReportDirCreationStrategy()))
diff --git a/pitest-maven/src/main/java/org/pitest/maven/report/PitReportMojo.java b/pitest-maven/src/main/java/org/pitest/maven/report/PitReportMojo.java
index f63860519..e601d7dc0 100644
--- a/pitest-maven/src/main/java/org/pitest/maven/report/PitReportMojo.java
+++ b/pitest-maven/src/main/java/org/pitest/maven/report/PitReportMojo.java
@@ -185,18 +185,18 @@ public List getSourceDataFormats() {
return this.sourceDataFormats;
}
- public Charset getInputEncoding() {
+ public String getInputEncoding() {
if (inputEncoding != null) {
- return Charset.forName(inputEncoding);
+ return inputEncoding;
}
- return Charset.defaultCharset();
+ return Charset.defaultCharset().name();
}
- public Charset getOutputEncoding() {
+ public String getOutputEncoding() {
if (outputEncoding != null) {
- return Charset.forName(outputEncoding);
+ return outputEncoding;
}
- return Charset.defaultCharset();
+ return Charset.defaultCharset().name();
}
private ReportGenerationContext buildReportGenerationContext(Locale locale) {
diff --git a/pitest-maven/src/test/java/org/pitest/maven/report/PitReportMojoTest.java b/pitest-maven/src/test/java/org/pitest/maven/report/PitReportMojoTest.java
index b835f5567..7cd3d6b57 100644
--- a/pitest-maven/src/test/java/org/pitest/maven/report/PitReportMojoTest.java
+++ b/pitest-maven/src/test/java/org/pitest/maven/report/PitReportMojoTest.java
@@ -14,7 +14,7 @@
*/
package org.pitest.maven.report;
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.verify;
@@ -93,7 +93,7 @@ public void testGenerateReport() throws Exception {
assertThat(actualContext.getReportsDataDirectory(),
sameInstance(this.reportsDirectory));
assertThat(actualContext.getSink(), sameInstance(this.sink));
- assertThat(actualContext.getSiteDirectory().getPath(), is("abspath"
+ assertThat(actualContext.getSiteDirectory().getPath(), endsWith("abspath"
+ File.separator + "pit-reports"));
}
diff --git a/pom.xml b/pom.xml
index 7c5208075..c0b560426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,7 +403,7 @@
4.11
2.2.1
1.7.3
- 2.17
+ 2.18.1
1.7.12
${surefire.version}