diff --git a/pitmp-maven-plugin/pom.xml b/pitmp-maven-plugin/pom.xml index 11f80ce..de3e10a 100644 --- a/pitmp-maven-plugin/pom.xml +++ b/pitmp-maven-plugin/pom.xml @@ -16,7 +16,32 @@ Maven plugin to handle multi-module project for Pitest http://maven.apache.org + 1.8 + 1.8 UTF-8 + + + 3.2.5 + ${maven-plugin-dev.version} + ${maven-plugin-dev.version} + ${maven-plugin-dev.version} + 3.9.0 + 5.9.3 + 2.10.0 + 2.0.0.0 + + + 3.9.0 + 3.11.0 + 3.3.0 + 0.8.10 + 4.3.0 + 2.8.1 + 2.5.3 + 3.0.0-M1 + 1.6.8 + 2.12 + 1.6 @@ -35,26 +60,26 @@ org.apache.maven maven-plugin-api - 2.2.1 + ${maven-plugin-api.version} - - org.apache.maven - maven-project - 2.2.1 - + + + + + - - org.apache.maven - maven-artifact - 2.2.1 - + + + + + org.apache.maven.plugin-tools maven-plugin-annotations - 3.4 + ${maven-plugin-annotations.version} provided @@ -62,40 +87,35 @@ org.junit.platform junit-platform-launcher - 1.2.0 org.junit.platform junit-platform-engine - 1.2.0 org.junit.jupiter junit-jupiter-api - 5.2.0 org.junit.jupiter junit-jupiter-engine - 5.2.0 org.junit.vintage junit-vintage-engine - 5.2.0 org.mockito mockito-core - 2.10.0 + ${mockito.version} test org.hamcrest java-hamcrest - 2.0.0.0 + ${hamcrest.version} test @@ -111,22 +131,30 @@ + + + + org.junit + junit-bom + ${junit.version} + import + pom + + + + org.apache.maven.plugins maven-plugin-plugin - 3.5 + ${maven-plugin-plugin.version} org.apache.maven.plugins maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - + ${maven-compiler-plugin.version} @@ -151,7 +179,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.6 + ${maven-jar-plugin.version} @@ -166,7 +194,7 @@ org.jacoco jacoco-maven-plugin - 0.7.6.201602180812 + ${jacoco-maven-plugin.version} prepare-agent @@ -180,7 +208,7 @@ org.eluder.coveralls coveralls-maven-plugin - 4.3.0 + ${coveralls-maven-plugin.version} @@ -207,13 +235,13 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.1 + ${maven-deploy-plugin.version} org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven-release-plugin.version} @@ -221,13 +249,13 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0-M1 + ${maven-javadoc-plugin.version} org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + ${nexus-staging-maven-plugin.version} true ossrh @@ -238,7 +266,7 @@ org.apache.maven.wagon wagon-ssh - 2.12 + ${wagon-ssh.version} @@ -246,7 +274,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${maven-gpg-plugin.version} sign-artifacts diff --git a/pitmp-maven-plugin/src/main/java/eu/stamp_project/PmpContext.java b/pitmp-maven-plugin/src/main/java/eu/stamp_project/PmpContext.java index 17aee5f..5ae4c68 100644 --- a/pitmp-maven-plugin/src/main/java/eu/stamp_project/PmpContext.java +++ b/pitmp-maven-plugin/src/main/java/eu/stamp_project/PmpContext.java @@ -1,6 +1,7 @@ package eu.stamp_project; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -73,9 +74,9 @@ public static void addNewStrings(List targetList, } // ********************************************************************** - public static ArrayList stringsToFiles(ArrayList nameList) + public static ArrayList stringsToFiles(ArrayList nameList) { - ArrayList fileList = new ArrayList(); + ArrayList fileList = new ArrayList(); File newFile; for (int i = 0; i < nameList.size(); i++) @@ -83,7 +84,7 @@ public static ArrayList stringsToFiles(ArrayList nameList) newFile = new File(nameList.get(i)); if (newFile.exists()) { - fileList.add(newFile); + fileList.add(newFile.toPath()); } } diff --git a/pitmp-maven-plugin/src/main/java/eu/stamp_project/plugins/PmpProject.java b/pitmp-maven-plugin/src/main/java/eu/stamp_project/plugins/PmpProject.java index 3b636e5..bdf3ba8 100644 --- a/pitmp-maven-plugin/src/main/java/eu/stamp_project/plugins/PmpProject.java +++ b/pitmp-maven-plugin/src/main/java/eu/stamp_project/plugins/PmpProject.java @@ -1,6 +1,7 @@ package eu.stamp_project.plugins; import java.io.File; +import java.nio.file.Path; import java.util.*; // ********************************************************************** @@ -216,7 +217,7 @@ private boolean isDefaultNotConfiguredReportOutput() { public void modifyReportOptions() { // require(getPitOptions() != null) - ArrayList fileList = null; + ArrayList fileList = null; ArrayList sourceDirList = null; ArrayList codePaths = null; ArrayList dependsCodePaths = null; diff --git a/pitmp-maven-plugin/src/main/java/eu/stamp_project/report/PseudoPartialyTestingListener.java b/pitmp-maven-plugin/src/main/java/eu/stamp_project/report/PseudoPartialyTestingListener.java index cf17f3c..f9473b4 100644 --- a/pitmp-maven-plugin/src/main/java/eu/stamp_project/report/PseudoPartialyTestingListener.java +++ b/pitmp-maven-plugin/src/main/java/eu/stamp_project/report/PseudoPartialyTestingListener.java @@ -1,11 +1,10 @@ package eu.stamp_project.report; +import eu.stamp_project.descartes.reporting.models.MethodRecord; import org.pitest.mutationtest.ClassMutationResults; import org.pitest.mutationtest.ListenerArguments; import org.pitest.mutationtest.MutationResultListener; -import eu.stamp_project.mutationtest.descartes.reporting.models.MethodRecord; - public class PseudoPartialyTestingListener implements MutationResultListener { private Integer tested = 0; private Integer notCovered = 0; diff --git a/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpDescartesMojo.java b/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpDescartesMojo.java index d1c8d84..d96ef42 100644 --- a/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpDescartesMojo.java +++ b/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpDescartesMojo.java @@ -1,15 +1,10 @@ package org.pitest.maven; -import java.util.ArrayList; -import java.util.Collection; - +import eu.stamp_project.PmpContext; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.pitest.mutationtest.config.ReportOptions; - -import eu.stamp_project.PmpContext; // ********************************************************************** @Mojo(name = "descartes", defaultPhase = LifecyclePhase.VERIFY, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true) diff --git a/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpMojo.java b/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpMojo.java index 7a92d11..70d7b2f 100644 --- a/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpMojo.java +++ b/pitmp-maven-plugin/src/main/java/org/pitest/maven/PmpMojo.java @@ -236,8 +236,8 @@ public boolean isContinueFromModuleSatisfied(MavenProject module) public PmpMojo() { super(new RunPitStrategy(), - new DependencyFilter(new PluginServices(AbstractPitMojo.class.getClassLoader())), - new PluginServices(AbstractPitMojo.class.getClassLoader()), + new DependencyFilter(PluginServices.makeForLoader(AbstractPitMojo.class.getClassLoader())), + PluginServices.makeForLoader(AbstractPitMojo.class.getClassLoader()), new PmpNonEmptyProjectCheck()); } diff --git a/pitmp-maven-plugin/src/test/java/eu/stamp_project/interceptors/DiffMutationFilterFactoryTest.java b/pitmp-maven-plugin/src/test/java/eu/stamp_project/interceptors/DiffMutationFilterFactoryTest.java index 015d0da..582040a 100644 --- a/pitmp-maven-plugin/src/test/java/eu/stamp_project/interceptors/DiffMutationFilterFactoryTest.java +++ b/pitmp-maven-plugin/src/test/java/eu/stamp_project/interceptors/DiffMutationFilterFactoryTest.java @@ -27,7 +27,7 @@ private InterceptorParameters makeFor(String key, String... vals) { final Map> values = new HashMap<>(); values.put(key, Arrays.asList(vals)); final FeatureSetting fs = new FeatureSetting(null, null, values); - return new InterceptorParameters(fs, null, null); + return new InterceptorParameters(fs, null, null, null, null); } } diff --git a/pitmp-maven-plugin/src/test/java/eu/stamp_project/report/PseudoPartialyTestingListenerTest.java b/pitmp-maven-plugin/src/test/java/eu/stamp_project/report/PseudoPartialyTestingListenerTest.java index 0fabd11..2c34707 100644 --- a/pitmp-maven-plugin/src/test/java/eu/stamp_project/report/PseudoPartialyTestingListenerTest.java +++ b/pitmp-maven-plugin/src/test/java/eu/stamp_project/report/PseudoPartialyTestingListenerTest.java @@ -1,11 +1,5 @@ package eu.stamp_project.report; -import static org.pitest.mutationtest.DetectionStatus.KILLED; -import static org.pitest.mutationtest.DetectionStatus.SURVIVED; - -import java.util.ArrayList; -import java.util.Collection; - import org.junit.Test; import org.pitest.classinfo.ClassName; import org.pitest.mutationtest.ClassMutationResults; @@ -13,16 +7,21 @@ import org.pitest.mutationtest.MutationResult; import org.pitest.mutationtest.MutationStatusTestPair; import org.pitest.mutationtest.engine.Location; -import org.pitest.mutationtest.engine.MethodName; import org.pitest.mutationtest.engine.MutationDetails; import org.pitest.mutationtest.engine.MutationIdentifier; +import java.util.ArrayList; +import java.util.Collection; + +import static org.pitest.mutationtest.DetectionStatus.KILLED; +import static org.pitest.mutationtest.DetectionStatus.SURVIVED; + public class PseudoPartialyTestingListenerTest { private MutationResult mutation(String method, DetectionStatus status, String mutant) { return new MutationResult(new MutationDetails( new MutationIdentifier( - new Location(ClassName.fromString("AClass"), MethodName.fromString(method), "()I"), 1, mutant), + new Location(ClassName.fromString("AClass"), method, "()I"), 1, mutant), "path/to/file", "Mutation description", 1, 0), new MutationStatusTestPair(1, status, null)); } diff --git a/pitmp-maven-verification/pom.xml b/pitmp-maven-verification/pom.xml index ef6634d..ff19eaf 100644 --- a/pitmp-maven-verification/pom.xml +++ b/pitmp-maven-verification/pom.xml @@ -15,6 +15,8 @@ http://maven.apache.org UTF-8 + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.conf1.xml b/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.conf1.xml index 5cbfa15..480f69a 100644 --- a/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.conf1.xml +++ b/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.conf1.xml @@ -13,6 +13,8 @@ UTF-8 1.4.2 1.3.5-SNAPSHOT + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.noconf.xml b/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.noconf.xml index 13e0744..df7307a 100644 --- a/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.noconf.xml +++ b/pitmp-maven-verification/src/test/resources/dhell/pom.xml.pitmp.noconf.xml @@ -13,6 +13,8 @@ UTF-8 1.4.2 1.3.5-SNAPSHOT + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.conf1.xml b/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.conf1.xml index 6745190..b185878 100644 --- a/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.conf1.xml +++ b/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.conf1.xml @@ -13,6 +13,8 @@ UTF-8 1.4.2 1.3.5-SNAPSHOT + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.noconf.xml b/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.noconf.xml index 5383c9c..6e619f0 100644 --- a/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.noconf.xml +++ b/pitmp-maven-verification/src/test/resources/dhell5/pom.xml.pitmp.noconf.xml @@ -13,6 +13,8 @@ UTF-8 1.4.2 1.3.5-SNAPSHOT + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.conf1.xml b/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.conf1.xml index 21467f7..c0122bf 100644 --- a/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.conf1.xml +++ b/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.conf1.xml @@ -23,6 +23,8 @@ UTF-8 1.4.2 1.3.5-SNAPSHOT + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.noconf.xml b/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.noconf.xml index a9a524a..ec9de35 100644 --- a/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.noconf.xml +++ b/pitmp-maven-verification/src/test/resources/dnoo/pom.xml.pitmp.noconf.xml @@ -21,6 +21,8 @@ UTF-8 UTF-8 + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.conf1.xml b/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.conf1.xml index cc87c48..5375d75 100644 --- a/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.conf1.xml +++ b/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.conf1.xml @@ -21,6 +21,8 @@ UTF-8 UTF-8 + 1.8 + 1.8 diff --git a/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.noconf.xml b/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.noconf.xml index 157305e..8657664 100644 --- a/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.noconf.xml +++ b/pitmp-maven-verification/src/test/resources/dnoo5/pom.xml.pitmp.noconf.xml @@ -21,6 +21,8 @@ UTF-8 UTF-8 + 1.8 + 1.8 diff --git a/pom.xml b/pom.xml index 2603ebc..010b618 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ UTF-8 UTF-8 github - 1.4.7 - 1.2.5 + 1.13.2 + 1.3.3-SNAPSHOT