You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/11/15 12:08:38 UTC
(maven) branch master updated: Cleanup file access and assertions in ITs (#1912)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 4b0dd4362a Cleanup file access and assertions in ITs (#1912)
4b0dd4362a is described below
commit 4b0dd4362a3440432b28aaff2285c468a85b3638
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 15 13:08:33 2024 +0100
Cleanup file access and assertions in ITs (#1912)
---
.../src/test/java/org/apache/maven/it/ItUtils.java | 23 +--
.../maven/it/MavenIT0008SimplePluginTest.java | 1 -
.../maven/it/MavenIT0009GoalConfigurationTest.java | 1 -
...MavenIT0010DependencyClosureResolutionTest.java | 11 +-
...11DefaultVersionByDependencyManagementTest.java | 11 +-
.../maven/it/MavenIT0012PomInterpolationTest.java | 1 -
.../it/MavenIT0018DependencyManagementTest.java | 3 +-
...MavenIT0019PluginVersionMgmtBySuperPomTest.java | 1 -
.../apache/maven/it/MavenIT0021PomProfileTest.java | 3 +-
.../maven/it/MavenIT0023SettingsProfileTest.java | 1 -
.../it/MavenIT0024MultipleGoalExecutionsTest.java | 1 -
...venIT0025MultipleExecutionLevelConfigsTest.java | 1 -
.../MavenIT0030DepPomDepMgmtInheritanceTest.java | 1 -
.../maven/it/MavenIT0032MavenPrerequisiteTest.java | 1 -
.../it/MavenIT0037AlternatePomFileSameDirTest.java | 1 -
...avenIT0038AlternatePomFileDifferentDirTest.java | 1 -
...avenIT0040PackagingFromPluginExtensionTest.java | 1 -
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 1 -
.../maven/it/MavenIT0051ReleaseProfileTest.java | 1 -
.../maven/it/MavenIT0052ReleaseProfileTest.java | 1 -
.../it/MavenIT0056MultipleGoalExecutionsTest.java | 1 -
.../it/MavenIT0063SystemScopeDependencyTest.java | 5 +-
.../it/MavenIT0064MojoConfigViaSettersTest.java | 1 -
...enIT0071PluginConfigWithDottedPropertyTest.java | 1 -
...nIT0072InterpolationWithDottedPropertyTest.java | 3 +-
.../it/MavenIT0085TransitiveSystemScopeTest.java | 9 +-
.../maven/it/MavenIT0086PluginRealmTest.java | 4 +-
...nIT0087PluginRealmWithProjectLevelDepsTest.java | 6 +-
.../it/MavenIT0090EnvVarInterpolationTest.java | 3 +-
.../maven/it/MavenIT0108SnapshotUpdateTest.java | 3 +-
...ServerAuthzAvailableToWagonMgrInPluginTest.java | 3 +-
.../maven/it/MavenIT0130CleanLifecycleTest.java | 1 -
.../maven/it/MavenIT0131SiteLifecycleTest.java | 1 -
.../maven/it/MavenIT0132PomLifecycleTest.java | 1 -
.../maven/it/MavenIT0133JarLifecycleTest.java | 1 -
.../maven/it/MavenIT0134WarLifecycleTest.java | 1 -
.../maven/it/MavenIT0135EjbLifecycleTest.java | 1 -
.../maven/it/MavenIT0136RarLifecycleTest.java | 1 -
.../maven/it/MavenIT0137EarLifecycleTest.java | 1 -
.../maven/it/MavenIT0138PluginLifecycleTest.java | 1 -
...enIT0139InterpolationWithProjectPrefixTest.java | 4 +-
.../MavenIT0140InterpolationWithPomPrefixTest.java | 4 +-
.../it/MavenIT0142DirectDependencyScopesTest.java | 78 ++++-----
.../MavenIT0143TransitiveDependencyScopesTest.java | 180 +++++++++++----------
.../it/MavenIT0144LifecycleExecutionOrderTest.java | 5 +-
.../it/MavenIT0146InstallerSnapshotNaming.java | 5 +-
.../maven/it/MavenIT0199CyclicImportScopeTest.java | 1 -
.../org/apache/maven/it/MavenITBootstrapTest.java | 1 -
.../MavenITmng0095ReactorFailureBehaviorTest.java | 1 -
.../it/MavenITmng0187CollectedProjectsTest.java | 3 +-
.../MavenITmng0249ResolveDepsFromReactorTest.java | 27 ++--
...82NonReactorExecWhenProjectIndependentTest.java | 1 -
...venITmng0294MergeGlobalAndUserSettingsTest.java | 1 -
.../MavenITmng0377PluginLookupFromPrefixTest.java | 3 +-
.../MavenITmng0449PluginVersionResolutionTest.java | 5 +-
...nITmng0461TolerateMissingDependencyPomTest.java | 9 +-
.../maven/it/MavenITmng0469ReportConfigTest.java | 4 +-
.../it/MavenITmng0471CustomLifecycleTest.java | 1 -
.../it/MavenITmng0479OverrideCentralRepoTest.java | 14 +-
...ITmng0496IgnoreUnknownPluginParametersTest.java | 1 -
.../maven/it/MavenITmng0505VersionRangeTest.java | 16 +-
.../it/MavenITmng0507ArtifactRelocationTest.java | 7 +-
...avenITmng0522InheritedPluginMgmtConfigTest.java | 1 -
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 12 +-
.../MavenITmng0557UserSettingsCliOptionTest.java | 1 -
.../MavenITmng0612NewestConflictResolverTest.java | 1 -
.../it/MavenITmng0666IgnoreLegacyPomTest.java | 9 +-
.../it/MavenITmng0674PluginParameterAliasTest.java | 3 +-
.../maven/it/MavenITmng0680ParentBasedirTest.java | 3 +-
.../MavenITmng0761MissingSnapshotDistRepoTest.java | 1 -
.../maven/it/MavenITmng0768OfflineModeTest.java | 14 +-
...mng0773SettingsProfileReactorPollutionTest.java | 1 -
...MavenITmng0781PluginConfigVsExecConfigTest.java | 1 -
.../it/MavenITmng0786ProfileAwareReactorTest.java | 1 -
...avenITmng0814ExplicitProfileActivationTest.java | 3 +-
.../it/MavenITmng0818WarDepsNotTransitiveTest.java | 7 +-
.../it/MavenITmng0820ConflictResolutionTest.java | 17 +-
.../it/MavenITmng0823MojoContextPassingTest.java | 1 -
...avenITmng0828PluginConfigValuesInDebugTest.java | 10 +-
.../MavenITmng0836PluginParentResolutionTest.java | 3 +-
...g0848UserPropertyOverridesDefaultValueTest.java | 3 +-
.../it/MavenITmng0866EvaluateDefaultValueTest.java | 3 +-
...enITmng0870ReactorAwarePluginDiscoveryTest.java | 3 +-
.../it/MavenITmng0947OptionalDependencyTest.java | 28 ++--
...onentInjectionViaProjectLevelPluginDepTest.java | 5 +-
...venITmng0985NonExecutedPluginMgmtGoalsTest.java | 1 -
...venITmng1021EqualAttachmentBuildNumberTest.java | 5 +-
.../it/MavenITmng1052PluginMgmtConfigTest.java | 1 -
.../MavenITmng1073AggregatorForksReactorTest.java | 1 -
.../MavenITmng1088ReactorPluginResolutionTest.java | 3 +-
...MavenITmng1142VersionRangeIntersectionTest.java | 14 +-
.../it/MavenITmng1144MultipleDefaultGoalsTest.java | 1 -
.../MavenITmng1233WarDepWithProvidedScopeTest.java | 26 +--
.../it/MavenITmng1323AntrunDependenciesTest.java | 6 +-
.../it/MavenITmng1349ChecksumFormatsTest.java | 3 +-
.../it/MavenITmng1412DependenciesOrderTest.java | 17 +-
.../MavenITmng1415QuotedSystemPropertiesTest.java | 3 +-
...venITmng1491ReactorArtifactIdCollisionTest.java | 1 -
...avenITmng1493NonStandardModulePomNamesTest.java | 1 -
.../it/MavenITmng1701DuplicatePluginTest.java | 7 +-
...MavenITmng1703PluginMgmtDepInheritanceTest.java | 6 +-
...51ForcedMetadataUpdateDuringDeploymentTest.java | 8 +-
...03PomValidationErrorIncludesLineNumberTest.java | 9 +-
.../MavenITmng1895ScopeConflictResolutionTest.java | 152 ++++++++---------
...ITmng1957JdkActivationWithVersionRangeTest.java | 4 +-
...venITmng1992SystemPropOverridesPomPropTest.java | 3 +-
...mng1995InterpolateBooleanModelElementsTest.java | 4 +-
...nITmng2006ChildPathAwareUrlInheritanceTest.java | 3 +-
...2045testJarDependenciesBrokenInReactorTest.java | 16 +-
...terpolateWithSettingsProfilePropertiesTest.java | 1 -
...venITmng2054PluginExecutionInheritanceTest.java | 5 +-
.../MavenITmng2068ReactorRelativeParentsTest.java | 1 -
...2098VersionRangeSatisfiedFromWrongRepoTest.java | 3 +-
...venITmng2103PluginExecutionInheritanceTest.java | 7 +-
.../MavenITmng2123VersionRangeDependencyTest.java | 13 +-
...ng2124PomInterpolationWithParentValuesTest.java | 3 +-
...nITmng2130ParentLookupFromReactorCacheTest.java | 1 -
.../it/MavenITmng2135PluginBuildInReactorTest.java | 1 -
.../MavenITmng2136ActiveByDefaultProfileTest.java | 4 +-
...g2140ReactorAwareDepResolutionWhenForkTest.java | 7 +-
...ng2174PluginDepsManagedByParentProfileTest.java | 6 +-
.../it/MavenITmng2196ParentResolutionTest.java | 1 -
.../it/MavenITmng2199ParentVersionRangeTest.java | 27 ++--
...avenITmng2201PluginConfigInterpolationTest.java | 15 +-
...ng2222OutputDirectoryReactorResolutionTest.java | 7 +-
.../it/MavenITmng2228ComponentInjectionTest.java | 5 +-
...venITmng2234ActiveProfilesFromSettingsTest.java | 1 -
.../maven/it/MavenITmng2254PomEncodingTest.java | 3 +-
...276ProfileActivationBySettingsPropertyTest.java | 3 +-
...Tmng2277AggregatorAndResolutionPluginsTest.java | 1 -
.../it/MavenITmng2305MultipleProxiesTest.java | 10 +-
.../MavenITmng2309ProfileInjectionOrderTest.java | 3 +-
.../MavenITmng2318LocalParentResolutionTest.java | 1 -
.../MavenITmng2339BadProjectInterpolationTest.java | 11 +-
.../it/MavenITmng2362DeployedPomEncodingTest.java | 7 +-
...avenITmng2363BasedirAwareFileActivatorTest.java | 1 -
.../maven/it/MavenITmng2387InactiveProxyTest.java | 3 +-
.../it/MavenITmng2432PluginPrefixOrderTest.java | 3 +-
...estampedDependencyVersionInterpolationTest.java | 9 +-
.../maven/it/MavenITmng2562Timestamp322Test.java | 10 +-
.../it/MavenITmng2576MakeLikeReactorTest.java | 1 -
...MavenITmng2577SettingsXmlInterpolationTest.java | 3 +-
...venITmng2591MergeInheritedPluginConfigTest.java | 3 +-
.../MavenITmng2605BogusProfileActivationTest.java | 3 +-
...mng2668UsePluginDependenciesForSortingTest.java | 1 -
.../it/MavenITmng2690MojoLoadingErrorsTest.java | 60 +++----
.../it/MavenITmng2693SitePluginRealmTest.java | 4 +-
.../MavenITmng2695OfflinePluginSnapshotsTest.java | 3 +-
...avenITmng2720SiblingClasspathArtifactsTest.java | 32 ++--
...Tmng2738ProfileIdCollidesWithCliOptionTest.java | 1 -
...venITmng2739RequiredRepositoryElementsTest.java | 7 +-
...41PluginMetadataResolutionErrorMessageTest.java | 7 +-
.../it/MavenITmng2744checksumVerificationTest.java | 3 +-
...venITmng2749ExtensionAvailableToPluginTest.java | 6 +-
...ITmng2771PomExtensionComponentOverrideTest.java | 1 -
.../it/MavenITmng2790LastUpdatedMetadataTest.java | 17 +-
.../maven/it/MavenITmng2820PomCommentsTest.java | 5 +-
...ustomArtifactHandlerAndCustomLifecycleTest.java | 1 -
...mng2843PluginConfigPropertiesInjectionTest.java | 3 +-
...ProfileActivationByEnvironmentVariableTest.java | 3 +-
.../it/MavenITmng2861RelocationsAndRangesTest.java | 13 +-
.../maven/it/MavenITmng2865MirrorWildcardTest.java | 3 +-
...mng2871PrePackageSubartifactResolutionTest.java | 5 +-
.../it/MavenITmng2892HideCorePlexusUtilsTest.java | 5 +-
.../MavenITmng2921ActiveAttachedArtifactsTest.java | 50 +++---
.../it/MavenITmng2926PluginPrefixOrderTest.java | 5 +-
...MavenITmng2972OverridePluginDependencyTest.java | 9 +-
.../MavenITmng2994SnapshotRangeRepositoryTest.java | 3 +-
...004ReactorFailureBehaviorMultithreadedTest.java | 1 -
.../it/MavenITmng3012CoreClassImportTest.java | 5 +-
...enITmng3023ReactorDependencyResolutionTest.java | 35 ++--
.../MavenITmng3038TransitiveDepManVersionTest.java | 1 -
...enITmng3043BestEffortReactorResolutionTest.java | 62 +++----
.../it/MavenITmng3052DepRepoAggregationTest.java | 6 +-
...g3092SnapshotsExcludedFromVersionRangeTest.java | 13 +-
...avenITmng3099SettingsProfilesWithNoPomTest.java | 3 +-
.../it/MavenITmng3118TestClassPathOrderTest.java | 5 +-
...venITmng3122ActiveProfilesNoDuplicatesTest.java | 3 +-
...UrlNormalizationNotBeforeInterpolationTest.java | 3 +-
...3139UseCachedMetadataOfBlacklistedRepoTest.java | 3 +-
.../maven/it/MavenITmng3183LoggingToFileTest.java | 8 +-
.../MavenITmng3203DefaultLifecycleExecIdTest.java | 1 -
...venITmng3208ProfileAwareReactorSortingTest.java | 5 +-
.../MavenITmng3217InterPluginDependencyTest.java | 3 +-
.../maven/it/MavenITmng3220ImportScopeTest.java | 9 +-
...ITmng3259DepsDroppedInMultiModuleBuildTest.java | 1 -
...venITmng3268MultipleHyphenPCommandLineTest.java | 1 -
.../it/MavenITmng3284UsingCachedPluginsTest.java | 3 +-
.../maven/it/MavenITmng3288SystemScopeDirTest.java | 15 +-
...enITmng3297DependenciesNotLeakedToMojoTest.java | 7 +-
.../it/MavenITmng3314OfflineSnapshotsTest.java | 3 +-
.../MavenITmng3331ModulePathNormalizationTest.java | 1 -
...enITmng3355TranslatedPathInterpolationTest.java | 1 -
...avenITmng3372DirectInvocationOfPluginsTest.java | 1 -
...avenITmng3379ParallelArtifactDownloadsTest.java | 12 +-
...avenITmng3380ManagedRelocatedTransdepsTest.java | 9 +-
...avenITmng3394POMPluginVersionDominanceTest.java | 1 -
...encyManagementForOverConstrainedRangesTest.java | 1 -
.../it/MavenITmng3401CLIDefaultExecIdTest.java | 3 +-
.../MavenITmng3415JunkRepositoryMetadataTest.java | 27 ++--
...avenITmng3422ActiveComponentCollectionTest.java | 3 +-
...etadataUpdatedFromDeploymentRepositoryTest.java | 3 +-
.../maven/it/MavenITmng3461MirrorMatchingTest.java | 7 +-
...ictChecksumVerificationOfDependencyPomTest.java | 3 +-
.../maven/it/MavenITmng3475BaseAlignedDirTest.java | 7 +-
...ng3477DependencyResolutionErrorMessageTest.java | 9 +-
...venITmng3482DependencyPomInterpolationTest.java | 9 +-
.../MavenITmng3485OverrideWagonExtensionTest.java | 1 -
.../it/MavenITmng3498ForkToOtherMojoTest.java | 1 -
.../maven/it/MavenITmng3503Xpp3ShadingTest.java | 3 +-
...enITmng3506ArtifactHandlersFromPluginsTest.java | 22 +--
.../maven/it/MavenITmng3529QuotedCliArgTest.java | 3 +-
...avenITmng3535SelfReferentialPropertiesTest.java | 1 -
.../MavenITmng3536AppendedAbsolutePathsTest.java | 1 -
.../it/MavenITmng3545ProfileDeactivationTest.java | 1 -
...5HexadecimalOctalPluginParameterConfigTest.java | 3 +-
...avenITmng3581PluginUsesWagonDependencyTest.java | 1 -
...enITmng3586SystemScopePluginDependencyTest.java | 5 +-
...MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 1 -
.../MavenITmng3600DeploymentModeDefaultsTest.java | 4 +-
...MavenITmng3607ClassLoadersUseValidUrlsTest.java | 4 +-
.../it/MavenITmng3621UNCInheritedPathsTest.java | 3 +-
...MavenITmng3641ProfileActivationWarningTest.java | 16 +-
.../it/MavenITmng3642DynamicResourcesTest.java | 7 +-
.../maven/it/MavenITmng3645POMSyntaxErrorTest.java | 1 -
.../it/MavenITmng3652UserAgentHeaderTest.java | 17 +-
...nITmng3667ResolveDepsWithBadPomVersionTest.java | 9 +-
...enITmng3671PluginLevelDepInterpolationTest.java | 1 -
...avenITmng3679PluginExecIdInterpolationTest.java | 1 -
.../it/MavenITmng3680InvalidDependencyPOMTest.java | 11 +-
.../it/MavenITmng3684BuildPluginParameterTest.java | 1 -
.../it/MavenITmng3693PomFileBasedirChangeTest.java | 1 -
.../MavenITmng3694ReactorProjectsDynamismTest.java | 1 -
.../it/MavenITmng3701ImplicitProfileIdTest.java | 1 -
...g3703ExecutionProjectWithRelativePathsTest.java | 1 -
.../MavenITmng3710PollutedClonedPluginsTest.java | 10 +-
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 5 +-
.../it/MavenITmng3716AggregatorForkingTest.java | 1 -
.../it/MavenITmng3719PomExecutionOrderingTest.java | 13 +-
.../MavenITmng3723ConcreteParentProjectTest.java | 1 -
.../it/MavenITmng3724ExecutionProjectSyncTest.java | 1 -
.../it/MavenITmng3729MultiForkAggregatorsTest.java | 1 -
.../maven/it/MavenITmng3732ActiveProfilesTest.java | 3 +-
...Tmng3740SelfReferentialReactorProjectsTest.java | 1 -
.../it/MavenITmng3746POMPropertyOverrideTest.java | 1 -
.../MavenITmng3747PrefixedPathExpressionTest.java | 3 +-
.../maven/it/MavenITmng3748BadSettingsXmlTest.java | 5 +-
.../MavenITmng3766ToolchainsFromExtensionTest.java | 3 +-
...enITmng3769ExclusionRelocatedTransdepsTest.java | 9 +-
...Tmng3775ConflictResolutionBacktrackingTest.java | 15 +-
...MavenITmng3796ClassImportInconsistencyTest.java | 4 +-
...venITmng3805ExtensionClassPathOrderingTest.java | 6 +-
...ng3807PluginConfigExpressionEvaluationTest.java | 7 +-
...avenITmng3808ReportInheritanceOrderingTest.java | 3 +-
.../it/MavenITmng3810BadProfileActivationTest.java | 1 -
...eportingPluginConfigurationInheritanceTest.java | 3 +-
.../MavenITmng3813PluginClassPathOrderingTest.java | 6 +-
.../it/MavenITmng3814BogusProjectCycleTest.java | 3 +-
.../it/MavenITmng3821EqualPluginExecIdsTest.java | 1 -
...enITmng3822BasedirAlignedInterpolationTest.java | 6 +-
.../maven/it/MavenITmng3827PluginConfigTest.java | 5 +-
.../it/MavenITmng3831PomInterpolationTest.java | 4 +-
...ITmng3833PomInterpolationDataFlowChainTest.java | 3 +-
.../MavenITmng3836PluginConfigInheritanceTest.java | 3 +-
.../it/MavenITmng3838EqualPluginDepsTest.java | 1 -
.../MavenITmng3839PomParsingCoalesceTextTest.java | 3 +-
.../maven/it/MavenITmng3843PomInheritanceTest.java | 10 +-
.../MavenITmng3845LimitedPomInheritanceTest.java | 3 +-
...enITmng3846PomInheritanceUrlAdjustmentTest.java | 3 +-
...g3852PluginConfigWithHeterogeneousListTest.java | 3 +-
...MavenITmng3853ProfileInjectedDistReposTest.java | 3 +-
.../it/MavenITmng3863AutoPluginGroupIdTest.java | 1 -
.../it/MavenITmng3864PerExecPluginConfigTest.java | 5 +-
.../MavenITmng3866PluginConfigInheritanceTest.java | 3 +-
...mng3872ProfileActivationInRelocatedPomTest.java | 14 +-
.../MavenITmng3873MultipleExecutionGoalsTest.java | 9 +-
.../it/MavenITmng3877BasedirAlignedModelTest.java | 7 +-
.../it/MavenITmng3886ExecutionGoalsOrderTest.java | 5 +-
.../it/MavenITmng3887PluginExecutionOrderTest.java | 5 +-
...mng3890TransitiveDependencyScopeUpdateTest.java | 15 +-
.../it/MavenITmng3892ReleaseDeploymentTest.java | 5 +-
.../it/MavenITmng3899ExtensionInheritanceTest.java | 5 +-
...Tmng3900ProfilePropertiesInterpolationTest.java | 3 +-
...enITmng3904NestedBuildDirInterpolationTest.java | 7 +-
...ITmng3906MergedPluginClassPathOrderingTest.java | 26 +--
...venITmng3916PluginExecutionInheritanceTest.java | 5 +-
.../MavenITmng3924XmlMarkupInterpolationTest.java | 3 +-
...venITmng3925MergedPluginExecutionOrderTest.java | 5 +-
...nITmng3927PluginDefaultExecutionConfigTest.java | 1 -
...venITmng3937MergedPluginExecutionGoalsTest.java | 5 +-
.../MavenITmng3938MergePluginExecutionsTest.java | 7 +-
.../it/MavenITmng3940EnvVarInterpolationTest.java | 3 +-
...xecutionProjectRestrictedToForkingMojoTest.java | 3 +-
...venITmng3943PluginExecutionInheritanceTest.java | 5 +-
.../it/MavenITmng3944BasedirInterpolationTest.java | 5 +-
...nITmng3947PluginDefaultExecutionConfigTest.java | 1 -
...ng3948ParentResolutionFromProfileReposTest.java | 3 +-
.../maven/it/MavenITmng3951AbsolutePathsTest.java | 7 +-
.../MavenITmng3953AuthenticatedDeploymentTest.java | 2 +-
.../it/MavenITmng3955EffectiveSettingsTest.java | 3 +-
...ITmng3970DepResolutionFromProfileReposTest.java | 5 +-
.../maven/it/MavenITmng3974MirrorOrderingTest.java | 3 +-
.../maven/it/MavenITmng3979ElementJoinTest.java | 1 -
...ng3983PluginResolutionFromProfileReposTest.java | 5 +-
.../it/MavenITmng3991ValidDependencyScopeTest.java | 1 -
.../MavenITmng3998PluginExecutionConfigTest.java | 5 +-
.../MavenITmng4000MultiPluginExecutionsTest.java | 7 +-
.../it/MavenITmng4005UniqueDependencyKeyTest.java | 7 +-
.../MavenITmng4007PlatformFileSeparatorTest.java | 3 +-
.../it/MavenITmng4008MergedFilterOrderTest.java | 4 +-
.../MavenITmng4009InheritProfileEffectsTest.java | 3 +-
...ITmng4016PrefixedPropertyInterpolationTest.java | 3 +-
...ITmng4022IdempotentPluginConfigMergingTest.java | 3 +-
...ITmng4023ParentProfileOneTimeInjectionTest.java | 4 +-
...MavenITmng4026ReactorDependenciesOrderTest.java | 7 +-
...MavenITmng4034ManagedProfileDependencyTest.java | 7 +-
...ng4036ParentResolutionFromSettingsRepoTest.java | 3 +-
.../MavenITmng4040ProfileInjectedModulesTest.java | 1 -
...ITmng4048VersionRangeReactorResolutionTest.java | 7 +-
.../MavenITmng4052ReactorAwareImportScopeTest.java | 1 -
.../MavenITmng4053PluginConfigAttributesTest.java | 4 +-
...lassifierBasedDepResolutionFromReactorTest.java | 35 ++--
.../it/MavenITmng4068AuthenticatedMirrorTest.java | 3 +-
.../it/MavenITmng4070WhitespaceTrimmingTest.java | 7 +-
.../it/MavenITmng4072InactiveProfileReposTest.java | 7 +-
.../MavenITmng4087PercentEncodedFileUrlTest.java | 3 +-
.../it/MavenITmng4091BadPluginDescriptorTest.java | 19 +--
...Tmng4102InheritedPropertyInterpolationTest.java | 3 +-
...ng4106InterpolationUsesDominantProfileTest.java | 3 +-
...InterpolationUsesDominantProfileSourceTest.java | 3 +-
.../it/MavenITmng4112MavenVersionPropertyTest.java | 10 +-
.../maven/it/MavenITmng4116UndecodedUrlsTest.java | 3 +-
...venITmng4129PluginExecutionInheritanceTest.java | 9 +-
.../maven/it/MavenITmng4150VersionRangeTest.java | 16 +-
.../it/MavenITmng4162ReportingMigrationTest.java | 4 +-
.../it/MavenITmng4166HideCoreCommonsCliTest.java | 5 +-
.../it/MavenITmng4172EmptyDependencySetTest.java | 5 +-
.../MavenITmng4180PerDependencyExclusionsTest.java | 7 +-
.../MavenITmng4189UniqueVersionSnapshotTest.java | 5 +-
.../it/MavenITmng4190MirrorRepoMergingTest.java | 7 +-
.../maven/it/MavenITmng4193UniqueRepoIdTest.java | 1 -
.../it/MavenITmng4196ExclusionOnPluginDepTest.java | 5 +-
...MavenITmng4199CompileMeetsRuntimeScopeTest.java | 53 +++---
...ITmng4203TransitiveDependencyExclusionTest.java | 7 +-
.../it/MavenITmng4207PluginWithLog4JTest.java | 1 -
...nterpolationPrefersCliOverProjectPropsTest.java | 3 +-
...avenITmng4214MirroredParentSearchReposTest.java | 3 +-
.../it/MavenITmng4231SnapshotUpdatePolicyTest.java | 11 +-
...orResolutionForManuallyCreatedArtifactTest.java | 3 +-
...enITmng4235HttpAuthDeploymentChecksumsTest.java | 9 +-
...ITmng4238ArtifactHandlerExtensionUsageTest.java | 10 +-
...nITmng4262MakeLikeReactorDottedPath370Test.java | 1 -
...avenITmng4262MakeLikeReactorDottedPathTest.java | 1 -
...Tmng4269BadReactorResolutionFromOutDirTest.java | 3 +-
...Tmng4270ArtifactHandlersFromPluginDepsTest.java | 10 +-
...4273RestrictedCoreRealmAccessForPluginTest.java | 3 +-
.../it/MavenITmng4274PluginRealmArtifactsTest.java | 5 +-
.../it/MavenITmng4275RelocationWarningTest.java | 13 +-
...venITmng4276WrongTransitivePlexusUtilsTest.java | 5 +-
.../it/MavenITmng4281PreferLocalSnapshotTest.java | 5 +-
.../it/MavenITmng4283ParentPomPackagingTest.java | 1 -
.../MavenITmng4291MojoRequiresOnlineModeTest.java | 1 -
.../MavenITmng4292EnumTypeMojoParametersTest.java | 3 +-
...mng4293RequiresCompilePlusRuntimeScopeTest.java | 26 +--
...venITmng4304ProjectDependencyArtifactsTest.java | 8 +-
.../it/MavenITmng4305LocalRepoBasedirTest.java | 3 +-
...309StrictChecksumValidationForMetadataTest.java | 1 -
...warePluginParameterExpressionInjectionTest.java | 3 +-
...nITmng4314DirectInvocationOfAggregatorTest.java | 1 -
...7PluginVersionResolutionFromMultiReposTest.java | 3 +-
.../it/MavenITmng4318ProjectExecutionRootTest.java | 3 +-
...ng4319PluginExecutionGoalInterpolationTest.java | 1 -
...avenITmng4320AggregatorAndDependenciesTest.java | 20 +--
.../MavenITmng4321CliUsesPluginMgmtConfigTest.java | 1 -
...4326LocalSnapshotSuppressesRemoteCheckTest.java | 22 +--
...7ExcludeForkingMojoFromForkedLifecycleTest.java | 8 +-
...328PrimitiveMojoParameterConfigurationTest.java | 3 +-
.../it/MavenITmng4331DependencyCollectionTest.java | 16 +-
...enITmng4332DefaultPluginExecutionOrderTest.java | 5 +-
.../it/MavenITmng4335SettingsOfflineModeTest.java | 3 +-
.../maven/it/MavenITmng4338OptionalMojosTest.java | 1 -
.../it/MavenITmng4341PluginExecutionOrderTest.java | 5 +-
...2IndependentMojoParameterDefaultValuesTest.java | 3 +-
...venITmng4343MissingReleaseUpdatePolicyTest.java | 19 +--
...enITmng4344ManagedPluginExecutionOrderTest.java | 5 +-
...enITmng4345DefaultPluginExecutionOrderTest.java | 5 +-
...mng4347ImportScopeWithSettingsProfilesTest.java | 3 +-
...ITmng4348NoUnnecessaryRepositoryAccessTest.java | 5 +-
...mng4349RelocatedArtifactWithInvalidPomTest.java | 9 +-
...Tmng4350LifecycleMappingExecutionOrderTest.java | 5 +-
...3PluginDependencyResolutionFromPomRepoTest.java | 5 +-
...355ExtensionAutomaticVersionResolutionTest.java | 3 +-
...NoNeedlessRelookupFromActiveCollectionTest.java | 3 +-
...4357LifecycleMappingDiscoveryInReactorTest.java | 3 +-
...LocallyReachableParentOutsideOfReactorTest.java | 9 +-
.../maven/it/MavenITmng4360WebDavSupportTest.java | 9 +-
...ITmng4361ForceDependencySnapshotUpdateTest.java | 8 +-
...363DynamicAdditionOfDependencyArtifactTest.java | 13 +-
...avenITmng4365XmlMarkupInAttributeValueTest.java | 1 -
...venITmng4367LayoutAwareMirrorSelectionTest.java | 7 +-
...mng4368TimestampAwareArtifactInstallerTest.java | 5 +-
...sitiveSystemPathInterpolatedWithEnvVarTest.java | 9 +-
...enITmng4381ExtensionSingletonComponentTest.java | 3 +-
.../MavenITmng4383ValidDependencyVersionTest.java | 1 -
...LifecycleMappingFromExtensionInReactorTest.java | 9 +-
.../maven/it/MavenITmng4386DebugLoggingTest.java | 7 +-
.../maven/it/MavenITmng4387QuietLoggingTest.java | 5 +-
...nITmng4393ParseExternalParenPomLenientTest.java | 3 +-
.../MavenITmng4396AntBased20xMojoSupportTest.java | 1 -
.../it/MavenITmng4400RepositoryOrderTest.java | 7 +-
...enITmng4401RepositoryOrderForParentPomTest.java | 3 +-
.../it/MavenITmng4402DuplicateChildModuleTest.java | 1 -
...enITmng4403LenientDependencyPomParsingTest.java | 7 +-
.../it/MavenITmng4404UniqueProfileIdTest.java | 1 -
.../it/MavenITmng4405ValidPluginVersionTest.java | 1 -
.../MavenITmng4408NonExistentSettingsFileTest.java | 1 -
.../maven/it/MavenITmng4410UsageHelpTest.java | 1 -
.../maven/it/MavenITmng4411VersionInfoTest.java | 1 -
.../it/MavenITmng4412OfflineModeInPluginTest.java | 5 +-
...avenITmng4413MirroringOfDependencyRepoTest.java | 3 +-
.../it/MavenITmng4415InheritedPluginOrderTest.java | 4 +-
...ng4416PluginOrderAfterProfileInjectionTest.java | 4 +-
...1DeprecatedPomInterpolationExpressionsTest.java | 6 +-
...g4422PluginExecutionPhaseInterpolationTest.java | 1 -
...ssionDataFromPluginParameterExpressionTest.java | 4 +-
.../it/MavenITmng4428FollowHttpRedirectTest.java | 8 +-
...mng4429CompRequirementOnNonDefaultImplTest.java | 3 +-
...nITmng4430DistributionManagementStatusTest.java | 1 -
...avenITmng4433ForceParentSnapshotUpdateTest.java | 5 +-
...MavenITmng4436SingletonComponentLookupTest.java | 4 +-
...ng4450StubModelForMissingDependencyPomTest.java | 3 +-
...4452ResolutionOfSnapshotWithClassifierTest.java | 15 +-
...g4453PluginVersionFromLifecycleMappingTest.java | 1 -
...ITmng4459InMemorySettingsKeptEncryptedTest.java | 3 +-
.../MavenITmng4461ArtifactUploadMonitorTest.java | 1 -
...463DependencyManagementImportVersionRanges.java | 15 +-
...ng4464PlatformIndependentFileSeparatorTest.java | 5 +-
...65PluginPrefixFromLocalCacheOfDownRepoTest.java | 3 +-
...469AuthenticatedDeploymentToCustomRepoTest.java | 2 +-
...Tmng4470AuthenticatedDeploymentToProxyTest.java | 2 +-
...enITmng4474PerLookupWagonInstantiationTest.java | 4 +-
...avenITmng4482ForcePluginSnapshotUpdateTest.java | 8 +-
...mng4488ValidateExternalParenPomLenientTest.java | 3 +-
...MavenITmng4489MirroringOfExtensionRepoTest.java | 3 +-
.../it/MavenITmng4498IgnoreBrokenMetadataTest.java | 9 +-
...Tmng4500NoUpdateOfTimestampedSnapshotsTest.java | 22 +--
...4522FailUponMissingDependencyParentPomTest.java | 3 +-
...venITmng4526MavenProjectArtifactsScopeTest.java | 30 ++--
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 5 +-
...nITmng4536RequiresNoProjectForkingMojoTest.java | 7 +-
...544ActiveComponentCollectionThreadSafeTest.java | 3 +-
...4553CoreArtifactFilterConsidersGroupIdTest.java | 6 +-
...avenITmng4554PluginPrefixMappingUpdateTest.java | 22 +--
...nITmng4555MetaversionResolutionOfflineTest.java | 7 +-
.../MavenITmng4561MirroringOfPluginRepoTest.java | 3 +-
...mng4565MultiConditionProfileActivationTest.java | 1 -
...4572ModelVersionSurroundedByWhitespaceTest.java | 1 -
...LevelPluginDepUsedForCliInvocInReactorTest.java | 4 +-
...fixResolutionFromVersionlessPluginMgmtTest.java | 3 +-
...ImportedPomUsesSystemAndUserPropertiesTest.java | 5 +-
...ng4600DependencyOptionalFlagManagementTest.java | 12 +-
...mng4615ValidateRequiredPluginParameterTest.java | 3 +-
...enITmng4618AggregatorBuiltAfterModulesTest.java | 5 +-
...5SettingsXmlInterpolationWithXmlMarkupTest.java | 3 +-
...PomValidationErrorUponMissingSystemDepTest.java | 1 -
...mng4633DualCompilerExecutionsWeaveModeTest.java | 1 -
...44StrictPomParsingRejectsMisplacedTextTest.java | 1 -
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 3 +-
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 2 +-
.../maven/it/MavenITmng4660ResumeFromTest.java | 1 -
.../it/MavenITmng4666CoreRealmImportTest.java | 8 +-
...mng4677DisabledPluginConfigInheritanceTest.java | 9 +-
.../MavenITmng4679SnapshotUpdateInPluginTest.java | 7 +-
...enITmng4684DistMgmtOverriddenByProfileTest.java | 3 +-
...ng4690InterdependentConflictResolutionTest.java | 19 +--
...mng4696MavenProjectDependencyArtifactsTest.java | 12 +-
...4720DependencyManagementExclusionMergeTest.java | 30 ++--
...MavenITmng4721OptionalPluginDependencyTest.java | 5 +-
...729MirrorProxyAuthUsedByProjectBuilderTest.java | 4 +-
.../it/MavenITmng4745PluginVersionUpdateTest.java | 9 +-
.../MavenITmng4747JavaAgentUsedByPluginTest.java | 4 +-
...esolvedMavenProjectDependencyArtifactsTest.java | 9 +-
...4755FetchRemoteMetadataForVersionRangeTest.java | 9 +-
...enITmng4761PluginLevelDependencyScopesTest.java | 3 +-
.../MavenITmng4765LocalPomProjectBuilderTest.java | 3 +-
...Tmng4768NearestMatchConflictResolutionTest.java | 20 +--
...refixResolutionDoesntTouchDisabledRepoTest.java | 7 +-
...rsionResolutionDoesntTouchDisabledRepoTest.java | 7 +-
...76ForkedReactorPluginVersionResolutionTest.java | 1 -
...tipleDepsWithVersionRangeFromLocalRepoTest.java | 7 +-
...nITmng4781DeploymentToNexusStagingRepoTest.java | 3 +-
...4785TransitiveResolutionInForkedThreadTest.java | 7 +-
.../MavenITmng4786AntBased21xMojoSupportTest.java | 1 -
...ITmng4788InstallationToCustomLocalRepoTest.java | 1 -
...ITmng4789ScopeInheritanceMeetsConflictTest.java | 30 ++--
...rojectBuilderResolvesRemotePomArtifactTest.java | 8 +-
...utionInReactorProjectForkedByLifecycleTest.java | 11 +-
...venITmng4800NearestWinsVsScopeWideningTest.java | 38 ++---
...enITmng4811CustomComponentConfiguratorTest.java | 3 +-
...eResolutionOfDependenciesDuringReactorTest.java | 12 +-
.../MavenITmng4829ChecksumFailureWarningTest.java | 11 +-
...34ParentProjectResolvedFromRemoteReposTest.java | 5 +-
.../it/MavenITmng4840MavenPrerequisiteTest.java | 5 +-
...mng4842ParentResolutionOfDependencyPomTest.java | 11 +-
...eactorResolutionAttachedWithExclusionsTest.java | 12 +-
...avenITmng4874UpdateLatestPluginVersionTest.java | 5 +-
.../MavenITmng4877DeployUsingPrivateKeyTest.java | 3 +-
...83FailUponOverconstrainedVersionRangesTest.java | 3 +-
...ng4890MakeLikeReactorConsidersVersionsTest.java | 1 -
...MavenITmng4891RobustSnapshotResolutionTest.java | 7 +-
...g4895PluginDepWithNonRelocatedMavenApiTest.java | 3 +-
...913UserPropertyVsDependencyPomPropertyTest.java | 14 +-
...g4919LifecycleMappingWithSameGoalTwiceTest.java | 5 +-
...4925ContainerLookupRealmDuringMojoExecTest.java | 3 +-
.../maven/it/MavenITmng4936EventSpyTest.java | 23 +--
...avenITmng4952MetadataReleaseInfoUpdateTest.java | 9 +-
...mng4955LocalVsRemoteSnapshotResolutionTest.java | 7 +-
.../MavenITmng4960MakeLikeReactorResumeTest.java | 1 -
...venITmng4963ParentResolutionFromMirrorTest.java | 3 +-
.../MavenITmng4966AbnormalUrlPreservationTest.java | 3 +-
...g4973ExtensionVisibleToPluginInReactorTest.java | 5 +-
...975ProfileInjectedPluginExecutionOrderTest.java | 5 +-
...mng4987TimestampBasedSnapshotSelectionTest.java | 9 +-
.../maven/it/MavenITmng4991NonProxyHostsTest.java | 9 +-
...ITmng4992MapStylePropertiesParamConfigTest.java | 3 +-
...nITmng5000ChildPathAwareUrlInheritanceTest.java | 3 +-
...VersionRangeDependencyParentResolutionTest.java | 11 +-
.../it/MavenITmng5009AggregationCycleTest.java | 1 -
...igureCollectionArrayFromUserPropertiesTest.java | 3 +-
...Tmng5012CollectionVsArrayParamCoercionTest.java | 3 +-
...g5013ConfigureParamBeanFromScalarValueTest.java | 3 +-
...ingBasedCompLookupFromChildPluginRealmTest.java | 3 +-
.../MavenITmng5064SuppressSnapshotUpdatesTest.java | 18 ++-
...usionAtDependencyWithImpliedClassifierTest.java | 12 +-
...AggregatorDepResolutionModuleExtensionTest.java | 9 +-
...Tmng5137ReactorResolutionInForkedBuildTest.java | 7 +-
.../maven/it/MavenITmng5175WagonHttpTest.java | 3 +-
.../it/MavenITmng5206PlexusLifecycleHonoured.java | 1 -
.../it/MavenITmng5208EventSpyParallelTest.java | 1 -
.../maven/it/MavenITmng5214DontMapWsdlToJar.java | 6 +-
.../maven/it/MavenITmng5222MojoDeprecatedTest.java | 16 +-
.../maven/it/MavenITmng5224InjectedSettings.java | 4 +-
.../MavenITmng5230MakeReactorWithExcludesTest.java | 1 -
...g5280SettingsProfilesRepositoriesOrderTest.java | 7 +-
.../it/MavenITmng5338FileOptionToDirectory.java | 1 -
.../maven/it/MavenITmng5382Jsr330Plugin.java | 1 -
.../MavenITmng5387ArtifactReplacementPlugin.java | 3 +-
...mng5389LifecycleParticipantAfterSessionEnd.java | 1 -
...Tmng5418FileProjectPropertiesActivatorTest.java | 1 -
...445LegacyStringSearchModelInterpolatorTest.java | 1 -
.../MavenITmng5452MavenBuildTimestampUTCTest.java | 4 +-
.../maven/it/MavenITmng5482AetherNotFoundTest.java | 19 +--
.../maven/it/MavenITmng5503ZipInReactorTest.java | 1 -
.../it/MavenITmng5530MojoExecutionScopeTest.java | 1 -
.../MavenITmng5557ProperlyRestrictedReactor.java | 1 -
...5561PluginRelocationLosesConfigurationTest.java | 1 -
.../MavenITmng5572ReactorPluginExtensionsTest.java | 1 -
.../maven/it/MavenITmng5576CdFriendlyVersions.java | 8 +-
.../maven/it/MavenITmng5578SessionScopeTest.java | 1 -
.../it/MavenITmng5581LifecycleMappingDelegate.java | 20 +--
.../maven/it/MavenITmng5591WorkspaceReader.java | 1 -
...00DependencyManagementImportExclusionsTest.java | 5 +-
...MavenITmng5608ProfileActivationWarningTest.java | 8 +-
...MavenITmng5639ImportScopePomResolutionTest.java | 3 +-
...mng5640LifecycleParticipantAfterSessionEnd.java | 161 +++++++++---------
.../it/MavenITmng5659ProjectSettingsTest.java | 26 +--
...Tmng5663NestedImportScopePomResolutionTest.java | 5 +-
.../maven/it/MavenITmng5669ReadPomsOnce.java | 11 +-
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 7 +-
...avenITmng5742BuildExtensionClassloaderTest.java | 3 +-
...mng5753CustomMojoExecutionConfiguratorTest.java | 3 +-
.../maven/it/MavenITmng5760ResumeFeatureTest.java | 25 +--
.../maven/it/MavenITmng5768CliExecutionIdTest.java | 3 +-
.../maven/it/MavenITmng5771CoreExtensionsTest.java | 11 +-
.../MavenITmng5774ConfigurationProcessorsTest.java | 7 +-
.../MavenITmng5783PluginDependencyFiltering.java | 5 +-
.../MavenITmng5805PkgTypeMojoConfiguration2.java | 1 -
.../it/MavenITmng5840ParentVersionRanges.java | 1 -
.../MavenITmng5840RelativePathReactorMatching.java | 1 -
...MavenITmng5868NoDuplicateAttachedArtifacts.java | 5 +-
.../apache/maven/it/MavenITmng5889FindBasedir.java | 3 +-
...enITmng5895CIFriendlyUsageWithPropertyTest.java | 1 -
...ildMultimoduleWithEARFailsToResolveWARTest.java | 1 -
...onalLostInTranstiveManagedDependenciesTest.java | 5 +-
.../MavenITmng5958LifecyclePhaseBinaryCompat.java | 1 -
...enITmng5965ParallelBuildMultipliesWorkTest.java | 5 +-
.../it/MavenITmng6057CheckReactorOrderTest.java | 6 +-
.../maven/it/MavenITmng6065FailOnSeverityTest.java | 5 +-
.../it/MavenITmng6071GetResourceWithCustomPom.java | 1 -
.../maven/it/MavenITmng6084Jsr250PluginTest.java | 1 -
.../maven/it/MavenITmng6090CIFriendlyTest.java | 1 -
.../it/MavenITmng6118SubmoduleInvocation.java | 1 -
...uginExecutionConfigurationInterferenceTest.java | 3 +-
.../MavenITmng6173GetAllProjectsInReactorTest.java | 3 +-
...ITmng6173GetProjectsAndDependencyGraphTest.java | 3 +-
...MavenITmng6189SiteReportPluginsWarningTest.java | 1 -
...venITmng6210CoreExtensionsCustomScopesTest.java | 3 +-
.../apache/maven/it/MavenITmng6223FindBasedir.java | 3 +-
...avenITmng6240PluginExtensionAetherProvider.java | 17 +-
.../maven/it/MavenITmng6255FixConcatLines.java | 3 +-
...nITmng6256SpecialCharsAlternatePOMLocation.java | 1 -
.../MavenITmng6326CoreExtensionsNotFoundTest.java | 3 +-
.../maven/it/MavenITmng6330RelativePath.java | 3 +-
.../it/MavenITmng6386BaseUriPropertyTest.java | 4 +-
.../maven/it/MavenITmng6391PrintVersionTest.java | 8 +-
.../MavenITmng6401ProxyPortInterpolationTest.java | 3 +-
.../it/MavenITmng6506PackageAnnotationTest.java | 1 -
...MavenITmng6511OptionalProjectSelectionTest.java | 1 -
.../MavenITmng6558ToolchainsBuildingEventTest.java | 17 +-
.../it/MavenITmng6562WarnDefaultBindings.java | 1 -
...ecuteAnnotationShouldNotReExecuteGoalsTest.java | 18 +--
...ITmng6609ProfileActivationForPackagingTest.java | 3 +-
.../maven/it/MavenITmng6656BuildConsumer.java | 7 +-
.../maven/it/MavenITmng6720FailFastTest.java | 9 +-
...avenITmng6754TimestampInMultimoduleProject.java | 17 +-
...ng6759TransitiveDependencyRepositoriesTest.java | 1 -
...mng6772NestedImportScopeRepositoryOverride.java | 5 +-
.../maven/it/MavenITmng6957BuildConsumer.java | 7 +-
...avenITmng6972AllowAccessToGraphPackageTest.java | 1 -
...ng6981ProjectListShouldIncludeChildrenTest.java | 22 +--
.../apache/maven/it/MavenITmng7038RootdirTest.java | 149 ++++++++---------
...nITmng7045DropUselessAndOutdatedCdiApiTest.java | 1 -
...avenITmng7051OptionalProfileActivationTest.java | 1 -
.../it/MavenITmng7110ExtensionClassloader.java | 3 +-
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 1 -
...MavenITmng7128BlockExternalHttpReactorTest.java | 1 -
.../it/MavenITmng7160ExtensionClassloader.java | 1 -
.../maven/it/MavenITmng7228LeakyModelTest.java | 1 -
...MavenITmng7244IgnorePomPrefixInExpressions.java | 3 +-
.../it/MavenITmng7255InferredGroupIdTest.java | 1 -
...310LifecycleActivatedInSpecifiedModuleTest.java | 1 -
.../MavenITmng7335MissingJarInParallelBuild.java | 1 -
.../it/MavenITmng7349RelocationWarningTest.java | 16 +-
.../it/MavenITmng7353CliGoalInvocationTest.java | 1 -
.../maven/it/MavenITmng7360BuildConsumer.java | 1 -
.../MavenITmng7390SelectModuleOutsideCwdTest.java | 1 -
...enITmng7404IgnorePrefixlessExpressionsTest.java | 3 +-
...nsistencyOfOptionalProjectsAndProfilesTest.java | 5 +-
...ITmng7464ReadOnlyMojoParametersWarningTest.java | 11 +-
...nITmng7468UnsupportedPluginsParametersTest.java | 17 +-
.../it/MavenITmng7470ResolverTransportTest.java | 3 +-
.../maven/it/MavenITmng7474SessionScopeTest.java | 1 -
.../maven/it/MavenITmng7487DeadlockTest.java | 1 -
...mng7504NotWarnUnsupportedReportPluginsTest.java | 5 +-
...enITmng7529VersionRangeRepositorySelection.java | 3 +-
.../it/MavenITmng7566JavaPrerequisiteTest.java | 5 +-
.../org/apache/maven/it/MavenITmng7587Jsr330.java | 1 -
.../MavenITmng7606DependencyImportScopeTest.java | 1 -
.../maven/it/MavenITmng7629SubtreeBuildTest.java | 1 -
.../it/MavenITmng7679SingleMojoNoPomTest.java | 1 -
.../maven/it/MavenITmng7697PomWithEmojiTest.java | 1 -
.../maven/it/MavenITmng7716BuildDeadlock.java | 1 -
.../it/MavenITmng7737ProfileActivationTest.java | 1 -
...7740ConsumerBuildShouldCleanUpOldFilesTest.java | 24 +--
.../it/MavenITmng7772CoreExtensionFoundTest.java | 5 +-
.../MavenITmng7772CoreExtensionsNotFoundTest.java | 3 +-
.../it/MavenITmng7804PluginExecutionOrderTest.java | 8 +-
...MavenITmng7819FileLockingWithSnapshotsTest.java | 3 +-
.../it/MavenITmng7836AlternativePomSyntaxTest.java | 3 +-
.../it/MavenITmng7837ProjectElementInPomTest.java | 1 -
...venITmng7891ConfigurationForExtensionsTest.java | 8 +-
...avenITmng7939PluginsValidationExcludesTest.java | 16 +-
.../it/MavenITmng7965PomDuplicateTagsTest.java | 9 +-
.../MavenITmng7967ArtifactHandlerLanguageTest.java | 17 +-
...ng7982DependencyManagementTransitivityTest.java | 86 +++++-----
.../MavenITmng8005IdeWorkspaceReaderUsedTest.java | 1 -
...avenITmng8106OverlappingDirectoryRolesTest.java | 7 +-
.../maven/it/MavenITmng8123BuildCacheTest.java | 1 -
.../MavenITmng8133RootDirectoryInParentTest.java | 1 -
.../maven/it/MavenITmng8181CentralRepoTest.java | 1 -
.../it/MavenITmng8220ExtensionWithDITest.java | 1 -
.../maven/it/MavenITmng8230CIFriendlyTest.java | 26 ++-
.../maven/it/MavenITmng8288NoRootPomTest.java | 1 -
.../it/MavenITmng8293BomImportFromReactor.java | 1 -
.../maven/it/MavenITmng8294ParentChecksTest.java | 1 -
.../it/MavenITmng8299CustomLifecycleTest.java | 1 -
...331VersionedAndUnversionedDependenciesTest.java | 1 -
.../it/MavenITmng8336UnknownPackagingTest.java | 5 +-
.../it/MavenITmng8340GeneratedPomInTargetTest.java | 8 +-
.../maven/it/MavenITmng8341DeadlockTest.java | 1 -
...enITmng8347TransitiveDependencyManagerTest.java | 11 +-
...enITmng8360SubprojectProfileActivationTest.java | 1 -
.../org/apache/maven/it/TestSuiteOrdering.java | 20 ---
.../maven/it/AbstractMavenIntegrationTestCase.java | 67 +-------
.../main/java/org/apache/maven/it/Verifier.java | 98 +++++++++++
685 files changed, 2473 insertions(+), 2396 deletions(-)
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
index d6b3812dff..6c0cc0b738 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java
@@ -18,17 +18,14 @@
*/
package org.apache.maven.it;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.DigestInputStream;
import java.security.MessageDigest;
-import org.apache.maven.shared.verifier.Verifier;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author Benjamin Bentmann
@@ -64,12 +61,6 @@ class ItUtils {
return hash.toString();
}
- public static String getLogContent(Verifier verifier) throws IOException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Files.copy(Paths.get(verifier.getBasedir(), verifier.getLogFileName()), baos);
- return baos.toString();
- }
-
/**
* @see ItUtils#setUserHome(Verifier, Path)
*/
@@ -90,4 +81,16 @@ class ItUtils {
verifier.setEnvironmentVariable("MAVEN_OPTS", "\"-Duser.home=" + path + "\"");
}
}
+
+ public static void assertCanonicalFileEquals(File expected, File actual) throws IOException {
+ assertEquals(expected.getCanonicalFile(), actual.getCanonicalFile());
+ }
+
+ public static void assertCanonicalFileEquals(String expected, String actual, String message) throws IOException {
+ assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile(), message);
+ }
+
+ public static void assertCanonicalFileEquals(String expected, String actual) throws IOException {
+ assertEquals(new File(expected).getCanonicalFile(), new File(actual).getCanonicalFile());
+ }
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
index 740339a53d..2a2289c703 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
index 3ad8bb2ead..d45c311a62 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
index a59b04316b..304f739639 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenIntegrationTestCase {
public MavenIT0010DependencyClosureResolutionTest() {
super(ALL_MAVEN_VERSIONS);
@@ -45,7 +46,7 @@ public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenInt
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0010");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -56,8 +57,8 @@ public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenInt
verifier.verifyArtifactPresent("org.apache.maven.its.it0010", "b", "0.2", "jar");
verifier.verifyArtifactPresent("org.apache.maven.its.it0010", "parent", "1.0", "pom");
- List<String> artifacts = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.it0010:a:jar:0.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.it0010:b:jar:0.2"));
+ List<String> artifacts = verifier.loadLines("target/compile.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.it0010:a:jar:0.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.it0010:b:jar:0.2"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
index e3338a5b4c..bc22e306eb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MavenIT0011DefaultVersionByDependencyManagementTest extends AbstractMavenIntegrationTestCase {
public MavenIT0011DefaultVersionByDependencyManagementTest() {
super(ALL_MAVEN_VERSIONS);
@@ -42,15 +43,15 @@ public class MavenIT0011DefaultVersionByDependencyManagementTest extends Abstrac
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0011");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.it0011:a:jar:0.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.it0011:b:jar:0.2"));
+ List<String> artifacts = verifier.loadLines("target/compile.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.it0011:a:jar:0.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.it0011:b:jar:0.2"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
index 5d87666507..5a1b4d508a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
index e34002d684..ca0200cdf3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -42,7 +41,7 @@ public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.it0018");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument(
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
index 4367cdad68..781d4a74bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
index 74e63084f4..b93ab4e208 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -43,7 +42,7 @@ public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.it0021");
verifier.getSystemProperties().setProperty("includeProfile", "true");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("-Pprofile-2");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
index 72e59e2b8a..f01aade3bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
index 76f68d1751..72a47f448b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
index 61dd1145a9..680d01c7cd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
index aa7b04ebfe..c10bd80430 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
index 928193b33d..d0e411a930 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
index 59b512e218..b768b1d433 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
index cddb8c3a4d..c262067cf8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
index 3a55883200..0eb12c3a5c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 0943b03bfd..4e74cb4afa 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
index c6f51ce402..e5f465d106 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
index 135e02b03f..7fd8ffa694 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
index 1911a5d88d..958dc76e07 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
index 1f60680f3e..c006331abb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrationTestCase {
public MavenIT0063SystemScopeDependencyTest() {
super(ALL_MAVEN_VERSIONS);
@@ -48,7 +49,7 @@ public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrati
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/compile.txt", "UTF-8");
+ List<String> lines = verifier.loadLines("target/compile.txt");
assertEquals(2, lines.size());
assertEquals(
new File(testDir, "jdk/lib/tools.jar").getCanonicalFile(),
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
index 500313c423..d21f17bb80 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
index 68d1e9744f..78b54cb5f2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
index fb47fcaefa..d20e899fb3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-885">MNG-885</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
index 6f7d0825b6..73500e62e2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrationTestCase {
public MavenIT0085TransitiveSystemScopeTest() {
super(ALL_MAVEN_VERSIONS);
@@ -47,14 +48,14 @@ public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrati
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0085");
verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath());
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> lines = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(lines.toString(), lines.contains("system.jar"));
+ Collection<String> lines = verifier.loadLines("target/test.txt");
+ assertTrue(lines.contains("system.jar"), lines.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
index a09d92556a..470d7180a5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
index f0fb911294..fe12704c89 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1898">MNG-1898</a>.
*
@@ -50,7 +52,7 @@ public class MavenIT0087PluginRealmWithProjectLevelDepsTest extends AbstractMave
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0087");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
index 78d6610596..6beefaaf71 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MavenIT0090EnvVarInterpolationTest extends AbstractMavenIntegrationTestCase {
public MavenIT0090EnvVarInterpolationTest() {
super(ALL_MAVEN_VERSIONS);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
index aaacc4763a..8242e5980a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
@@ -27,12 +27,13 @@ import java.util.Locale;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* Downloads a snapshot dependency that was deployed with uniqueVersion = false, and checks it can be
* updated. See <a href="https://issues.apache.org/jira/browse/MNG-1908">MNG-1908</a>.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
index 63d8218b72..3fd69661bc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest extends AbstractMavenIntegrationTestCase {
public MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest() {
super("[2.0,3.0-alpha-1),[3.0-alpha-7,)");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
index 8f49ff0d01..847923da77 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
index b9a5ebc222..793c453da3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
index 6ad27808a9..03ad63cd80 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
index c2156f1188..f11a742f07 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
index f2b877a72c..06705cbd2f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
index 2ee41efee4..96d93616fd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
index 95ecf5b6ed..acb9a6543f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
index 422466f7ef..e13cf6efc2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
index 395e137cb9..56437134da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
index 5c82e4391f..5caea805ec 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
*
* @author Benjamin Bentmann
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
index a8d50e14bb..f4648afe80 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* <a href="https://issues.apache.org/jira/browse/MNG-7244">MNG-7244</a> removes the deprecation of
* <code>pom.X</code>.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
index fc2d56fdd0..89ad412f30 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
*
* @author Benjamin Bentmann
@@ -53,66 +55,66 @@ public class MavenIT0142DirectDependencyScopesTest extends AbstractMavenIntegrat
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0142");
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("pom-template.xml", "pom.xml");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt");
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0142:system:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0142:system:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0142:provided:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0142:provided:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"), compileArtifacts.toString());
assertEquals(3, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines("target/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("classes"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("system-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("provided-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("compile-0.1.jar"));
+ List<String> compileClassPath = verifier.loadLines("target/compile-cp.txt");
+ assertTrue(compileClassPath.contains("classes"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("system-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("provided-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("compile-0.1.jar"), compileClassPath.toString());
assertEquals(4, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt");
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(),
- runtimeArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:retro:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:retro:0.1"),
+ runtimeArtifacts.toString());
assertEquals(3, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines("target/runtime-cp.txt", "UTF-8");
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("classes"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("compile-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("runtime-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("runtime-0.1-retro.jar"));
+ List<String> runtimeClassPath = verifier.loadLines("target/runtime-cp.txt");
+ assertTrue(runtimeClassPath.contains("classes"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("compile-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("runtime-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("runtime-0.1-retro.jar"), runtimeClassPath.toString());
assertEquals(4, runtimeClassPath.size());
- List<String> testArtifacts = verifier.loadLines("target/test-artifacts.txt", "UTF-8");
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:system:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:provided:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:0.1"));
+ List<String> testArtifacts = verifier.loadLines("target/test-artifacts.txt");
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0142:system:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0142:provided:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0142:compile:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:0.1"), testArtifacts.toString());
assertTrue(
- testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:retro:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0142:test:jar:0.1"));
+ testArtifacts.contains("org.apache.maven.its.it0142:runtime:jar:retro:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0142:test:jar:0.1"), testArtifacts.toString());
assertEquals(6, testArtifacts.size());
- List<String> testClassPath = verifier.loadLines("target/test-cp.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("system-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("provided-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("compile-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1-retro.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-0.1.jar"));
+ List<String> testClassPath = verifier.loadLines("target/test-cp.txt");
+ assertTrue(testClassPath.contains("classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("system-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("provided-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("compile-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1-retro.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-0.1.jar"), testClassPath.toString());
assertEquals(8, testClassPath.size());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
index 7b1aebc2ca..a415d91a72 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
*
* @author Benjamin Bentmann
@@ -57,47 +59,47 @@ public class MavenIT0143TransitiveDependencyScopesTest extends AbstractMavenInte
* dependency that extends a class from the transitive dependency, i.e.
* project imports A from direct dependency and A extends B from transitive dependency.
*/
- List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt");
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), compileArtifacts.toString());
assertEquals(2, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("classes"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("direct-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("compile-0.1.jar"));
+ List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt");
+ assertTrue(compileClassPath.contains("classes"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("direct-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("compile-0.1.jar"), compileClassPath.toString());
assertEquals(3, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt");
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), runtimeArtifacts.toString());
assertEquals(3, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt", "UTF-8");
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("classes"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("direct-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("compile-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("runtime-0.1.jar"));
+ List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt");
+ assertTrue(runtimeClassPath.contains("classes"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("direct-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("compile-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("runtime-0.1.jar"), runtimeClassPath.toString());
assertEquals(4, runtimeClassPath.size());
- List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt", "UTF-8");
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt");
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), testArtifacts.toString());
assertEquals(3, testArtifacts.size());
- List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("direct-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("compile-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1.jar"));
+ List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt");
+ assertTrue(testClassPath.contains("classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("direct-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("compile-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1.jar"), testClassPath.toString());
assertEquals(5, testClassPath.size());
}
@@ -112,41 +114,41 @@ public class MavenIT0143TransitiveDependencyScopesTest extends AbstractMavenInte
Verifier verifier = run("provided");
String targetDir = "target-provided";
- List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt");
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), compileArtifacts.toString());
assertEquals(3, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("classes"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("direct-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("compile-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("runtime-0.1.jar"));
+ List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt");
+ assertTrue(compileClassPath.contains("classes"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("direct-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("compile-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("runtime-0.1.jar"), compileClassPath.toString());
assertEquals(4, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt");
assertEquals(0, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt", "UTF-8");
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("classes"));
+ List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt");
+ assertTrue(runtimeClassPath.contains("classes"), runtimeClassPath.toString());
assertEquals(1, runtimeClassPath.size());
- List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt", "UTF-8");
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt");
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), testArtifacts.toString());
assertEquals(3, testArtifacts.size());
- List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("direct-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("compile-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1.jar"));
+ List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt");
+ assertTrue(testClassPath.contains("classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("direct-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("compile-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1.jar"), testClassPath.toString());
assertEquals(5, testClassPath.size());
}
@@ -161,41 +163,41 @@ public class MavenIT0143TransitiveDependencyScopesTest extends AbstractMavenInte
Verifier verifier = run("runtime");
String targetDir = "target-runtime";
- List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt");
assertEquals(0, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("classes"));
+ List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt");
+ assertTrue(compileClassPath.contains("classes"), compileClassPath.toString());
assertEquals(1, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt");
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), runtimeArtifacts.toString());
assertEquals(3, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt", "UTF-8");
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("classes"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("direct-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("compile-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("runtime-0.1.jar"));
+ List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt");
+ assertTrue(runtimeClassPath.contains("classes"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("direct-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("compile-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("runtime-0.1.jar"), runtimeClassPath.toString());
assertEquals(4, runtimeClassPath.size());
- List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt", "UTF-8");
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt");
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), testArtifacts.toString());
assertEquals(3, testArtifacts.size());
- List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("direct-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("compile-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1.jar"));
+ List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt");
+ assertTrue(testClassPath.contains("classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("direct-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("compile-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1.jar"), testClassPath.toString());
assertEquals(5, testClassPath.size());
}
@@ -210,32 +212,32 @@ public class MavenIT0143TransitiveDependencyScopesTest extends AbstractMavenInte
Verifier verifier = run("test");
String targetDir = "target-test";
- List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines(targetDir + "/compile-artifacts.txt");
assertEquals(0, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("classes"));
+ List<String> compileClassPath = verifier.loadLines(targetDir + "/compile-cp.txt");
+ assertTrue(compileClassPath.contains("classes"), compileClassPath.toString());
assertEquals(1, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines(targetDir + "/runtime-artifacts.txt");
assertEquals(0, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt", "UTF-8");
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("classes"));
+ List<String> runtimeClassPath = verifier.loadLines(targetDir + "/runtime-cp.txt");
+ assertTrue(runtimeClassPath.contains("classes"), runtimeClassPath.toString());
assertEquals(1, runtimeClassPath.size());
- List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt", "UTF-8");
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"));
- assertTrue(testArtifacts.toString(), testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"));
+ List<String> testArtifacts = verifier.loadLines(targetDir + "/test-artifacts.txt");
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:direct:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:compile:jar:0.1"), testArtifacts.toString());
+ assertTrue(testArtifacts.contains("org.apache.maven.its.it0143:runtime:jar:0.1"), testArtifacts.toString());
assertEquals(3, testArtifacts.size());
- List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("test-classes"));
- assertTrue(testClassPath.toString(), testClassPath.contains("direct-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("compile-0.1.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("runtime-0.1.jar"));
+ List<String> testClassPath = verifier.loadLines(targetDir + "/test-cp.txt");
+ assertTrue(testClassPath.contains("classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("test-classes"), testClassPath.toString());
+ assertTrue(testClassPath.contains("direct-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("compile-0.1.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("runtime-0.1.jar"), testClassPath.toString());
assertEquals(5, testClassPath.size());
}
@@ -248,8 +250,8 @@ public class MavenIT0143TransitiveDependencyScopesTest extends AbstractMavenInte
verifier.deleteArtifacts("org.apache.maven.its.it0143");
Map<String, String> filterProps = verifier.newDefaultFilterMap();
filterProps.put("@scope@", scope);
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8", filterProps);
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("pom-template.xml", "pom.xml", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.setLogFileName("log-" + scope + ".txt");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
index 340f45ae67..c581bef64a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Benjamin Bentmann
*
@@ -97,7 +98,7 @@ public class MavenIT0144LifecycleExecutionOrderTest extends AbstractMavenIntegra
expected.add("post-site");
expected.add("site-deploy");
- List<String> phases = verifier.loadLines("target/phases.log", "UTF-8");
+ List<String> phases = verifier.loadLines("target/phases.log");
assertEquals(expected, phases);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index 26b97beb05..a948888aaa 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -80,7 +79,7 @@ public class MavenIT0146InstallerSnapshotNaming extends AbstractMavenIntegration
properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName());
properties.put("@port@", Integer.toString(port));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", properties);
+ verifier.filterFile("settings-template.xml", "settings.xml", properties);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
@@ -117,7 +116,7 @@ public class MavenIT0146InstallerSnapshotNaming extends AbstractMavenIntegration
properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName());
properties.put("@port@", Integer.toString(port));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", properties);
+ verifier.filterFile("settings-template.xml", "settings.xml", properties);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
index 6021b676f1..63db220a75 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
index 2e30525b60..fe52038c5d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
index 7165136424..29f933c8cc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
index b579e92946..6d768a9300 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java
@@ -25,10 +25,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-187">MNG-187</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
index edbc5b8414..2833dabffd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-249">MNG-249</a>.
*
@@ -51,19 +52,19 @@ public class MavenITmng0249ResolveDepsFromReactorTest extends AbstractMavenInteg
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> ccp = verifier.loadLines("test-component-c/target/compile.txt", "UTF-8");
- assertTrue(ccp.toString(), ccp.contains("test-component-c/classes"));
- assertTrue(ccp.toString(), ccp.contains("test-component-b/classes"));
- assertTrue(ccp.toString(), ccp.contains("test-component-a/classes"));
+ List<String> ccp = verifier.loadLines("test-component-c/target/compile.txt");
+ assertTrue(ccp.contains("test-component-c/classes"), ccp.toString());
+ assertTrue(ccp.contains("test-component-b/classes"), ccp.toString());
+ assertTrue(ccp.contains("test-component-a/classes"), ccp.toString());
- List<String> rcp = verifier.loadLines("test-component-c/target/runtime.txt", "UTF-8");
- assertTrue(rcp.toString(), rcp.contains("test-component-c/classes"));
- assertTrue(rcp.toString(), rcp.contains("test-component-b/classes"));
- assertTrue(rcp.toString(), rcp.contains("test-component-a/classes"));
+ List<String> rcp = verifier.loadLines("test-component-c/target/runtime.txt");
+ assertTrue(rcp.contains("test-component-c/classes"), rcp.toString());
+ assertTrue(rcp.contains("test-component-b/classes"), rcp.toString());
+ assertTrue(rcp.contains("test-component-a/classes"), rcp.toString());
- List<String> tcp = verifier.loadLines("test-component-c/target/test.txt", "UTF-8");
- assertTrue(tcp.toString(), tcp.contains("test-component-c/classes"));
- assertTrue(tcp.toString(), tcp.contains("test-component-b/classes"));
- assertTrue(tcp.toString(), tcp.contains("test-component-a/classes"));
+ List<String> tcp = verifier.loadLines("test-component-c/target/test.txt");
+ assertTrue(tcp.contains("test-component-c/classes"), tcp.toString());
+ assertTrue(tcp.contains("test-component-b/classes"), tcp.toString());
+ assertTrue(tcp.contains("test-component-a/classes"), tcp.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
index 9f02ad1c6d..d324bc1fcf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index 3ec17fbd93..7b35a70ea9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 49538bf477..24ae386d61 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -49,7 +48,7 @@ public class MavenITmng0377PluginLookupFromPrefixTest extends AbstractMavenInteg
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0377");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("-Dtouch.outputFile=target/file.txt");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index 797fbbb8a9..e2036ce5b2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -57,7 +56,7 @@ public class MavenITmng0449PluginVersionResolutionTest extends AbstractMavenInte
}
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -94,7 +93,7 @@ public class MavenITmng0449PluginVersionResolutionTest extends AbstractMavenInte
}
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("org.apache.maven.its.mng0449:maven-it-plugin-a:touch");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
index f8dbeb33c3..104bfc5dda 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-461">MNG-461</a>.
*
@@ -49,14 +50,14 @@ public class MavenITmng0461TolerateMissingDependencyPomTest extends AbstractMave
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0461");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(classpath.toString(), classpath.contains("dep-0.1.jar"));
+ List<String> classpath = verifier.loadLines("target/classpath.txt");
+ assertTrue(classpath.contains("dep-0.1.jar"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index 023083e31d..b9cd00ba1a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-469">MNG-469</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index 5deef8815e..6f53e49967 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index 256c9c4ad9..c2a85d54b5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-479">MNG-479</a>.
*
@@ -62,7 +64,7 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval");
@@ -121,7 +123,7 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0479");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -139,7 +141,7 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat
verifier = newVerifier(new File(testDir, "test-2").getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
try {
@@ -156,7 +158,7 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat
verifier = newVerifier(new File(testDir, "test-3").getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
try {
@@ -174,7 +176,7 @@ public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrat
verifier = newVerifier(new File(testDir, "test-4").getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
try {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 9b156f3e07..6dffcf8199 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
index 676633f5f4..f2192bbb3a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-505">MNG-505</a>.
*
@@ -53,18 +55,18 @@ public class MavenITmng0505VersionRangeTest extends AbstractMavenIntegrationTest
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0505");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ Collection<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(4, artifacts.size());
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0505:a:jar:1.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0505:b:jar:1.0"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0505:c:jar:3.8"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0505:d:jar:2.1.1"));
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0505:a:jar:1.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0505:b:jar:1.0"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0505:c:jar:3.8"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0505:d:jar:2.1.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index f5d6265485..663e3999d3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-507">MNG-507</a>.
*
@@ -61,7 +62,7 @@ public class MavenITmng0507ArtifactRelocationTest extends AbstractMavenIntegrati
verifier.verifyArtifactPresent("org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom");
verifier.verifyArtifactNotPresent("org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar");
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven:maven-core-it-support:jar:1.1"));
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven:maven-core-it-support:jar:1.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
index 096c462915..dce1b90558 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index 3d3cc487d7..d809b2ed70 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -41,6 +40,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-553">MNG-553</a>.
@@ -122,7 +122,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng0553");
verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
ItUtils.setUserHome(verifier, new File(testDir, "userhome"));
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
@@ -156,8 +156,8 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte
verifier.verifyArtifactNotPresent("org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar");
// NOTE: The tilde ~ in the file name is essential part of the test
- verifier.filterFile("security-template.xml", "settings~security.xml", "UTF-8", filterProps);
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("security-template.xml", "settings~security.xml", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
@@ -194,7 +194,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> log = verifier.loadLines(verifier.getLogFileName(), null);
+ List<String> log = verifier.loadLogLines();
assertNotNull(findPassword(log));
verifier = newVerifier(testDir.getAbsolutePath());
@@ -207,7 +207,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest extends AbstractMavenInte
verifier.execute();
verifier.verifyErrorFreeLog();
- log = verifier.loadLines(verifier.getLogFileName(), null);
+ log = verifier.loadLogLines();
assertNotNull(findPassword(log));
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
index 6f80474057..d10f2726b8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
index d0d0a69471..cd563cd928 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
index dfc9b2c90d..2ce3b83237 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-666">MNG-666</a>.
*
@@ -50,7 +51,7 @@ public class MavenITmng0666IgnoreLegacyPomTest extends AbstractMavenIntegrationT
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0059");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -59,7 +60,7 @@ public class MavenITmng0666IgnoreLegacyPomTest extends AbstractMavenIntegrationT
verifier.verifyArtifactPresent("org.apache.maven.its.it0059", "test", "3.8.1", "jar");
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.it0059:test:jar:3.8.1"));
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.it0059:test:jar:3.8.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
index 68c478045a..fcb3e914ff 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-674">MNG-674</a> and
* <a href="https://issues.apache.org/jira/browse/MNG-4997">MNG-4997</a>.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
index 15373739b2..cbea038600 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-680">MNG-680</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
index 78cbe1bcc8..0ce47bbb59 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index 4b6689b3ba..41f84f50eb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
@@ -27,10 +27,9 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -39,6 +38,8 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-768">MNG-768</a>.
*
@@ -110,9 +111,8 @@ public class MavenITmng0768OfflineModeTest extends AbstractMavenIntegrationTestC
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0768");
verifier.setLogFileName("log1.txt");
- Properties props = new Properties();
- props.put("@port@", Integer.toString(port));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", props);
+ Map<String, String> props = Map.of("@port@", Integer.toString(port));
+ verifier.filterFile("settings-template.xml", "settings.xml", props);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument(
@@ -140,7 +140,7 @@ public class MavenITmng0768OfflineModeTest extends AbstractMavenIntegrationTestC
verifier.verifyErrorFreeLog();
}
- assertTrue(requestedUris.toString(), requestedUris.isEmpty());
+ assertTrue(requestedUris.isEmpty(), requestedUris.toString());
{
// phase 3: delete test artifact and run build in offline mode to check it fails now
@@ -166,7 +166,7 @@ public class MavenITmng0768OfflineModeTest extends AbstractMavenIntegrationTestC
System.out.println("Bound server socket to the port " + port);
- assertTrue(requestedUris.toString(), requestedUris.isEmpty());
+ assertTrue(requestedUris.isEmpty(), requestedUris.toString());
} finally {
server.stop();
server.join();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
index 70380b77ff..6c00d8cef1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
index 5f710a1f52..d28e04ef50 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index 42bbf9525e..8560d6e89a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
index 77d54f0cd6..9ff2eb7997 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-814">MNG-814</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
index 95faf9af0e..032228eae3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Collection;
import java.util.Collections;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-818">MNG-818</a>.
*
@@ -50,14 +51,14 @@ public class MavenITmng0818WarDepsNotTransitiveTest extends AbstractMavenIntegra
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0080");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ Collection<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(Collections.singletonList("org.apache.maven.its.it0080:war:war:0.1"), artifacts);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
index 42f798a83c..ffe7fb6975 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
@@ -21,10 +21,13 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-820">MNG-820</a>.
*
@@ -49,18 +52,18 @@ public class MavenITmng0820ConflictResolutionTest extends AbstractMavenIntegrati
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0820");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ Collection<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(3, artifacts.size());
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0820:d:jar:2.0"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0820:c:jar:1.4"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0820:a:jar:1.0"));
- assertFalse(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng0505:b:jar:1.0"));
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0820:d:jar:2.0"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0820:c:jar:1.4"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng0820:a:jar:1.0"), artifacts.toString());
+ assertFalse(artifacts.contains("org.apache.maven.its.mng0505:b:jar:1.0"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
index be446da280..35aa44c307 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
index f5b0438686..b488b16e89 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java
@@ -23,11 +23,11 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-828">MNG-828</a>.
*
@@ -58,7 +58,7 @@ public class MavenITmng0828PluginConfigValuesInDebugTest extends AbstractMavenIn
verifier.execute();
verifier.verifyErrorFreeLog();
- String log = FileUtils.fileRead(new File(verifier.getBasedir(), verifier.getLogFileName()));
+ String log = verifier.loadLogContent();
checkLog(log, "[DEBUG] (f) aliasDefaultExpressionParam = test");
checkLog(log, "[DEBUG] (f) basedir = " + testDir.getCanonicalPath());
@@ -110,7 +110,7 @@ public class MavenITmng0828PluginConfigValuesInDebugTest extends AbstractMavenIn
private void checkLog(String log, String expected) {
assertTrue(
- NL + ">>>" + NL + log + "<<<" + NL + NL + "does not contains: " + NL + expected + NL,
- log.contains(expected));
+ log.contains(expected),
+ NL + ">>>" + NL + log + "<<<" + NL + NL + "does not contains: " + NL + expected + NL);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
index fc9e9f2f83..51ef59d925 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -51,7 +50,7 @@ public class MavenITmng0836PluginParentResolutionTest extends AbstractMavenInteg
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng836");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
// Maven 3.x aims to separate plugins and project dependencies (MNG-4191)
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
index 8cb8f49128..98dd8ef6c6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-848">MNG-848</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
index 562c6412b3..936929206a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-866">MNG-866</a> and
* <a href="https://issues.apache.org/jira/browse/MNG-160">MNG-160</a>.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
index 522d9a0150..3c4c89075b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ public class MavenITmng0870ReactorAwarePluginDiscoveryTest extends AbstractMaven
verifier.setAutoclean(false);
verifier.deleteDirectory("project/target");
verifier.deleteArtifacts("org.apache.maven.its.mng0870");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("initialize");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
index 786fe5e8cc..4d6c2f78e5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-947">MNG-947</a>.
*
@@ -52,28 +54,28 @@ public class MavenITmng0947OptionalDependencyTest extends AbstractMavenIntegrati
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0947");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"));
- assertTrue(compile.toString(), compile.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"), compile.toString());
+ assertTrue(compile.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"), compile.toString());
assertEquals(2, compile.size());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("org.apache.maven.its.mng0947:c:jar:0.1"));
- assertTrue(runtime.toString(), runtime.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"));
- assertTrue(runtime.toString(), runtime.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("org.apache.maven.its.mng0947:c:jar:0.1"), runtime.toString());
+ assertTrue(runtime.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"), runtime.toString());
+ assertTrue(runtime.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"), runtime.toString());
assertEquals(3, runtime.size());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("org.apache.maven.its.mng0947:c:jar:0.1"));
- assertTrue(test.toString(), test.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"));
- assertTrue(test.toString(), test.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("org.apache.maven.its.mng0947:c:jar:0.1"), test.toString());
+ assertTrue(test.contains("org.apache.maven.its.mng0947:d:jar:0.1 (optional)"), test.toString());
+ assertTrue(test.contains("org.apache.maven.its.mng0947:e:jar:0.1 (optional)"), test.toString());
assertEquals(3, test.size());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
index fcbe0fc872..4baa9ea583 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-956">MNG-956</a>.
*
@@ -48,7 +49,7 @@ public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest extend
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng0956");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
index a1fbd26a1f..57716c07b9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index 67d4613b83..c9cb0d5992 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -20,10 +20,11 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1021">MNG-1021</a>.
*
@@ -58,7 +59,7 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest extends AbstractMavenI
String dir = "repo/org/apache/maven/its/mng1021/test/";
String snapshot = getSnapshotVersion(new File(testDir, dir + "1-SNAPSHOT"));
- assertTrue(snapshot, snapshot.endsWith("-1"));
+ assertTrue(snapshot.endsWith("-1"), snapshot);
verifier.verifyFilePresent(dir + "maven-metadata.xml");
verifier.verifyFilePresent(dir + "maven-metadata.xml.md5");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
index 0582fce93a..5e801aa160 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
index abbde70416..b348e56b1c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index 74bcefd87c..2bc4d3d2d0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -53,7 +52,7 @@ public class MavenITmng1088ReactorPluginResolutionTest extends AbstractMavenInte
verifier.setAutoclean(false);
verifier.deleteDirectory("client/target");
verifier.deleteArtifacts("org.apache.maven.its.mng1088");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
// NOTE: It's essential part of the test to invoke a phase before "compile"
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
index 91e8fad21f..c64dce1f8c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1142">MNG-1142</a>.
*
@@ -67,15 +69,15 @@ public class MavenITmng1142VersionRangeIntersectionTest extends AbstractMavenInt
verifier.deleteArtifacts("org.apache.maven.its.mng1142");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath = verifier.loadLines("target/classpath.txt", "UTF-8");
+ List<String> classpath = verifier.loadLines("target/classpath.txt");
- assertFalse(classpath.toString(), classpath.contains("a-1.1.2.jar"));
- assertTrue(classpath.toString(), classpath.contains("a-1.1.1.jar"));
- assertTrue(classpath.toString(), classpath.contains("b-0.1.jar"));
+ assertFalse(classpath.contains("a-1.1.2.jar"), classpath.toString());
+ assertTrue(classpath.contains("a-1.1.1.jar"), classpath.toString());
+ assertTrue(classpath.contains("b-0.1.jar"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
index 2b51a3e49a..ca7d8113c4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
index 2163ebb99d..ad45b9a28f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1233">MNG-1233</a>.
*
@@ -49,27 +51,27 @@ public class MavenITmng1233WarDepWithProvidedScopeTest extends AbstractMavenInte
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.it0083");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> compileArtifacts = verifier.loadLines("target/compile.txt", "UTF-8");
+ Collection<String> compileArtifacts = verifier.loadLines("target/compile.txt");
assertTrue(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.it0083:direct-dep:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0083:direct-dep:jar:0.1"),
+ compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.it0083:trans-dep:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.it0083:trans-dep:jar:0.1"),
+ compileArtifacts.toString());
- Collection<String> runtimeArtifacts = verifier.loadLines("target/runtime.txt", "UTF-8");
+ Collection<String> runtimeArtifacts = verifier.loadLines("target/runtime.txt");
assertTrue(
- runtimeArtifacts.toString(),
- runtimeArtifacts.contains("org.apache.maven.its.it0083:direct-dep:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0083:direct-dep:jar:0.1"),
+ runtimeArtifacts.toString());
assertFalse(
- runtimeArtifacts.toString(),
- runtimeArtifacts.contains("org.apache.maven.its.it0083:trans-dep:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.it0083:trans-dep:jar:0.1"),
+ runtimeArtifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
index 888a8d92d1..d5074b7d51 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1323">MNG-1323</a>.
*
@@ -54,7 +56,7 @@ public class MavenITmng1323AntrunDependenciesTest extends AbstractMavenIntegrati
verifier.deleteDirectory("b/target");
verifier.deleteDirectory("c/target");
verifier.deleteArtifacts("org.apache.maven.its.mng1323");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index 65c670e749..20a03027c8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -48,7 +47,7 @@ public class MavenITmng1349ChecksumFormatsTest extends AbstractMavenIntegrationT
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng1349");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
index 709b333661..ee3f7c1e8d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1412">MNG-1412</a>:
* it tests that dependencies order in classpath matches <code>pom.xml</code>.
@@ -46,29 +47,29 @@ public class MavenITmng1412DependenciesOrderTest extends AbstractMavenIntegratio
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng1412");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt");
assertArtifactOrder(compileArtifacts);
- List<String> compileClassPath = verifier.loadLines("target/compile-classpath.txt", "UTF-8");
+ List<String> compileClassPath = verifier.loadLines("target/compile-classpath.txt");
assertClassPathOrder(compileClassPath.subList(1, compileClassPath.size()));
- List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt");
assertArtifactOrder(runtimeArtifacts);
- List<String> runtimeClassPath = verifier.loadLines("target/runtime-classpath.txt", "UTF-8");
+ List<String> runtimeClassPath = verifier.loadLines("target/runtime-classpath.txt");
assertClassPathOrder(runtimeClassPath.subList(1, runtimeClassPath.size()));
- List<String> testArtifacts = verifier.loadLines("target/test-artifacts.txt", "UTF-8");
+ List<String> testArtifacts = verifier.loadLines("target/test-artifacts.txt");
assertArtifactOrder(testArtifacts);
- List<String> testClassPath = verifier.loadLines("target/test-classpath.txt", "UTF-8");
+ List<String> testClassPath = verifier.loadLines("target/test-classpath.txt");
assertClassPathOrder(testClassPath.subList(2, testClassPath.size()));
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
index e6a8a1a245..8b321c68da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1415">MNG-1415</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
index 92b98de953..74469520aa 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
index e35dd4713d..e0164db564 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
index f5431e2754..bc91497948 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1701">MNG-1701</a>.
*
@@ -62,7 +63,7 @@ public class MavenITmng1701DuplicatePluginTest extends AbstractMavenIntegrationT
logLevel = "ERROR";
}
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8");
+ List<String> lines = verifier.loadLogLines();
boolean foundMessage = false;
for (String line : lines) {
if (line.startsWith("[" + logLevel + "]")
@@ -73,6 +74,6 @@ public class MavenITmng1701DuplicatePluginTest extends AbstractMavenIntegrationT
}
}
- assertTrue("Duplicate plugin message wasn't generated.", foundMessage);
+ assertTrue(foundMessage, "Duplicate plugin message wasn't generated.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
index d8e31365de..58ea397f15 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1703">MNG-1703</a>.
*
@@ -49,7 +51,7 @@ public class MavenITmng1703PluginMgmtDepInheritanceTest extends AbstractMavenInt
Verifier verifier = newVerifier(new File(testDir, "child").getAbsolutePath());
verifier.setAutoclean(false);
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.deleteDirectory("target");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
index 41addbd184..c39b806c46 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1751">MNG-1751</a>.
*
@@ -66,7 +68,7 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest extends Abst
verifier = newVerifier(new File(testDir, "test").getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng1751");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -75,7 +77,7 @@ public class MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest extends Abst
Properties checksums = verifier.loadProperties("target/checksum.properties");
String sha1 = checksums.getProperty("dep-0.1-SNAPSHOT.jar", "").toLowerCase(java.util.Locale.ENGLISH);
- assertEquals(sha1, 40, sha1.length());
+ assertEquals(40, sha1.length(), sha1);
assertNotEquals("fc081cd365b837dcb01eb9991f21c409b155ea5c", sha1);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
index 7f16603175..7a0d5d4a9c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1803">MNG-1803</a>.
*
@@ -57,7 +58,7 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest extends Abst
boolean foundError = false;
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), null);
+ List<String> lines = verifier.loadLogLines();
for (String line : lines) {
if (line.contains(":bad/id:")) {
String location;
@@ -66,12 +67,12 @@ public class MavenITmng1803PomValidationErrorIncludesLineNumberTest extends Abst
} else {
location = "line 34, column 19";
}
- assertTrue("Position not found in: " + line, line.indexOf(location) > 0);
+ assertTrue(line.indexOf(location) > 0, "Position not found in: " + line);
foundError = true;
break;
}
}
- assertTrue("Build output did not mention validation error!", foundError);
+ assertTrue(foundError, "Build output did not mention validation error!");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
index d0dd94d5b7..74ba66e8da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1895">MNG-1895</a>.
*
@@ -53,28 +55,28 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
verifier.deleteDirectory("target");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("a-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("b-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("c-0.1.jar"));
- assertTrue(compile.toString(), compile.contains("d-0.1.jar"));
-
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
- assertTrue(runtime.toString(), runtime.contains("b-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("c-0.1.jar"));
- assertTrue(runtime.toString(), runtime.contains("d-0.1.jar"));
-
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
- assertTrue(test.toString(), test.contains("b-0.1.jar"));
- assertTrue(test.toString(), test.contains("c-0.1.jar"));
- assertTrue(test.toString(), test.contains("d-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("a-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("b-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("c-0.1.jar"), compile.toString());
+ assertTrue(compile.contains("d-0.1.jar"), compile.toString());
+
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
+ assertTrue(runtime.contains("b-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("c-0.1.jar"), runtime.toString());
+ assertTrue(runtime.contains("d-0.1.jar"), runtime.toString());
+
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
+ assertTrue(test.contains("b-0.1.jar"), test.toString());
+ assertTrue(test.contains("c-0.1.jar"), test.toString());
+ assertTrue(test.contains("d-0.1.jar"), test.toString());
}
/**
@@ -86,17 +88,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
public void testitCompileVsRuntime() throws Exception {
Verifier verifier = run("compile", "runtime");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("x-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("x-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertTrue(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertTrue(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
/**
@@ -108,17 +110,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
public void testitCompileVsTest() throws Exception {
Verifier verifier = run("compile", "test");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("x-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("x-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
/**
@@ -130,17 +132,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
public void testitCompileVsProvided() throws Exception {
Verifier verifier = run("compile", "provided");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("x-0.1.jar"));
- assertTrue(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("x-0.1.jar"), compile.toString());
+ assertTrue(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
/**
@@ -152,17 +154,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
public void testitRuntimeVsTest() throws Exception {
Verifier verifier = run("runtime", "test");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertFalse(compile.toString(), compile.contains("x-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertFalse(compile.contains("x-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
/**
@@ -174,17 +176,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
public void testitRuntimeVsProvided() throws Exception {
Verifier verifier = run("runtime", "provided");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertFalse(compile.toString(), compile.contains("x-0.1.jar"));
- assertTrue(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertFalse(compile.contains("x-0.1.jar"), compile.toString());
+ assertTrue(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertTrue(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertTrue(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
/**
@@ -198,17 +200,17 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
Verifier verifier = run("provided", "test");
- List<String> compile = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compile.toString(), compile.contains("x-0.1.jar"));
- assertFalse(compile.toString(), compile.contains("a-0.1.jar"));
+ List<String> compile = verifier.loadLines("target/compile.txt");
+ assertTrue(compile.contains("x-0.1.jar"), compile.toString());
+ assertFalse(compile.contains("a-0.1.jar"), compile.toString());
- List<String> runtime = verifier.loadLines("target/runtime.txt", "UTF-8");
- assertFalse(runtime.toString(), runtime.contains("x-0.1.jar"));
- assertFalse(runtime.toString(), runtime.contains("a-0.1.jar"));
+ List<String> runtime = verifier.loadLines("target/runtime.txt");
+ assertFalse(runtime.contains("x-0.1.jar"), runtime.toString());
+ assertFalse(runtime.contains("a-0.1.jar"), runtime.toString());
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
- assertTrue(test.toString(), test.contains("x-0.1.jar"));
- assertTrue(test.toString(), test.contains("a-0.1.jar"));
+ List<String> test = verifier.loadLines("target/test.txt");
+ assertTrue(test.contains("x-0.1.jar"), test.toString());
+ assertTrue(test.contains("a-0.1.jar"), test.toString());
}
private Verifier run(String scopeB, String scopeA) throws Exception {
@@ -223,8 +225,8 @@ public class MavenITmng1895ScopeConflictResolutionTest extends AbstractMavenInte
Map<String, String> props = verifier.newDefaultFilterMap();
props.put("@scope.a@", scopeA);
props.put("@scope.b@", scopeB);
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", props);
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8", props);
+ verifier.filterFile("settings-template.xml", "settings.xml", props);
+ verifier.filterFile("pom-template.xml", "pom.xml", props);
verifier.setLogFileName("log-" + scopeB + "-vs-" + scopeA + ".txt");
verifier.addCliArgument("validate");
verifier.execute();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index 29c6cedd48..6f5ac197da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1957">MNG-1957</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
index c06fbb7563..ebf21e08c4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1992">MNG-1992</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
index acc095d98d..9c84e7c8ae 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1995">MNG-1995</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
index d0760828ec..981a29106e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2006">MNG-2006</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
index beb0b29cd0..5d8878ceff 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2045">MNG-2045</a>:
* Simple IT test invoking maven in a reactor with 2 projects --
@@ -52,15 +54,15 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest extends Abstra
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compile = verifier.loadLines("test-user/target/compile.txt", "UTF-8");
+ List<String> compile = verifier.loadLines("test-user/target/compile.txt");
assertTestClasses(compile);
assertNotMainClasses(compile);
- List<String> runtime = verifier.loadLines("test-user/target/runtime.txt", "UTF-8");
+ List<String> runtime = verifier.loadLines("test-user/target/runtime.txt");
assertTestClasses(runtime);
assertNotMainClasses(runtime);
- List<String> test = verifier.loadLines("test-user/target/test.txt", "UTF-8");
+ List<String> test = verifier.loadLines("test-user/target/test.txt");
assertTestClasses(test);
assertNotMainClasses(test);
}
@@ -71,14 +73,14 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest extends Abstra
* is merely that we have the test classes on the classpath.
*/
assertTrue(
- "test classes missing in " + classpath,
classpath.contains("test")
|| classpath.contains("test.jar")
- || classpath.contains("test-jar-0.1-SNAPSHOT-tests.jar"));
+ || classpath.contains("test-jar-0.1-SNAPSHOT-tests.jar"),
+ "test classes missing in " + classpath);
}
private void assertNotMainClasses(List<String> classpath) {
// When depending on the test JAR of some module, we shouldn't get its main classes
- assertFalse("main classes present in " + classpath, classpath.contains("main"));
+ assertFalse(classpath.contains("main"), "main classes present in " + classpath);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
index 0da02efdad..62537c5379 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
index 6f9f3c0fd0..99691a5001 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2054">MNG-2054</a>.
*
@@ -53,7 +54,7 @@ public class MavenITmng2054PluginExecutionInheritanceTest extends AbstractMavenI
verifier.verifyErrorFreeLog();
List<String> executions =
- verifier.loadLines("project/project-level2/project-level3/project-jar/target/exec.log", "UTF-8");
+ verifier.loadLines("project/project-level2/project-level3/project-jar/target/exec.log");
List<String> expected = Arrays.asList(new String[] {"once"});
assertEquals(expected, executions);
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
index 840baf2510..d99d083590 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
index c56a882d2b..1efaa76a08 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -52,7 +51,7 @@ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest extends Abstra
verifier.deleteArtifacts("org.apache.maven.its.mng2098");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
index 9332e27187..31e4cdd1f5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2103">MNG-2103</a>.
*
@@ -54,10 +55,10 @@ public class MavenITmng2103PluginExecutionInheritanceTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> execs = verifier.loadLines("child-1/target/log.txt", "UTF-8");
+ List<String> execs = verifier.loadLines("child-1/target/log.txt");
assertEquals(Arrays.asList(new String[] {"inherited"}), execs);
- execs = verifier.loadLines("child-2/target/log.txt", "UTF-8");
+ execs = verifier.loadLines("child-2/target/log.txt");
assertEquals(Arrays.asList(new String[] {"inherited"}), execs);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
index 2f120fe5be..06c8793a55 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2123">MNG-2123</a>.
*/
@@ -42,16 +43,16 @@ public class MavenITmng2123VersionRangeDependencyTest extends AbstractMavenInteg
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng2123");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2123:fixed:jar:0.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2123:common:jar:3.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2123:range:jar:0.1"));
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2123:fixed:jar:0.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2123:common:jar:3.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2123:range:jar:0.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
index 176d8b1722..f558361c67 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2124">MNG-2124</a>.
*/
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
index 7c170e0a26..230c45b97c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
index be3fff25ba..c95a283d40 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index 09f8e1e463..03fbb5cd13 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2136">MNG-2136</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
index 7a9c65637b..dfac0a8a16 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2140">MNG-2140</a>.
*
@@ -52,7 +53,7 @@ public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest extends Abstrac
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("project/target/test.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("dependency/pom.xml"));
+ List<String> artifacts = verifier.loadLines("project/target/test.txt");
+ assertTrue(artifacts.contains("dependency/pom.xml"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
index f88b05823e..0a16622e2a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2174">MNG-2174</a>.
*
@@ -51,7 +53,7 @@ public class MavenITmng2174PluginDepsManagedByParentProfileTest extends Abstract
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng2174");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
index d474e363f6..91bfc54f5e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index ef5029669a..7157409855 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -23,10 +23,13 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrationTestCase {
public MavenITmng2199ParentVersionRangeTest() {
@@ -51,7 +54,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
// building a parent fails. The build succeeds without any parent. If that warning message appears in the
// log, parent resolution failed.
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
- assertFalse("Unexpected error message found.", indexOf(lines, ".*Failed to build parent project.*") >= 0);
+ assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found.");
}
@Test
@@ -72,7 +75,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
// building a parent fails. The build succeeds without any parent. If that warning message appears in the
// log, parent resolution failed.
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
- assertFalse("Unexpected error message found.", indexOf(lines, ".*Failed to build parent project.*") >= 0);
+ assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found.");
}
@Test
@@ -91,8 +94,8 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
assertNotNull(verifier);
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
assertTrue(
- "Expected error message not found.",
- indexOf(lines, ".*(parent)? version range.*does not specify an upper bound.*") >= 0);
+ indexOf(lines, ".*(parent)? version range.*does not specify an upper bound.*") >= 0,
+ "Expected error message not found.");
}
}
@@ -113,7 +116,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
assertNotNull(verifier);
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*");
- assertTrue("Expected error message not found.", msg >= 0);
+ assertTrue(msg >= 0, "Expected error message not found.");
}
}
@@ -133,7 +136,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
assertNotNull(verifier);
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*");
- assertTrue("Expected error message not found.", msg >= 0);
+ assertTrue(msg >= 0, "Expected error message not found.");
}
}
@@ -155,7 +158,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
// is not corrupt. It's expected to find the local parent and not fall back to remote resolution. If it
// falls back to remote resolution, this just catches the test project to be broken.
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
- assertFalse("Unexpected error message found.", indexOf(lines, ".*Failed to build parent project.*") >= 0);
+ assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found.");
}
@Test
@@ -176,7 +179,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg =
indexOf(lines, ".*Non-resolvable parent POM org.apache.maven.its.mng2199:local-parent:\\[2,3\\].*");
- assertTrue("Expected error message not found.", msg >= 0);
+ assertTrue(msg >= 0, "Expected error message not found.");
}
}
@@ -198,7 +201,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
// resolution with a version range in use. If the warning message is in the logs, that remote parent
// resolution failed unexpectedly.
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
- assertFalse("Unexpected error message found.", indexOf(lines, ".*Failed to build parent project.*") >= 0);
+ assertFalse(indexOf(lines, ".*Failed to build parent project.*") >= 0, "Unexpected error message found.");
}
@Test
@@ -217,7 +220,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
assertNotNull(verifier);
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:expression.*");
- assertTrue("Expected error message not found.", msg >= 0);
+ assertTrue(msg >= 0, "Expected error message not found.");
}
}
@@ -237,7 +240,7 @@ public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrati
assertNotNull(verifier);
final List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, ".*Version must be a constant.*org.apache.maven.its.mng2199:inherited.*");
- assertTrue("Expected error message not found.", msg >= 0);
+ assertTrue(msg >= 0, "Expected error message not found.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
index a7431714eb..5e25f51e03 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2201">MNG-2201</a>.
*
@@ -52,19 +53,21 @@ public class MavenITmng2201PluginConfigInterpolationTest extends AbstractMavenIn
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties("target/config.properties");
- assertCanonicalFileEquals(new File(testDir, "target"), new File(props.getProperty("stringParam")));
- assertCanonicalFileEquals(new File(testDir, "target"), new File(props.getProperty("propertiesParam.buildDir")));
- assertCanonicalFileEquals(new File(testDir, "target"), new File(props.getProperty("mapParam.buildDir")));
+ ItUtils.assertCanonicalFileEquals(new File(testDir, "target"), new File(props.getProperty("stringParam")));
+ ItUtils.assertCanonicalFileEquals(
+ new File(testDir, "target"), new File(props.getProperty("propertiesParam.buildDir")));
+ ItUtils.assertCanonicalFileEquals(
+ new File(testDir, "target"), new File(props.getProperty("mapParam.buildDir")));
assertEquals("4.0.0", props.getProperty("domParam.children.modelVersion.0.value"));
assertEquals("org.apache.maven.its.it0104", props.getProperty("domParam.children.groupId.0.value"));
assertEquals("1.0-SNAPSHOT", props.getProperty("domParam.children.version.0.value"));
assertEquals("jar", props.getProperty("domParam.children.packaging.0.value"));
assertEquals("http://maven.apache.org", props.getProperty("domParam.children.url.0.value"));
assertEquals("Apache", props.getProperty("domParam.children.organization.0.children.name.0.value"));
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "target"),
new File(props.getProperty("domParam.children.build.0.children.directory.0.value")));
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "target/classes"),
new File(props.getProperty("domParam.children.build.0.children.outputDirectory.0.value")));
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
index 2a97e34fe3..beb6066f7f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2222">MNG-2222</a>.
*
@@ -56,7 +57,7 @@ public class MavenITmng2222OutputDirectoryReactorResolutionTest extends Abstract
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath = verifier.loadLines("mod-b/target/compile.txt", "UTF-8");
- assertTrue(classpath.toString(), classpath.contains("mod-a/target/classes"));
+ List<String> classpath = verifier.loadLines("mod-b/target/compile.txt");
+ assertTrue(classpath.contains("mod-a/target/classes"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
index 4e6c91f22c..cee6280016 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2228">MNG-2228</a>.
*
@@ -50,7 +51,7 @@ public class MavenITmng2228ComponentInjectionTest extends AbstractMavenIntegrati
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng2228");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
index 9dde813e65..a7bd9c0897 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
index db82bec8b3..52e04fa768 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2254">MNG-2254</a>:
* it tests that pom.xml encoding is properly detected.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
index e5a5b522c7..8c2a14408c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2276">MNG-2276</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
index cc077be045..ea85fef038 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index 3ade494f22..7839c9192e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -27,7 +27,6 @@ import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -42,6 +41,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Test;
import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2305">MNG-2305</a>.
@@ -99,7 +99,7 @@ public class MavenITmng2305MultipleProxiesTest extends AbstractMavenIntegrationT
Map<String, String> filterProps = verifier.newDefaultFilterMap();
filterProps.put("@proxy.http@", Integer.toString(httpPort));
filterProps.put("@proxy.https@", Integer.toString(proxyPort));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.setEnvironmentVariable(
@@ -117,9 +117,9 @@ public class MavenITmng2305MultipleProxiesTest extends AbstractMavenIntegrationT
server.join();
}
- List<String> cp = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(cp.toString(), cp.contains("http-0.1.jar"));
- assertTrue(cp.toString(), cp.contains("https-0.1.jar"));
+ List<String> cp = verifier.loadLines("target/classpath.txt");
+ assertTrue(cp.contains("http-0.1.jar"), cp.toString());
+ assertTrue(cp.contains("https-0.1.jar"), cp.toString());
}
private void addHttpsConnector(Server server, String keyStorePath, String keyStorePassword, String keyPassword) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
index ae5c30b3e1..e0259bbc05 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2309">MNG-2309</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
index 62bbe96a5f..10672287bb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
index fd95d1748a..4b42c2591c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
@@ -20,10 +20,11 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2339">MNG-2339</a>.
*/
@@ -65,8 +66,8 @@ public class MavenITmng2339BadProjectInterpolationTest extends AbstractMavenInte
verifier.execute();
assertTrue(
- "Touchfile using ${project.version} for ${version} does not exist.",
- new File(testDir, "target/touch-1.txt").exists());
+ new File(testDir, "target/touch-1.txt").exists(),
+ "Touchfile using ${project.version} for ${version} does not exist.");
verifier.verifyErrorFreeLog();
@@ -82,7 +83,7 @@ public class MavenITmng2339BadProjectInterpolationTest extends AbstractMavenInte
verifier.verifyErrorFreeLog();
assertTrue(
- "Touchfile using CLI-specified ${version} does not exist.",
- new File(testDir, "target/touch-2.txt").exists());
+ new File(testDir, "target/touch-2.txt").exists(),
+ "Touchfile using CLI-specified ${version} does not exist.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
index cfa240138c..9ed3922f4e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2362">MNG-2362</a>.
*
@@ -86,7 +87,7 @@ public class MavenITmng2362DeployedPomEncodingTest extends AbstractMavenIntegrat
String prefix = "TEST-CHARS: ";
int pos = pom.indexOf(prefix);
assertTrue(
- "Corrupt data " + pom.substring(pos, pos + prefix.length() + chars.length()) + " in " + pomFile,
- pom.contains(prefix + chars));
+ pom.contains(prefix + chars),
+ "Corrupt data " + pom.substring(pos, pos + prefix.length() + chars.length()) + " in " + pomFile);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
index 5667b2b935..9c615b0a14 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index fb7bc464ba..fe5a1abbed 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.net.InetAddress;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -115,7 +114,7 @@ public class MavenITmng2387InactiveProxyTest extends AbstractMavenIntegrationTes
properties.put("@host@", InetAddress.getLoopbackAddress().getCanonicalHostName());
properties.put("@port@", Integer.toString(port));
properties.put("@proxyPort@", Integer.toString(proxyPort));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", properties);
+ verifier.filterFile("settings-template.xml", "settings.xml", properties);
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng2387");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index 78594937e0..625da5c39f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -51,7 +50,7 @@ public class MavenITmng2432PluginPrefixOrderTest extends AbstractMavenIntegratio
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng2432.pom");
verifier.deleteArtifacts("org.apache.maven.its.mng2432.settings");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("it:touch");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
index 6fba8a255a..b8eb7298e7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2486">MNG-2486</a>.
*
@@ -76,14 +77,14 @@ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest extends
verifier.deleteDirectory("target");
// enforce remote resolution
verifier.deleteArtifacts("org.apache.maven.its.mng2486");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> files = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(files.toString(), files.contains("dep-a-0.1-SNAPSHOT.jar"));
+ List<String> files = verifier.loadLines("target/classpath.txt");
+ assertTrue(files.contains("dep-a-0.1-SNAPSHOT.jar"), files.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
index 9775616b5a..9ed7fe60fe 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
@@ -23,10 +23,12 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2562">MNG-2562</a>.
*/
@@ -52,9 +54,9 @@ public class MavenITmng2562Timestamp322Test extends AbstractMavenIntegrationTest
Properties props = verifier.loadProperties("target/pom.properties");
String timestamp1 = props.getProperty("project.properties.timestamp1", "");
- assertTrue(timestamp1, timestamp1.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"));
+ assertTrue(timestamp1.matches("\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z"), timestamp1);
Date date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(timestamp1);
- assertTrue(now + " vs " + date, Math.abs(now.getTime() - date.getTime()) < 24 * 60 * 60 * 1000);
+ assertTrue(Math.abs(now.getTime() - date.getTime()) < 24 * 60 * 60 * 1000, now + " vs " + date);
String timestamp2 = props.getProperty("project.properties.timestamp2", "");
assertEquals(timestamp1, timestamp2);
@@ -77,7 +79,7 @@ public class MavenITmng2562Timestamp322Test extends AbstractMavenIntegrationTest
String timestamp1 = props.getProperty("project.properties.timestamp", "");
Date date = new SimpleDateFormat("mm:HH dd-MM-yyyy").parse(timestamp1);
- assertTrue(now + " vs " + date, Math.abs(now.getTime() - date.getTime()) < 24 * 60 * 60 * 1000);
+ assertTrue(Math.abs(now.getTime() - date.getTime()) < 24 * 60 * 60 * 1000, now + " vs " + date);
}
@Test
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
index 4b04269966..8f152ff044 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
index 1fddb9fb71..bc11af4419 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2577">MNG-2577</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
index 1e6966f7a5..60eeb6b767 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2591">MNG-2591</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
index c9a4104512..d6f68a2523 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2605">MNG-2605</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
index 55ecd507ac..b4f8a97e49 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
index b95c951fa0..09dac3edb5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
@@ -24,10 +24,12 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2690">MNG-2690</a>.
*
@@ -50,22 +52,17 @@ public class MavenITmng2690MojoLoadingErrorsTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
-
- fail("should throw an error during execution.");
- } catch (VerificationException e) {
- // expected...it'd be nice if we could get the specifics of the exception right here...
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception =
+ assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution.");
List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, "(?i).*required class is missing.*");
- assertTrue("User-friendly message was not found in output.", msg >= 0);
+ assertTrue(msg >= 0, "User-friendly message was not found in output.");
int cls = lines.get(msg).toString().replace('/', '.').indexOf("junit.framework.TestCase");
- assertTrue("Missing class name was not found in output.", cls >= 0);
+ assertTrue(cls >= 0, "Missing class name was not found in output.");
}
@Test
@@ -75,22 +72,17 @@ public class MavenITmng2690MojoLoadingErrorsTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
-
- fail("should throw an error during execution.");
- } catch (VerificationException e) {
- // expected...it'd be nice if we could get the specifics of the exception right here...
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception =
+ assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution.");
List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
int msg = indexOf(lines, "(?i).*required class (i|wa)s missing( during (mojo )?configuration)?.*");
- assertTrue("User-friendly message was not found in output.", msg >= 0);
+ assertTrue(msg >= 0, "User-friendly message was not found in output.");
int cls = lines.get(msg).toString().replace('/', '.').indexOf("junit.framework.TestCase");
- assertTrue("Missing class name was not found in output.", cls >= 0);
+ assertTrue(cls >= 0, "Missing class name was not found in output.");
}
@Test
@@ -100,21 +92,16 @@ public class MavenITmng2690MojoLoadingErrorsTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
-
- fail("should throw an error during execution.");
- } catch (VerificationException e) {
- // expected...it'd be nice if we could get the specifics of the exception right here...
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception =
+ assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution.");
List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
String compLookupMsg = "(?i).*unable to .* mojo 'mojo-component-lookup-exception' .* plugin "
+ "'org\\.apache\\.maven\\.its\\.plugins:maven-it-plugin-error.*";
- assertTrue("User-friendly message was not found in output.", indexOf(lines, compLookupMsg) > 0);
+ assertTrue(indexOf(lines, compLookupMsg) > 0, "User-friendly message was not found in output.");
}
@Test
@@ -124,21 +111,16 @@ public class MavenITmng2690MojoLoadingErrorsTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
-
- fail("should throw an error during execution.");
- } catch (VerificationException e) {
- // expected...it'd be nice if we could get the specifics of the exception right here...
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception =
+ assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution.");
List<String> lines = verifier.loadFile(new File(testDir, "log.txt"), false);
String compLookupMsg = "(?i).*unable to .* mojo 'requirement-component-lookup-exception' .* plugin "
+ "'org\\.apache\\.maven\\.its\\.plugins:maven-it-plugin-error.*";
- assertTrue("User-friendly message was not found in output.", indexOf(lines, compLookupMsg) > 0);
+ assertTrue(indexOf(lines, compLookupMsg) > 0, "User-friendly message was not found in output.");
}
private int indexOf(List<String> logLines, String regex) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
index 3dffcaa509..c79652475e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2693">MNG-2693</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
index cf863cf73f..c6e9db8280 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -54,7 +53,7 @@ public class MavenITmng2695OfflinePluginSnapshotsTest extends AbstractMavenInteg
verifier.deleteArtifacts("org.apache.maven.its.mng2695");
verifier.setAutoclean(false);
verifier.setLogFileName("log1.txt");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
index 8d85adfec4..2769eb0060 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2720">MNG-2720</a>.
*
@@ -59,36 +61,36 @@ public class MavenITmng2720SiblingClasspathArtifactsTest extends AbstractMavenIn
List<String> classPath;
- classPath = verifier.loadLines("child2/target/compile.txt", "UTF-8");
+ classPath = verifier.loadLines("child2/target/compile.txt");
assertMainJar(classPath);
- classPath = verifier.loadLines("child2/target/runtime.txt", "UTF-8");
+ classPath = verifier.loadLines("child2/target/runtime.txt");
assertMainJar(classPath);
- classPath = verifier.loadLines("child2/target/test.txt", "UTF-8");
+ classPath = verifier.loadLines("child2/target/test.txt");
assertMainJar(classPath);
- classPath = verifier.loadLines("child3/target/compile.txt", "UTF-8");
+ classPath = verifier.loadLines("child3/target/compile.txt");
assertTestJar(classPath);
- classPath = verifier.loadLines("child3/target/runtime.txt", "UTF-8");
+ classPath = verifier.loadLines("child3/target/runtime.txt");
assertTestJar(classPath);
- classPath = verifier.loadLines("child3/target/test.txt", "UTF-8");
+ classPath = verifier.loadLines("child3/target/test.txt");
assertTestJar(classPath);
}
private void assertMainJar(List<String> classPath) {
- assertTrue(classPath.toString(), classPath.contains("main.jar"));
- assertFalse(classPath.toString(), classPath.contains("main"));
- assertFalse(classPath.toString(), classPath.contains("test.jar"));
- assertFalse(classPath.toString(), classPath.contains("test"));
+ assertTrue(classPath.contains("main.jar"), classPath.toString());
+ assertFalse(classPath.contains("main"), classPath.toString());
+ assertFalse(classPath.contains("test.jar"), classPath.toString());
+ assertFalse(classPath.contains("test"), classPath.toString());
}
private void assertTestJar(List<String> classPath) {
- assertFalse(classPath.toString(), classPath.contains("main.jar"));
- assertFalse(classPath.toString(), classPath.contains("main"));
- assertTrue(classPath.toString(), classPath.contains("test.jar"));
- assertFalse(classPath.toString(), classPath.contains("test"));
+ assertFalse(classPath.contains("main.jar"), classPath.toString());
+ assertFalse(classPath.contains("main"), classPath.toString());
+ assertTrue(classPath.contains("test.jar"), classPath.toString());
+ assertFalse(classPath.contains("test"), classPath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
index 9eb1af17eb..78436cb674 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
index efc0379490..392f06a2e0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2739">MNG-2739</a>.
* todo Fill in a better description of what this test verifies!
@@ -65,7 +66,7 @@ public class MavenITmng2739RequiredRepositoryElementsTest extends AbstractMavenI
}
}
- assertFalse("Missing repository-id should not result in a NullPointerException.", foundNpe);
+ assertFalse(foundNpe, "Missing repository-id should not result in a NullPointerException.");
}
@Test
@@ -97,6 +98,6 @@ public class MavenITmng2739RequiredRepositoryElementsTest extends AbstractMavenI
}
}
- assertFalse("Missing repository-url should not result in a NullPointerException.", foundNpe);
+ assertFalse(foundNpe, "Missing repository-url should not result in a NullPointerException.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
index 7fbc759a21..828d5f13a3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2741">MNG-2741</a>.
*
@@ -72,7 +73,7 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest extends Abst
} catch (VerificationException e) {
boolean foundCause = false;
StringBuilder sb = new StringBuilder();
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8");
+ List<String> lines = verifier.loadLogLines();
for (String line : lines) {
sb.append(line).append(System.lineSeparator());
if (line.matches(".*Connection refused.*")) {
@@ -89,7 +90,7 @@ public class MavenITmng2741PluginMetadataResolutionErrorMessageTest extends Abst
break;
}
}
- assertTrue("Transfer error cause was not found: " + sb, foundCause);
+ assertTrue(foundCause, "Transfer error cause was not found: " + sb);
}
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
index c5b752f707..2a2763e068 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -48,7 +47,7 @@ public class MavenITmng2744checksumVerificationTest extends AbstractMavenIntegra
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng2744");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
index 6daf9fa87e..40d00b1d06 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2749">MNG-2749</a>.
*
@@ -49,7 +51,7 @@ public class MavenITmng2749ExtensionAvailableToPluginTest extends AbstractMavenI
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng2749");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
index e55cec9e35..1a7cfec368 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
index 48b389518d..fdf425277b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
@@ -24,10 +24,11 @@ import java.util.Date;
import java.util.TimeZone;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2790">MNG-2790</a>.
*
@@ -71,11 +72,11 @@ public class MavenITmng2790LastUpdatedMetadataTest extends AbstractMavenIntegrat
// sanity check: timestamps shouldn't differ by more than 10 min from now (i.e. timezone is UTC)
assertTrue(
- artifactVersionLastUpdated1 + " ~ " + now,
- Math.abs(artifactVersionLastUpdated1.getTime() - now.getTime()) < 10 * 60 * 1000);
+ Math.abs(artifactVersionLastUpdated1.getTime() - now.getTime()) < 10 * 60 * 1000,
+ artifactVersionLastUpdated1 + " ~ " + now);
assertTrue(
- artifactLastUpdated1 + " ~ " + now,
- Math.abs(artifactLastUpdated1.getTime() - now.getTime()) < 10 * 60 * 1000);
+ Math.abs(artifactLastUpdated1.getTime() - now.getTime()) < 10 * 60 * 1000,
+ artifactLastUpdated1 + " ~ " + now);
// enforce some advance of time
Thread.sleep(1000);
@@ -94,10 +95,10 @@ public class MavenITmng2790LastUpdatedMetadataTest extends AbstractMavenIntegrat
// check that new timestamps are strictly later than from original install
assertTrue(
- artifactVersionLastUpdated1 + " < " + artifactVersionLastUpdated2,
- artifactVersionLastUpdated2.after(artifactVersionLastUpdated1));
+ artifactVersionLastUpdated2.after(artifactVersionLastUpdated1),
+ artifactVersionLastUpdated1 + " < " + artifactVersionLastUpdated2);
assertTrue(
- artifactLastUpdated1 + " < " + artifactLastUpdated2, artifactLastUpdated2.after(artifactLastUpdated1));
+ artifactLastUpdated2.after(artifactLastUpdated1), artifactLastUpdated1 + " < " + artifactLastUpdated2);
}
private Date getLastUpdated(File metadataFile) throws Exception {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
index 6475affe9c..2ddb39cfa7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2820">MNG-2820</a>.
*
@@ -73,6 +74,6 @@ public class MavenITmng2820PomCommentsTest extends AbstractMavenIntegrationTestC
}
private void assertPomComment(String pom, String comment) throws Exception {
- assertTrue("Missing comment: " + comment, pom.contains(comment));
+ assertTrue(pom.contains(comment), "Missing comment: " + comment);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
index 241dada723..971f0117b5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
index b2b00a4391..c58dd8acb9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2843">MNG-2843</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
index 55d71e6804..3f886597e3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2848">MNG-2848</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
index 11c0a1abb8..9c81ebccd3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2861">MNG-2861</a>.
*
@@ -44,16 +45,16 @@ public class MavenITmng2861RelocationsAndRangesTest extends AbstractMavenIntegra
verifier.setAutoclean(false);
verifier.deleteDirectory("A/target");
verifier.deleteArtifacts("org.apache.maven.its.mng2861");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("A/target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2861:B:jar:1.0-SNAPSHOT"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2861.new:project:jar:2.0"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng2861:C:jar:1.0-SNAPSHOT"));
+ List<String> artifacts = verifier.loadLines("A/target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2861:B:jar:1.0-SNAPSHOT"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2861.new:project:jar:2.0"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng2861:C:jar:1.0-SNAPSHOT"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
index 32fe41788b..6d1bb3a80f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -82,7 +81,7 @@ public class MavenITmng2865MirrorWildcardTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(new File(testDir, project).getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng2865");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
index 23104d49c3..cbe1aeb204 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2871">MNG-2871</a>.
*
@@ -53,7 +54,7 @@ public class MavenITmng2871PrePackageSubartifactResolutionTest extends AbstractM
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileClassPath = verifier.loadLines("consumer/target/compile.txt", "UTF-8");
+ List<String> compileClassPath = verifier.loadLines("consumer/target/compile.txt");
assertEquals(2, compileClassPath.size());
assertEquals(
new File(testDir, "ejbs/target/classes").getCanonicalFile(),
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
index fcfae013e7..11f472db4e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2892">MNG-2892</a>.
*
@@ -51,7 +52,7 @@ public class MavenITmng2892HideCorePlexusUtilsTest extends AbstractMavenIntegrat
verifier.deleteDirectory("target");
verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "jar");
verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng2892", "pom");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
index 5b84e46992..7dd32b1a36 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2921">MNG-2921</a>. It naturally includes the
* test for the related issue <a href="https://issues.apache.org/jira/browse/MNG-2877">MNG-2877</a> whose original test was
@@ -59,38 +61,38 @@ public class MavenITmng2921ActiveAttachedArtifactsTest extends AbstractMavenInte
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> compileArtifacts = verifier.loadLines("consumer/target/compile.txt", "UTF-8");
+ Collection<String> compileArtifacts = verifier.loadLines("consumer/target/compile.txt");
assertTrue(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"));
+ compileArtifacts.contains("org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"),
+ compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"));
+ compileArtifacts.contains("org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"),
+ compileArtifacts.toString());
assertFalse(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"));
+ compileArtifacts.contains("org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"),
+ compileArtifacts.toString());
assertFalse(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"));
+ compileArtifacts.contains("org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"),
+ compileArtifacts.toString());
- Collection<String> testArtifacts = verifier.loadLines("consumer/target/test.txt", "UTF-8");
+ Collection<String> testArtifacts = verifier.loadLines("consumer/target/test.txt");
assertTrue(
- testArtifacts.toString(),
- testArtifacts.contains("org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"));
+ testArtifacts.contains("org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT"),
+ testArtifacts.toString());
assertTrue(
- testArtifacts.toString(),
- testArtifacts.contains("org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"));
+ testArtifacts.contains("org.apache.maven.its.mng2921:producer:ejb-client:client:1.0-SNAPSHOT"),
+ testArtifacts.toString());
assertTrue(
- testArtifacts.toString(),
- testArtifacts.contains("org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"));
+ testArtifacts.contains("org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT"),
+ testArtifacts.toString());
assertTrue(
- testArtifacts.toString(),
- testArtifacts.contains("org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"));
+ testArtifacts.contains("org.apache.maven.its.mng2921:producer:test-jar:tests:1.0-SNAPSHOT"),
+ testArtifacts.toString());
- Collection<String> testClassPath = verifier.loadLines("consumer/target/test-classpath.txt", "UTF-8");
- assertTrue(testClassPath.toString(), testClassPath.contains("ejbs/attached.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("tests/attached.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("producer/client.jar"));
- assertTrue(testClassPath.toString(), testClassPath.contains("producer/tests.jar"));
+ Collection<String> testClassPath = verifier.loadLines("consumer/target/test-classpath.txt");
+ assertTrue(testClassPath.contains("ejbs/attached.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("tests/attached.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("producer/client.jar"), testClassPath.toString());
+ assertTrue(testClassPath.contains("producer/tests.jar"), testClassPath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
index 95f7f8f7fd..af4696fefd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -67,7 +66,7 @@ public class MavenITmng2926PluginPrefixOrderTest extends AbstractMavenIntegratio
verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.setLogFileName("log-default.txt");
- verifier.filterFile("settings-default-template.xml", "settings-default.xml", "UTF-8");
+ verifier.filterFile("settings-default-template.xml", "settings-default.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings-default.xml");
verifier.addCliArgument("mng-2926:apache");
@@ -77,7 +76,7 @@ public class MavenITmng2926PluginPrefixOrderTest extends AbstractMavenIntegratio
verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.setLogFileName("log-custom.txt");
- verifier.filterFile("settings-custom-template.xml", "settings-custom.xml", "UTF-8");
+ verifier.filterFile("settings-custom-template.xml", "settings-custom.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings-custom.xml");
verifier.addCliArgument("mng-2926:custom");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
index 48eacb0f18..74266478ff 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
@@ -21,10 +21,13 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2972">MNG-2972</a>.
*
@@ -49,7 +52,7 @@ public class MavenITmng2972OverridePluginDependencyTest extends AbstractMavenInt
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "0.2-mng-2972", "jar");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -79,7 +82,7 @@ public class MavenITmng2972OverridePluginDependencyTest extends AbstractMavenInt
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifact("org.apache.maven.its.plugins.class-loader", "dep-b", "9.9-MNG-2972", "jar");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("org.apache.maven.its.plugins:maven-it-plugin-class-loader:2.1-SNAPSHOT:load");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
index 9ee5c8f3f7..1b34b52baf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -46,7 +45,7 @@ public class MavenITmng2994SnapshotRangeRepositoryTest extends AbstractMavenInte
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2994");
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts("org.apache.maven.its.mng2994");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
index f5822f5796..8a94c309e5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
index 2f806e048d..0bff9f28bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3012">MNG-3012</a>.
*
@@ -50,7 +51,7 @@ public class MavenITmng3012CoreClassImportTest extends AbstractMavenIntegrationT
verifier.deleteDirectory("target");
verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "jar");
verifier.deleteArtifact("org.codehaus.plexus", "plexus-utils", "0.1-mng3012", "pom");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
index 7f3cc4488a..5abe9c9a59 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
@@ -22,10 +22,13 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3023">MNG-3023</a>
*
@@ -61,13 +64,11 @@ public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMaven
verifier.deleteDirectory("dependency/dependency-classes");
verifier.deleteArtifacts("org.apache.maven.its.mng3023");
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
- fail("Expected failure to resolve dependency artifact without at least calling 'compile' phase.");
- } catch (VerificationException e) {
- // expected.
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception = assertThrows(
+ VerificationException.class,
+ verifier::execute,
+ "Expected failure to resolve dependency artifact without at least calling 'compile' phase.");
}
/**
@@ -96,9 +97,9 @@ public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMaven
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileClassPath = verifier.loadLines("consumer/target/compile.classpath", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("dependency-classes"));
- assertFalse(compileClassPath.toString(), compileClassPath.contains("dependency-1.jar"));
+ List<String> compileClassPath = verifier.loadLines("consumer/target/compile.classpath");
+ assertTrue(compileClassPath.contains("dependency-classes"), compileClassPath.toString());
+ assertFalse(compileClassPath.contains("dependency-1.jar"), compileClassPath.toString());
}
/**
@@ -130,9 +131,9 @@ public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMaven
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileClassPath = verifier.loadLines("consumer/target/compile.classpath", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("dependency-1.jar"));
- assertFalse(compileClassPath.toString(), compileClassPath.contains("dependency-classes"));
+ List<String> compileClassPath = verifier.loadLines("consumer/target/compile.classpath");
+ assertTrue(compileClassPath.contains("dependency-1.jar"), compileClassPath.toString());
+ assertFalse(compileClassPath.contains("dependency-classes"), compileClassPath.toString());
verifier.deleteDirectory("dependency/dependency-classes");
verifier.deleteDirectory("consumer/target");
@@ -141,8 +142,8 @@ public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMaven
verifier.execute();
verifier.verifyErrorFreeLog();
- compileClassPath = verifier.loadLines("consumer/target/compile.classpath", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("dependency-1.jar"));
- assertFalse(compileClassPath.toString(), compileClassPath.contains("dependency-classes"));
+ compileClassPath = verifier.loadLines("consumer/target/compile.classpath");
+ assertTrue(compileClassPath.contains("dependency-1.jar"), compileClassPath.toString());
+ assertFalse(compileClassPath.contains("dependency-classes"), compileClassPath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
index ea2cf9fc2c..b6405a97e1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
index 271e4718db..aaf56100e2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.nio.file.Files;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3043">MNG-3043</a>.
*
@@ -63,33 +65,33 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven
List<String> classpath;
- classpath = verifier.loadLines("consumer-a/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/compile.txt");
assertContains(classpath, new String[] {"classes-test"});
assertNotContains(classpath, new String[] {"classes-main"});
- classpath = verifier.loadLines("consumer-a/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/runtime.txt");
assertContains(classpath, new String[] {"classes-test"});
assertNotContains(classpath, new String[] {"classes-main"});
- classpath = verifier.loadLines("consumer-a/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/test.txt");
assertContains(classpath, new String[] {"classes-test"});
assertNotContains(classpath, new String[] {"classes-main"});
- classpath = verifier.loadLines("consumer-b/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/compile.txt");
assertContains(classpath, new String[] {"classes-main"});
assertNotContains(classpath, new String[] {"classes-test"});
- classpath = verifier.loadLines("consumer-b/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/runtime.txt");
assertContains(classpath, new String[] {"classes-main"});
assertNotContains(classpath, new String[] {"classes-test"});
- classpath = verifier.loadLines("consumer-b/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/test.txt");
assertContains(classpath, new String[] {"classes-main"});
assertNotContains(classpath, new String[] {"classes-test"});
- classpath = verifier.loadLines("consumer-c/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/compile.txt");
assertContains(classpath, new String[] {"classes-main"});
assertContains(classpath, new String[] {"classes-test"});
- classpath = verifier.loadLines("consumer-c/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/runtime.txt");
assertContains(classpath, new String[] {"classes-main"});
assertContains(classpath, new String[] {"classes-test"});
- classpath = verifier.loadLines("consumer-c/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/test.txt");
assertContains(classpath, new String[] {"classes-main"});
assertContains(classpath, new String[] {"classes-test"});
}
@@ -121,33 +123,33 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven
List<String> classpath;
- classpath = verifier.loadLines("consumer-a/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/compile.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-a/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-a/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/test.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-b/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/compile.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-b/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-b/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/test.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/compile.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/test.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
}
@@ -188,33 +190,33 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven
List<String> classpath;
- classpath = verifier.loadLines("consumer-a/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/compile.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-a/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-a/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-a/target/test.txt");
assertContains(classpath, new String[] {prefix + "tests.jar"});
assertNotContains(classpath, new String[] {prefix + "client.jar"});
- classpath = verifier.loadLines("consumer-b/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/compile.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-b/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-b/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-b/target/test.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertNotContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/compile.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/compile.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/runtime.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/runtime.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
- classpath = verifier.loadLines("consumer-c/target/test.txt", "UTF-8");
+ classpath = verifier.loadLines("consumer-c/target/test.txt");
assertContains(classpath, new String[] {prefix + "client.jar"});
assertContains(classpath, new String[] {prefix + "tests.jar"});
}
@@ -226,7 +228,7 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven
}
private void assertContains(List<String> collection, String item) {
- assertTrue(item + " missing in " + collection, collection.contains(item));
+ assertTrue(collection.contains(item), item + " missing in " + collection);
}
private void assertNotContains(List<String> collection, String[] items) {
@@ -236,6 +238,6 @@ public class MavenITmng3043BestEffortReactorResolutionTest extends AbstractMaven
}
private void assertNotContains(List<String> collection, String item) {
- assertFalse(item + " present in " + collection, collection.contains(item));
+ assertFalse(collection.contains(item), item + " present in " + collection);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index 6290568489..f443a04800 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -53,11 +52,10 @@ public class MavenITmng3052DepRepoAggregationTest extends AbstractMavenIntegrati
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3052");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.filterFile(
"repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom",
- "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom",
- "UTF-8");
+ "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
index ebbf0d5c46..7197ba0b09 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
@@ -21,11 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3092">MNG-3092</a>.
*
@@ -52,16 +53,16 @@ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest extends Abstrac
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3092");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(classpath.toString(), classpath.contains("a-1.1.jar"));
- assertTrue(classpath.toString(), classpath.contains("b-1.0-SNAPSHOT.jar"));
- assertTrue(classpath.toString(), classpath.contains("c-1.1-SNAPSHOT.jar"));
+ List<String> classpath = verifier.loadLines("target/classpath.txt");
+ assertTrue(classpath.contains("a-1.1.jar"), classpath.toString());
+ assertTrue(classpath.contains("b-1.0-SNAPSHOT.jar"), classpath.toString());
+ assertTrue(classpath.contains("c-1.1-SNAPSHOT.jar"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
index 2bc2676464..c94677485e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ public class MavenITmng3099SettingsProfilesWithNoPomTest extends AbstractMavenIn
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3099");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
index af2bce344a..016d1c301a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3118">MNG-3118</a>.
*
@@ -53,7 +54,7 @@ public class MavenITmng3118TestClassPathOrderTest extends AbstractMavenIntegrati
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> testClassPath = verifier.loadLines("target/test-classpath.txt", "UTF-8");
+ List<String> testClassPath = verifier.loadLines("target/test-classpath.txt");
assertEquals(Arrays.asList(new String[] {"test-classes", "classes"}), testClassPath);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
index 095c4e736c..ccde5db39a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3122">MNG-3122</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
index 6db3570358..604cf06389 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3133">MNG-3133</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
index 79230298bf..fce3054b88 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collections;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -52,7 +51,7 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest extends Abstra
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3139");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.setLogFileName("log1.txt");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
index f90ba8ebb8..0f6f9b1655 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java
@@ -23,10 +23,12 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3183">MNG-3183</a>.
*
@@ -58,7 +60,7 @@ public class MavenITmng3183LoggingToFileTest extends AbstractMavenIntegrationTes
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> stdout = verifier.loadLines("stdout.txt", "UTF-8");
+ List<String> stdout = verifier.loadLines("stdout.txt");
for (Iterator<String> it = stdout.iterator(); it.hasNext(); ) {
String line = it.next();
@@ -69,7 +71,7 @@ public class MavenITmng3183LoggingToFileTest extends AbstractMavenIntegrationTes
assertEquals(Collections.EMPTY_LIST, stdout);
- List<String> log = verifier.loadLines("maven.log", "UTF-8");
+ List<String> log = verifier.loadLines("maven.log");
assertFalse(log.isEmpty());
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
index 0d72c69064..6e59eb97a1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
index 82854602e5..a5624b06e9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3208">MNG-3208</a>.
*
@@ -54,7 +55,7 @@ public class MavenITmng3208ProfileAwareReactorSortingTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> order = verifier.loadLines("target/order.txt", "UTF-8");
+ List<String> order = verifier.loadLines("target/order.txt");
assertEquals(Arrays.asList(new String[] {"mod-b", "mod-a"}), order);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
index ea78766501..538eaf2807 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -51,7 +50,7 @@ public class MavenITmng3217InterPluginDependencyTest extends AbstractMavenIntegr
verifier.deleteDirectory("sub-1/target");
verifier.deleteDirectory("sub-2/target");
verifier.deleteArtifacts("org.apache.maven.its.mng3217");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index b465e406dc..91ffa03549 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3220">MNG-3220</a>.
*
@@ -46,7 +47,7 @@ public class MavenITmng3220ImportScopeTest extends AbstractMavenIntegrationTestC
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3220");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -64,7 +65,7 @@ public class MavenITmng3220ImportScopeTest extends AbstractMavenIntegrationTestC
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3220");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
@@ -88,6 +89,6 @@ public class MavenITmng3220ImportScopeTest extends AbstractMavenIntegrationTestC
}
}
- assertTrue("Should have found validation error line in output.", found);
+ assertTrue(found, "Should have found validation error line in output.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
index 0367992fd8..0cb3349857 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index d3c9d6be88..356a837b37 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
index 8c3baa1bd3..cc37639a95 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -53,7 +52,7 @@ public class MavenITmng3284UsingCachedPluginsTest extends AbstractMavenIntegrati
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3284");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
index d44c979d76..1eb08e299f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* This is a test for <a href="https://issues.apache.org/jira/browse/MNG-3288">MNG-3288</a>.
*
@@ -46,12 +47,10 @@ public class MavenITmng3288SystemScopeDirTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
- fail("Usage of directory instead of file for system-scoped dependency did not fail dependency resolution");
- } catch (VerificationException e) {
- // expected, <systemPath> of a system-scoped dependency should be a file, not a directory
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception = assertThrows(
+ VerificationException.class,
+ verifier::execute,
+ "Usage of directory instead of file for system-scoped dependency did not fail dependency resolution");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
index e56473463f..489fd75a1d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3297">MNG-3297</a>.
*
@@ -54,8 +55,8 @@ public class MavenITmng3297DependenciesNotLeakedToMojoTest extends AbstractMaven
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertEquals(artifacts.toString(), 1, artifacts.size());
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertEquals(1, artifacts.size(), artifacts.toString());
Properties props = verifier.loadProperties("target/artifact.properties");
assertEquals("0", props.getProperty("project.artifacts"));
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
index 753b736a3a..7394cd09f9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -52,7 +51,7 @@ public class MavenITmng3314OfflineSnapshotsTest extends AbstractMavenIntegration
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts("org.apache.maven.its.mng3314");
verifier.setLogFileName("log1.txt");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
index 2c56bad480..7f9e4af987 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
index 8e02604d5d..5712658874 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
index c62c8f300b..8f67627fa2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
index 88ca440899..31f9ae1b6b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
@@ -20,10 +20,12 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3379">MNG-3379</a>.
*
@@ -52,7 +54,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest extends AbstractMavenIn
verifier.deleteArtifacts("org.apache.maven.its.mng3379.b");
verifier.deleteArtifacts("org.apache.maven.its.mng3379.c");
verifier.deleteArtifacts("org.apache.maven.its.mng3379.d");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("-Dmaven.artifact.threads=16");
@@ -109,21 +111,21 @@ public class MavenITmng3379ParallelArtifactDownloadsTest extends AbstractMavenIn
Verifier verifier, String gid, String aid, String ver, String cls, String ext, String sha1)
throws Exception {
File file = new File(verifier.getArtifactPath(gid, aid, ver, ext, cls));
- assertTrue(file.getAbsolutePath(), file.isFile());
+ assertTrue(file.isFile(), file.getAbsolutePath());
assertEquals(sha1, ItUtils.calcHash(file, "SHA-1"));
}
private void assertMetadata(Verifier verifier, String gid, String aid, String ver, String sha1) throws Exception {
String name = "maven-metadata-maven-core-it.xml";
File file = new File(verifier.getArtifactMetadataPath(gid, aid, ver, name));
- assertTrue(file.getAbsolutePath(), file.isFile());
+ assertTrue(file.isFile(), file.getAbsolutePath());
assertEquals(sha1, ItUtils.calcHash(file, "SHA-1"));
}
private void assertMetadata(Verifier verifier, String gid, String aid, String sha1) throws Exception {
String name = "maven-metadata-maven-core-it.xml";
File file = new File(verifier.getArtifactMetadataPath(gid, aid, null, name));
- assertTrue(file.getAbsolutePath(), file.isFile());
+ assertTrue(file.isFile(), file.getAbsolutePath());
assertEquals(sha1, ItUtils.calcHash(file, "SHA-1"));
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
index f9d461dd10..4cee03c928 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3380">MNG-3380</a>.
*
@@ -56,21 +57,21 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest extends AbstractMavenIn
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3380");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(4, artifacts.size());
assertEquals("org.apache.maven.its.mng3380:direct:jar:1", artifacts.get(0));
assertEquals("org.apache.maven.its.mng3380.new:transitive:jar:2", artifacts.get(1));
assertEquals("org.apache.maven.its.mng3380.other:a:jar:1", artifacts.get(2));
assertEquals("org.apache.maven.its.mng3380.other:b:jar:1", artifacts.get(3));
- List<String> paths = verifier.loadLines("target/test.txt", "UTF-8");
+ List<String> paths = verifier.loadLines("target/test.txt");
assertEquals(6, paths.size());
assertEquals("direct-1.jar", paths.get(2));
assertEquals("transitive-2.jar", paths.get(3));
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
index 6f7795915f..25dc6896d3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
index 83e1c3c478..5dba957ec4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
index 225c2d9ea1..58b3338f72 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3401">MNG-3401</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index 432c1e2c24..5fe1dd9091 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -37,6 +36,10 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3415">MNG-3415</a>.
*/
@@ -92,7 +95,7 @@ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenInteg
Map<String, String> filterProps = verifier.newDefaultFilterMap();
filterProps.put("@protocol@", "invalid");
filterProps.put("@port@", "0");
- File settings = verifier.filterFile("settings-template.xml", "settings-a.xml", "UTF-8", filterProps);
+ File settings = verifier.filterFile("settings-template.xml", "settings-a.xml", filterProps);
verifier.addCliArgument("-X");
verifier.addCliArgument("-s");
@@ -189,7 +192,7 @@ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenInteg
Map<String, String> filterProps = verifier.newDefaultFilterMap();
filterProps.put("@protocol@", "http");
filterProps.put("@port@", Integer.toString(port));
- File settings = verifier.filterFile("settings-template.xml", "settings-b.xml", "UTF-8", filterProps);
+ File settings = verifier.filterFile("settings-template.xml", "settings-b.xml", filterProps);
verifier.addCliArgument("-X");
verifier.addCliArgument("-s");
@@ -204,8 +207,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenInteg
verifier.verifyErrorFreeLog();
assertTrue(
- requestUris.toString(),
- requestUris.contains("/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml"));
+ requestUris.contains("/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml"),
+ requestUris.toString());
requestUris.clear();
@@ -221,14 +224,14 @@ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenInteg
verifier.verifyErrorFreeLog();
assertFalse(
- requestUris.toString(),
- requestUris.contains("/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml"));
+ requestUris.contains("/org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT/maven-metadata.xml"),
+ requestUris.toString());
assertEquals(
- "Last-modified time should be unchanged from first build through second build for the file we use for"
- + " updateInterval checks.",
firstLastMod,
- updateCheckFile.lastModified());
+ updateCheckFile.lastModified(),
+ "Last-modified time should be unchanged from first build through second build for the file we use for"
+ + " updateInterval checks.");
} finally {
server.stop();
server.join();
@@ -239,8 +242,8 @@ public class MavenITmng3415JunkRepositoryMetadataTest extends AbstractMavenInteg
File metadata = getMetadataFile(verifier);
assertFalse(
- "Metadata file should NOT be present in local repository: " + metadata.getAbsolutePath(),
- metadata.exists());
+ metadata.exists(),
+ "Metadata file should NOT be present in local repository: " + metadata.getAbsolutePath());
}
private void setupDummyDependency(Verifier verifier, File testDir, boolean resetUpdateInterval) throws IOException {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
index 062f13d0e0..b940c0e6c0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3422">MNG-3422</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
index 5a976b97dc..7ac6a69abc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
@@ -23,13 +23,14 @@ import java.io.FileReader;
import java.io.IOException;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3441">MNG-3441</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index 90b8ec6a30..82323d3e81 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -59,7 +58,7 @@ public class MavenITmng3461MirrorMatchingTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3461");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -123,7 +122,7 @@ public class MavenITmng3461MirrorMatchingTest extends AbstractMavenIntegrationTe
verifier.deleteArtifacts("org.apache.maven.its.mng3461");
Map<String, String> filterProps = verifier.newDefaultFilterMap();
filterProps.put("@test.port@", Integer.toString(port));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -152,7 +151,7 @@ public class MavenITmng3461MirrorMatchingTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3461");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
index 6d0c8e75d1..f693232ca0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -49,7 +48,7 @@ public class MavenITmng3470StrictChecksumVerificationOfDependencyPomTest extends
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3470");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
try {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
index d74e7c6ad8..5f2f03f1b2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3475">MNG-3475</a> and
* <a href="https://issues.apache.org/jira/browse/MNG-1927">MNG-1927</a>.
@@ -81,7 +82,7 @@ public class MavenITmng3475BaseAlignedDirTest extends AbstractMavenIntegrationTe
private void assertPathEquals(File basedir, String expected, String actual) throws IOException {
File actualFile = new File(actual);
- assertTrue("path not absolute: " + actualFile, actualFile.isAbsolute());
- assertCanonicalFileEquals(new File(basedir, expected), actualFile);
+ assertTrue(actualFile.isAbsolute(), "path not absolute: " + actualFile);
+ ItUtils.assertCanonicalFileEquals(new File(basedir, expected), actualFile);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
index d530362b77..b63ca255da 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
@@ -24,12 +24,13 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3477">MNG-3477</a>.
* and extends for <a href="https://issues.apache.org/jira/browse/MNG-7758">MNG-7758</a>
@@ -52,7 +53,7 @@ class MavenITmng3477DependencyResolutionErrorMessageTest extends AbstractMavenIn
Map<String, String> filterProps = new HashMap<>();
filterProps.put("@port@", Integer.toString(port));
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3477");
@@ -65,7 +66,7 @@ class MavenITmng3477DependencyResolutionErrorMessageTest extends AbstractMavenIn
verifier.execute();
fail("Build should have failed to resolve dependency");
} catch (VerificationException e) {
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8");
+ List<String> lines = verifier.loadLogLines();
for (String pattern : logExpectPatterns) {
boolean foundCause = false;
for (String line : lines) {
@@ -74,7 +75,7 @@ class MavenITmng3477DependencyResolutionErrorMessageTest extends AbstractMavenIn
break;
}
}
- assertTrue("Transfer error cause was not found - " + pattern, foundCause);
+ assertTrue(foundCause, "Transfer error cause was not found - " + pattern);
}
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
index 1cd06f2a25..e62f900aac 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3482">MNG-3482</a>.
*
@@ -43,7 +44,7 @@ public class MavenITmng3482DependencyPomInterpolationTest extends AbstractMavenI
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3482");
verifier.addCliArgument("-s");
@@ -52,7 +53,7 @@ public class MavenITmng3482DependencyPomInterpolationTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(classpath.toString(), classpath.contains("dep2-1.jar"));
+ List<String> classpath = verifier.loadLines("target/classpath.txt");
+ assertTrue(classpath.contains("dep2-1.jar"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index ec9873a8ed..fd9c44f6ab 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
index a2013af9d3..67939373f5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
index 62f4ac0a98..92a4f87af3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3503">MNG-3503</a>. The first test verifies that
* a plugin using plexus-utils-1.1 does not cause linkage errors. The second test verifies that a plugin with a
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index ada97222ae..b601fac947 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3506">MNG-3506</a>.
*
@@ -65,32 +67,32 @@ public class MavenITmng3506ArtifactHandlersFromPluginsTest extends AbstractMaven
// Parent POM
String path = verifier.getArtifactPath(GID, AID, VERSION, "pom");
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
// Child 1
path = verifier.getArtifactPath(GID, AID + ".1", VERSION, TYPE);
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID + ".1", VERSION, "pom");
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID + ".1", VERSION, BAD_TYPE1);
- assertFalse(path + " should NOT have been installed.", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should NOT have been installed.");
path = verifier.getArtifactPath(GID, AID + ".1", VERSION, BAD_TYPE2);
- assertFalse(path + " should _NEVER_ be installed!!!", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should _NEVER_ be installed!!!");
// Child 2
path = verifier.getArtifactPath(GID, AID + ".2", VERSION, TYPE);
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID + ".2", VERSION, "pom");
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID + ".2", VERSION, BAD_TYPE1);
- assertFalse(path + " should _NEVER_ be installed!!!", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should _NEVER_ be installed!!!");
path = verifier.getArtifactPath(GID, AID + ".2", VERSION, BAD_TYPE2);
- assertFalse(path + " should NOT have been installed.", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should NOT have been installed.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
index 18be2b43cc..1181a811ec 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3529">MNG-3529</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
index 5d72dc7b20..b149e7f4e1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
index ea2807b6c2..845f4f4c71 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
index bd5d7bfee1..a038b25648 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
index d385946bf8..07d95bc56d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3575">MNG-3575</a>.
*/
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
index 7ff9047b37..e7a833aa14 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
index f20a99c0b2..88765ddd07 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3586">MNG-3586</a>.
*
@@ -52,7 +53,7 @@ public class MavenITmng3586SystemScopePluginDependencyTest extends AbstractMaven
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3586");
verifier.getSystemProperties().setProperty("test.home", testDir.getAbsolutePath());
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 617ac2ba40..6a535e9c14 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
index 3203f39233..b081312143 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3600">MNG-3600</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
index f7dea97aac..7106b092bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.net.URI;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3607">MNG-3607</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
index f4b34dff73..68b5d5d71b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3621">MNG-3621</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
index b4fd7d7874..67745b908b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3641">MNG-3641</a>:
* Profile activation warning test
@@ -55,7 +57,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ List<String> logFile = verifier.loadLogLines();
assertNull(findWarning(logFile, "mng-3641-it-provided-profile"));
// (2) make sure the profile was not found and a warning was printed.
@@ -67,7 +69,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ logFile = verifier.loadLogLines();
assertNotNull(findWarning(logFile, "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p"));
// (3) make sure the first profile is found while the other is not and a warning was printed
@@ -80,7 +82,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ logFile = verifier.loadLogLines();
assertNull(findWarning(logFile, "mng-3641-it-provided-profile"));
assertNotNull(findWarning(logFile, "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p"));
@@ -93,7 +95,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ logFile = verifier.loadLogLines();
assertNull(findWarning(logFile, "mng-3641-it-provided-profile-child"));
// (5) make sure the profile is found in subproject. Must not contain a warning.
@@ -105,7 +107,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ logFile = verifier.loadLogLines();
assertNull(findWarning(logFile, "mng-3641-it-provided-profile-child"));
// (6) make sure the profile is found from parent in subproject. Must not contain a warning.
@@ -117,7 +119,7 @@ public class MavenITmng3641ProfileActivationWarningTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ logFile = verifier.loadLogLines();
assertNull(findWarning(logFile, "mng-3641-it-provided-profile"));
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
index 4ee7b841dc..909db51272 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java
@@ -20,10 +20,11 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3642">MNG-3642</a>.
*
@@ -78,9 +79,9 @@ public class MavenITmng3642DynamicResourcesTest extends AbstractMavenIntegration
verifier.verifyErrorFreeLog();
File first = new File(testDir, "target/test-classes/one.txt");
- assertTrue("First resource file was not present: " + first, first.exists());
+ assertTrue(first.exists(), "First resource file was not present: " + first);
File second = new File(testDir, "target/test-classes/two.txt");
- assertTrue("Second resource file was not present: " + second, second.exists());
+ assertTrue(second.exists(), "Second resource file was not present: " + second);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
index 24e7a44a2b..3db08f397c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index d25b6fc9ae..e25243b030 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -36,6 +35,10 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3652">MNG-3652</a>.
*/
@@ -137,9 +140,9 @@ public class MavenITmng3652UserAgentHeaderTest extends AbstractMavenIntegrationT
String artifactVersion = lines.get(4);
assertEquals(
- "Comparing User-Agent '" + userAgent + "'",
"Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")",
- userAgent);
+ userAgent,
+ "Comparing User-Agent '" + userAgent + "'");
}
@Test
@@ -182,9 +185,9 @@ public class MavenITmng3652UserAgentHeaderTest extends AbstractMavenIntegrationT
assertNotNull(userAgent);
assertEquals(
- "Comparing User-Agent '" + userAgent + "'",
"Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")",
- userAgent);
+ userAgent,
+ "Comparing User-Agent '" + userAgent + "'");
}
@Test
@@ -229,9 +232,9 @@ public class MavenITmng3652UserAgentHeaderTest extends AbstractMavenIntegrationT
assertNotNull(userAgent);
assertEquals(
- "Comparing User-Agent '" + userAgent + "'",
"Apache-Maven/" + mavenVersion + " (Java " + javaVersion + "; " + os + ")",
- userAgent);
+ userAgent,
+ "Comparing User-Agent '" + userAgent + "'");
}
@Test
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
index 485063b159..e0637a1701 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3667">MNG-3667</a>.
*
@@ -54,12 +55,12 @@ public class MavenITmng3667ResolveDepsWithBadPomVersionTest extends AbstractMave
verifier.deleteArtifacts("org.apache.maven.its.mng3667");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> cp = verifier.loadLines("target/classpath.txt", "UTF-8");
- assertTrue(cp.toString(), cp.contains("dep-0.1.jar"));
+ List<String> cp = verifier.loadLines("target/classpath.txt");
+ assertTrue(cp.contains("dep-0.1.jar"), cp.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
index 7df5e2d5c5..20493cb067 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
index bdeed493f8..38a43e163a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
index 1fe7007bc4..ccf39d67d6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3680">MNG-3680</a>.
*
@@ -49,15 +50,15 @@ public class MavenITmng3680InvalidDependencyPOMTest extends AbstractMavenIntegra
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3680");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng3680:direct:jar:0.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng3680:transitive:jar:0.1"));
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.mng3680:direct:jar:0.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng3680:transitive:jar:0.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
index 6eac610d0c..cebcf7ef95 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
index d65a6edd2a..7e924fb274 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
index 92308df210..2a7ad669bd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
index bfb5beb66c..3c0a82d506 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
index 67d4cd9265..0256af5736 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
index 490bd93848..ed04a3475c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
@@ -20,10 +20,12 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3710">MNG-3710</a>.
*
@@ -59,13 +61,13 @@ public class MavenITmng3710PollutedClonedPluginsTest extends AbstractMavenIntegr
verifier.verifyErrorFreeLog();
File topLevelTouchFile = new File(projectsDir, "target/touch.txt");
- assertFalse("Top-level touch file should NOT be created in projects tree.", topLevelTouchFile.exists());
+ assertFalse(topLevelTouchFile.exists(), "Top-level touch file should NOT be created in projects tree.");
File midLevelTouchFile = new File(projectsDir, "middle/target/touch.txt");
- assertTrue("Mid-level touch file should have been created in projects tree.", midLevelTouchFile.exists());
+ assertTrue(midLevelTouchFile.exists(), "Mid-level touch file should have been created in projects tree.");
File childLevelTouchFile = new File(projectsDir, "middle/child/target/touch.txt");
- assertTrue("Child-level touch file should have been created in projects tree.", childLevelTouchFile.exists());
+ assertTrue(childLevelTouchFile.exists(), "Child-level touch file should have been created in projects tree.");
}
@Test
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index 1b8299e5c5..38c5b9e6a6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3714">MNG-3714</a>.
*
@@ -56,7 +57,7 @@ public class MavenITmng3714ToolchainsCliOptionTest extends AbstractMavenIntegrat
Map<String, String> properties = verifier.newDefaultFilterMap();
properties.put("@javaHome@", javaHome.getAbsolutePath());
- verifier.filterFile("toolchains.xml", "toolchains.xml", "UTF-8", properties);
+ verifier.filterFile("toolchains.xml", "toolchains.xml", properties);
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
index 25eeb40942..87b55179b0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
index 775bc360e7..702ded8036 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
@@ -23,10 +23,11 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3719">MNG-3719</a>.
*
@@ -58,9 +59,9 @@ public class MavenITmng3719PomExecutionOrderingTest extends AbstractMavenIntegra
Pattern pattern = Pattern.compile(".*step-([0-9])\\.properties.*");
int[] stepLines = new int[3];
- List<String> content = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ List<String> content = verifier.loadLogLines();
for (int i = 0; i < content.size(); i++) {
- String line = (String) content.get(i);
+ String line = content.get(i);
Matcher m = pattern.matcher(line);
if (m.matches()) {
@@ -70,8 +71,8 @@ public class MavenITmng3719PomExecutionOrderingTest extends AbstractMavenIntegra
}
// check order - note it is not in sequence as the plugin definitions are merged
- assertTrue("Step 1 should be found", stepLines[0] > 0);
- assertTrue("Step 3 should be second", stepLines[0] < stepLines[2]);
- assertTrue("Step 2 should be third", stepLines[2] < stepLines[1]);
+ assertTrue(stepLines[0] > 0, "Step 1 should be found");
+ assertTrue(stepLines[0] < stepLines[2], "Step 3 should be second");
+ assertTrue(stepLines[2] < stepLines[1], "Step 2 should be third");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
index 0183c9f4c7..70d9ac7e64 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
index a66eda0225..64e8b42b7b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
index 4f1ac7932e..cb15fb4b2b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
index 8a4e511a74..4884af351c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
@@ -25,10 +25,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3732">MNG-3732</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
index 8e54102376..50ea9a65d3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
index e0f44310ff..d370964d72 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
index 6d0445cebd..9b05e73de8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3747">MNG-3747</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
index bf1ffec362..2aad433211 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3748">MNG-3748</a>.
*
@@ -66,7 +67,7 @@ public class MavenITmng3748BadSettingsXmlTest extends AbstractMavenIntegrationTe
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), null);
+ List<String> lines = verifier.loadLogLines();
boolean foundWarning = false;
boolean isWarning = false;
for (String line : lines) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
index 0c3deae875..084e01506f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3766">MNG-3766</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
index 64c4d38ca1..b0e56695e9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3769">MNG-3769</a>.
*
@@ -51,17 +52,17 @@ public class MavenITmng3769ExclusionRelocatedTransdepsTest extends AbstractMaven
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3769");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(Collections.singletonList("org.apache.maven.its.mng3769:dependency:jar:1.0"), artifacts);
- List<String> paths = verifier.loadLines("target/test.txt", "UTF-8");
+ List<String> paths = verifier.loadLines("target/test.txt");
assertEquals(3, paths.size());
assertEquals("dependency-1.0.jar", paths.get(2));
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
index bfc174d34d..0048355498 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3775">MNG-3775</a>.
*
@@ -80,16 +81,16 @@ public class MavenITmng3775ConflictResolutionBacktrackingTest extends AbstractMa
verifier.deleteArtifacts("org.apache.maven.its.mng3775");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("../settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("../settings-template.xml", "settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> test = verifier.loadLines("target/test.txt", "UTF-8");
+ List<String> test = verifier.loadLines("target/test.txt");
- assertTrue(project + " > " + test.toString(), test.contains("a-0.1.jar"));
- assertTrue(project + " > " + test.toString(), test.contains("b-0.1.jar"));
- assertTrue(project + " > " + test.toString(), test.contains("x-0.1.jar"));
- assertTrue(project + " > " + test.toString(), test.contains("c-0.1.jar"));
+ assertTrue(test.contains("a-0.1.jar"), project + " > " + test.toString());
+ assertTrue(test.contains("b-0.1.jar"), project + " > " + test.toString());
+ assertTrue(test.contains("x-0.1.jar"), project + " > " + test.toString());
+ assertTrue(test.contains("c-0.1.jar"), project + " > " + test.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
index eb9737899f..05c321ea34 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3796">MNG-3796</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
index 4021fdba0c..c2bed4e8be 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3805">MNG-3805</a>.
*
@@ -50,7 +52,7 @@ public class MavenITmng3805ExtensionClassPathOrderingTest extends AbstractMavenI
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3805");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
index 082f54088c..a8f7b52628 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
@@ -21,10 +21,13 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3807">MNG-3807</a>.
*
@@ -70,6 +73,6 @@ public class MavenITmng3807PluginConfigExpressionEvaluationTest extends Abstract
private void assertEvaluated(String value) {
assertNotNull(value);
assertTrue(value.length() > 0);
- assertFalse(value, value.contains("${"));
+ assertFalse(value.contains("${"), value);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
index 255b4a5cb5..39bc25cea2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3808">MNG-3808</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
index 9bc8dae317..3d59233e2f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
index 0b22d85a84..b32e40a570 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3811">MNG-3811</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
index b7ce64cc9b..777d170621 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3813">MNG-3813</a>.
*
@@ -50,7 +52,7 @@ public class MavenITmng3813PluginClassPathOrderingTest extends AbstractMavenInte
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3813");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index d39cbe18c1..545b9da4c8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -48,7 +47,7 @@ public class MavenITmng3814BogusProjectCycleTest extends AbstractMavenIntegratio
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3814");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
index 668793703f..cd3ad7f8d8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
index d8e7ee3b16..b1df887007 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3822">MNG-3822</a>.
*
@@ -68,6 +70,6 @@ public class MavenITmng3822BasedirAlignedInterpolationTest extends AbstractMaven
File expected = new File(testDir, buildDir);
assertTrue(actual.isAbsolute());
- assertEquals(expected.getCanonicalFile(), actual.getCanonicalFile());
+ ItUtils.assertCanonicalFileEquals(expected, actual);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
index 7224b43164..6a238196bc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3827">MNG-3827</a>.
*
@@ -55,7 +56,7 @@ public class MavenITmng3827PluginConfigTest extends AbstractMavenIntegrationTest
Properties props = verifier.loadProperties("target/plugin-config.properties");
- assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam")));
+ ItUtils.assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam")));
assertEquals("true", props.getProperty("booleanParam"));
assertEquals("42", props.getProperty("byteParam"));
assertEquals("-12345", props.getProperty("shortParam"));
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
index 5c03a62c9f..0de30fb5db 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3831">MNG-3831</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
index 1e88f4a0ff..e65494cb57 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3833">MNG-3833</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
index af8c9f4b90..0c01068fe5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3836">MNG-3836</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
index 4f5848727e..6b7f7d9e69 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
index d22db371d8..ff19025ebc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3839">MNG-3839</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index 6cf21c404b..074e4ab192 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -23,10 +23,14 @@ import java.util.Collection;
import java.util.Properties;
import java.util.TreeSet;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3843">MNG-3843</a>.
*
@@ -295,13 +299,13 @@ public class MavenITmng3843PomInheritanceTest extends AbstractMavenIntegrationTe
private void assertUrlCommon(String expected, String actual) {
// NOTE: URL adjustment is a slightly different issue, so don't test here and merely check for common prefix
- assertTrue("expected " + expected + " but was " + actual, actual.startsWith(expected));
+ assertTrue(actual.startsWith(expected), "expected " + expected + " but was " + actual);
}
private void assertMissing(Properties props, String prefix) {
for (Object o : props.keySet()) {
String key = o.toString();
- assertFalse("Found unexpected key: " + key, key.startsWith(prefix));
+ assertFalse(key.startsWith(prefix), "Found unexpected key: " + key);
}
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
index eaf8cb9624..0ddeb349f6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3845">MNG-3845</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
index 835dce4d9a..4d3a3130c9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3846">MNG-3846</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
index ad9393d16b..9d0538330f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3852">MNG-3852</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
index ce8e525eaa..70e8cae633 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3853">MNG-3853</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
index d21762c922..7562df9e67 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
index 527799407e..6730b72bb4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3864">MNG-3864</a>.
*
@@ -55,7 +56,7 @@ public class MavenITmng3864PerExecPluginConfigTest extends AbstractMavenIntegrat
Properties props = verifier.loadProperties("target/plugin-config.properties");
- assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam")));
+ ItUtils.assertCanonicalFileEquals(new File(testDir, "pom.xml"), new File(props.getProperty("fileParam")));
assertEquals("true", props.getProperty("booleanParam"));
assertEquals("42", props.getProperty("byteParam"));
assertEquals("-12345", props.getProperty("shortParam"));
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
index ef8e2dbfb6..605dce728f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3866">MNG-3866</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
index fc054957e1..f55de47395 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3872">MNG-3872</a>.
*
@@ -49,16 +51,16 @@ public class MavenITmng3872ProfileActivationInRelocatedPomTest extends AbstractM
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3872");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileClassPath = verifier.loadLines("target/compile.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("a-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("b-0.1.jar"));
- assertFalse(compileClassPath.toString(), compileClassPath.contains("c-0.1.jar"));
+ List<String> compileClassPath = verifier.loadLines("target/compile.txt");
+ assertTrue(compileClassPath.contains("a-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("b-0.1.jar"), compileClassPath.toString());
+ assertFalse(compileClassPath.contains("c-0.1.jar"), compileClassPath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
index d3d6f6dbf8..97e1f3deca 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3873">MNG-3873</a>.
*
@@ -72,8 +73,8 @@ public class MavenITmng3873MultipleExecutionGoalsTest extends AbstractMavenInteg
/*
* NOTE: We deliberately don't check the exact order here, that's another issue.
*/
- List<String> lines = verifier.loadLines("target/it.log", "UTF-8");
- assertTrue(lines.toString(), lines.contains("test"));
- assertTrue(lines.toString(), lines.contains("----"));
+ List<String> lines = verifier.loadLines("target/it.log");
+ assertTrue(lines.contains("test"), lines.toString());
+ assertTrue(lines.contains("----"), lines.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
index a056035764..3546998b4e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3877">MNG-3877</a>.
*
@@ -87,7 +88,7 @@ public class MavenITmng3877BasedirAlignedModelTest extends AbstractMavenIntegrat
private void assertPathEquals(File basedir, String expected, String actual) throws IOException {
File actualFile = new File(actual);
- assertTrue("path not absolute: " + actualFile, actualFile.isAbsolute());
- assertCanonicalFileEquals(new File(basedir, expected), actualFile);
+ assertTrue(actualFile.isAbsolute(), "path not absolute: " + actualFile);
+ ItUtils.assertCanonicalFileEquals(new File(basedir, expected), actualFile);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
index ec568d70aa..92489622bd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3886">MNG-3886</a>.
*
@@ -70,7 +71,7 @@ public class MavenITmng3886ExecutionGoalsOrderTest extends AbstractMavenIntegrat
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/it.log", "UTF-8");
+ List<String> lines = verifier.loadLines("target/it.log");
assertEquals(Arrays.asList(new String[] {"test", "----"}), lines);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
index 5e4dca64cb..85dd53b247 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3887">MNG-3887</a>.
*
@@ -70,7 +71,7 @@ public class MavenITmng3887PluginExecutionOrderTest extends AbstractMavenIntegra
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/it.log", "UTF-8");
+ List<String> lines = verifier.loadLines("target/it.log");
assertEquals(Arrays.asList(new String[] {"test", "----"}), lines);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
index 9ad5bb3328..af77d8b5a9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
@@ -21,11 +21,14 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3890">MNG-3890</a>.
*
@@ -51,17 +54,17 @@ public class MavenITmng3890TransitiveDependencyScopeUpdateTest extends AbstractM
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3890");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng3890:c:jar:0.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng3890:b:jar:0.1"));
- assertFalse(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng3890:a:jar:0.1"));
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.mng3890:c:jar:0.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng3890:b:jar:0.1"), artifacts.toString());
+ assertFalse(artifacts.contains("org.apache.maven.its.mng3890:a:jar:0.1"), artifacts.toString());
assertEquals(2, artifacts.size());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
index f2bc3767b2..afbd39c26b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Locale;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3892">MNG-3892</a>.
*
@@ -80,7 +81,7 @@ public class MavenITmng3892ReleaseDeploymentTest extends AbstractMavenIntegratio
}
private void verify(File testDir, String file, String checksum) throws Exception {
- assertEquals(file, checksum, readChecksum(new File(testDir, file)));
+ assertEquals(checksum, readChecksum(new File(testDir, file)), file);
}
private String readChecksum(File checksumFile) throws Exception {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
index 23a421261d..31cd21c1a5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3899">MNG-3899</a>.
*
@@ -50,7 +51,7 @@ public class MavenITmng3899ExtensionInheritanceTest extends AbstractMavenIntegra
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3899");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
index f7b06eead0..a1af946458 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3900">MNG-3900</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
index 135f1ed6d3..8fc9851060 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -55,11 +54,11 @@ public class MavenITmng3904NestedBuildDirInterpolationTest extends AbstractMaven
verifier.verifyErrorFreeLog();
Properties props = verifier.loadProperties("target/pom.properties");
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "target/classes/dir0"), new File(props.getProperty("project.properties.dir0")));
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "src/test/dir1"), new File(props.getProperty("project.properties.dir1")));
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "target/site/dir2"), new File(props.getProperty("project.properties.dir2")));
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
index 5ce9b4438c..44aa9a1de7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3906">MNG-3906</a>.
*
@@ -50,7 +52,7 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest extends AbstractMav
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3906");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
@@ -65,19 +67,19 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest extends AbstractMav
assertEquals("5", pclProps.getProperty(resName + ".count"));
assertTrue(
- pclProps.getProperty(resName + ".0"),
- pclProps.getProperty(resName + ".0").endsWith("/c-0.1.jar!/" + resName));
+ pclProps.getProperty(resName + ".0").endsWith("/c-0.1.jar!/" + resName),
+ pclProps.getProperty(resName + ".0"));
assertTrue(
- pclProps.getProperty(resName + ".1"),
- pclProps.getProperty(resName + ".1").endsWith("/a-0.2.jar!/" + resName));
+ pclProps.getProperty(resName + ".1").endsWith("/a-0.2.jar!/" + resName),
+ pclProps.getProperty(resName + ".1"));
assertTrue(
- pclProps.getProperty(resName + ".2"),
- pclProps.getProperty(resName + ".2").endsWith("/b-0.1.jar!/" + resName));
+ pclProps.getProperty(resName + ".2").endsWith("/b-0.1.jar!/" + resName),
+ pclProps.getProperty(resName + ".2"));
assertTrue(
- pclProps.getProperty(resName + ".3"),
- pclProps.getProperty(resName + ".3").endsWith("/e-0.1.jar!/" + resName));
+ pclProps.getProperty(resName + ".3").endsWith("/e-0.1.jar!/" + resName),
+ pclProps.getProperty(resName + ".3"));
assertTrue(
- pclProps.getProperty(resName + ".4"),
- pclProps.getProperty(resName + ".4").endsWith("/d-0.1.jar!/" + resName));
+ pclProps.getProperty(resName + ".4").endsWith("/d-0.1.jar!/" + resName),
+ pclProps.getProperty(resName + ".4"));
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
index 99f0d9013c..e2169198a6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
@@ -23,10 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3916">MNG-3916</a>.
*
@@ -56,7 +57,7 @@ public class MavenITmng3916PluginExecutionInheritanceTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> executions = verifier.loadLines("target/exec.log");
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
Collections.sort(executions);
List<String> expected = Arrays.asList(new String[] {"child-1", "child-default", "parent-1"});
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
index d3194efde5..471af3ebbb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3924">MNG-3924</a> and
* <a href="https://issues.apache.org/jira/browse/MNG-3662">MNG-3662</a>
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
index 67321063f3..b2f22cd418 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3925">MNG-3925</a>.
*
@@ -70,7 +71,7 @@ public class MavenITmng3925MergedPluginExecutionOrderTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> lines = verifier.loadLines("target/exec.log");
// Order is parent first and child appended, unless child overrides parent execution via equal id
List<String> expected =
Arrays.asList(new String[] {"parent-1", "parent-2", "child-default", "child-1", "child-2"});
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
index 22c80a4ff4..037cc9d898 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
index 80db3543b2..90696185e7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3937">MNG-3937</a>.
*
@@ -70,7 +71,7 @@ public class MavenITmng3937MergedPluginExecutionGoalsTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> lines = verifier.loadLines("target/exec.log");
// Order is child first and parent appended but without duplicate goals
List<String> expected = Arrays.asList(new String[] {"child", "----"});
assertEquals(expected, lines);
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
index b81b3e3630..5364e6c822 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3938">MNG-3938</a>.
*
@@ -72,10 +73,10 @@ public class MavenITmng3938MergePluginExecutionsTest extends AbstractMavenIntegr
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> lines = verifier.loadLines("target/default.log", "UTF-8");
+ List<String> lines = verifier.loadLines("target/default.log");
assertEquals(Arrays.asList(new String[] {"child"}), lines);
- lines = verifier.loadLines("target/non-default.log", "UTF-8");
+ lines = verifier.loadLines("target/non-default.log");
assertEquals(Arrays.asList(new String[] {"child"}), lines);
verifier.verifyFileNotPresent("target/parent.log");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
index f96704f783..34dce60f9e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Properties;
import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3940">MNG-3940</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
index 1930d8b6ff..a39f0ede97 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3941">MNG-3941</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
index 00a761d08f..bd74ba7cf7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
@@ -23,10 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3943">MNG-3943</a>.
*
@@ -56,7 +57,7 @@ public class MavenITmng3943PluginExecutionInheritanceTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> executions = verifier.loadLines("target/exec.log");
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
Collections.sort(executions);
List<String> expected = Arrays.asList(new String[] {"child-1", "child-default", "parent-1"});
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
index e8ce918c41..ed402a31bb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -57,7 +56,7 @@ public class MavenITmng3944BasedirInterpolationTest extends AbstractMavenIntegra
verifier.verifyFilePresent("target/basedir.properties");
Properties props = verifier.loadProperties("target/basedir.properties");
- assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop0")));
- assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop1")));
+ ItUtils.assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop0")));
+ ItUtils.assertCanonicalFileEquals(testDir, new File(props.getProperty("project.properties.prop1")));
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
index 4e2ba32fd5..3a8ba83995 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index e8c6bec716..35d7410651 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ public class MavenITmng3948ParentResolutionFromProfileReposTest extends Abstract
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3948");
- verifier.filterFile("pom.xml", "pom.xml", "UTF-8");
+ verifier.filterFile("pom.xml", "pom.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
index 058dd59c43..94bb197717 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -68,11 +67,11 @@ public class MavenITmng3951AbsolutePathsTest extends AbstractMavenIntegrationTes
verifier.verifyFilePresent("target/path.properties");
Properties props = verifier.loadProperties("target/path.properties");
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(testDir, "tmp").getAbsoluteFile(), new File(props.getProperty("fileParams.0")));
- assertCanonicalFileEquals(
+ ItUtils.assertCanonicalFileEquals(
new File(getRoot(testDir), "tmp").getAbsoluteFile(), new File(props.getProperty("fileParams.1")));
- assertCanonicalFileEquals(new File(repoDir), new File(props.getProperty("stringParams.0")));
+ ItUtils.assertCanonicalFileEquals(new File(repoDir), new File(props.getProperty("stringParams.0")));
}
private static File getRoot(File path) {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
index bb53d856cc..7580f3f026 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -42,6 +41,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3953">MNG-3953</a>.
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
index 79b6f2a294..8b015cb954 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3955">MNG-3955</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
index 491fa5901f..a8f33318b3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ public class MavenITmng3970DepResolutionFromProfileReposTest extends AbstractMav
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3970");
- verifier.filterFile("pom.xml", "pom.xml", "UTF-8");
+ verifier.filterFile("pom.xml", "pom.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -70,7 +69,7 @@ public class MavenITmng3970DepResolutionFromProfileReposTest extends AbstractMav
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3970");
- verifier.filterFile("settings.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index f2d0a23bc0..09faf70f4a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -49,7 +48,7 @@ public class MavenITmng3974MirrorOrderingTest extends AbstractMavenIntegrationTe
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng3974");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
index e952811392..7451b171c0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
index 8410fcdcb3..e459036be4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -52,7 +51,7 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest extends Abstract
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3983");
- verifier.filterFile("pom.xml", "pom.xml", "UTF-8");
+ verifier.filterFile("pom.xml", "pom.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -74,7 +73,7 @@ public class MavenITmng3983PluginResolutionFromProfileReposTest extends Abstract
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng3983");
- verifier.filterFile("settings.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
index 874408471b..3f06dbe597 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
index 7cec97435c..70ccb6a205 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
@@ -23,10 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3998">MNG-3998</a>.
*
@@ -55,7 +56,7 @@ public class MavenITmng3998PluginExecutionConfigTest extends AbstractMavenIntegr
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> executions = verifier.loadLines("target/exec.log");
// NOTE: Ordering of executions is another issue (MNG-3887), so ignore/normalize order
Collections.sort(executions);
List<String> expected = Arrays.asList(new String[] {"exec-1", "exec-2"});
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
index 9c742df4b9..cf4431a65c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4000">MNG-4000</a>.
*
@@ -55,7 +56,7 @@ public class MavenITmng4000MultiPluginExecutionsTest extends AbstractMavenIntegr
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> executions = verifier.loadLines("target/exec.log");
List<String> expected = Arrays.asList(new String[] {"exec", "exec"});
assertEquals(expected, executions);
}
@@ -77,7 +78,7 @@ public class MavenITmng4000MultiPluginExecutionsTest extends AbstractMavenIntegr
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/exec.log", "UTF-8");
+ List<String> executions = verifier.loadLines("target/exec.log");
List<String> expected = Arrays.asList(new String[] {"exec", "exec"});
assertEquals(expected, executions);
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
index ebff7e8f8d..7e0214c386 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4005">MNG-4005</a>.
*
@@ -97,7 +98,7 @@ public class MavenITmng4005UniqueDependencyKeyTest extends AbstractMavenIntegrat
logLevel = "ERROR";
}
- List<String> lines = verifier.loadLines(verifier.getLogFileName(), "UTF-8");
+ List<String> lines = verifier.loadLogLines();
boolean foundMessage = false;
for (String line : lines) {
if (line.startsWith("[" + logLevel + "]") && line.indexOf("must be unique: junit:junit:jar") > 0) {
@@ -105,6 +106,6 @@ public class MavenITmng4005UniqueDependencyKeyTest extends AbstractMavenIntegrat
}
}
- assertTrue("Duplicate dependency message wasn't generated.", foundMessage);
+ assertTrue(foundMessage, "Duplicate dependency message wasn't generated.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
index b4347761d5..e795d888c9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4007">MNG-4007</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
index 74d371bbca..3508e5d1d1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4008">MNG-4008</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
index d2e48e4daa..8bdcfb45cf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4009">MNG-4009</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
index 108427c547..d688a03e40 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4016">MNG-4016</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
index 6d80de8c6b..331c2dd7c6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4022">MNG-4022</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
index 70bd23f823..6fe34e59ed 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4023">MNG-4023</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
index 55c9edcef1..4ee9c439ca 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4026">MNG-4026</a>.
*
@@ -55,7 +56,7 @@ public class MavenITmng4026ReactorDependenciesOrderTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> classpath1 = verifier.loadLines("consumer/target/classpath-1.txt", "UTF-8");
+ List<String> classpath1 = verifier.loadLines("consumer/target/classpath-1.txt");
assertEquals(5, classpath1.size());
assertEquals("consumer/classes", classpath1.get(0));
assertEquals("dep-1/pom.xml", classpath1.get(1));
@@ -63,7 +64,7 @@ public class MavenITmng4026ReactorDependenciesOrderTest extends AbstractMavenInt
assertEquals("dep-2/pom.xml", classpath1.get(3));
assertEquals("dep-4/pom.xml", classpath1.get(4));
- List<String> classpath2 = verifier.loadLines("consumer/target/classpath-2.txt", "UTF-8");
+ List<String> classpath2 = verifier.loadLines("consumer/target/classpath-2.txt");
assertEquals(classpath1, classpath2);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
index e83adbc1a1..f3d3df6f9e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
@@ -23,10 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4034">MNG-4034</a>.
*
@@ -56,10 +57,10 @@ public class MavenITmng4034ManagedProfileDependencyTest extends AbstractMavenInt
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/compile.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/compile.txt");
assertEquals(Arrays.asList(new String[0]), artifacts);
- artifacts = verifier.loadLines("target/runtime.txt", "UTF-8");
+ artifacts = verifier.loadLines("target/runtime.txt");
assertEquals(Collections.singletonList("org.apache.maven.its:maven-core-it-support:jar:1.3"), artifacts);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
index 89071fbf39..bf6941544c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -46,7 +45,7 @@ public class MavenITmng4036ParentResolutionFromSettingsRepoTest extends Abstract
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- verifier.filterFile("settings.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings.xml", "settings.xml");
verifier.deleteArtifacts("org.apache.maven.its.mng4036");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
index 61452e89c4..8396be87c2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
index ba4a0932ae..80b03feff0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4048">MNG-4048</a>.
*
@@ -53,7 +54,7 @@ public class MavenITmng4048VersionRangeReactorResolutionTest extends AbstractMav
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("sub-2/target/compile.txt", "UTF-8");
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4048:sub-1:jar:1.1-SNAPSHOT"));
+ List<String> artifacts = verifier.loadLines("sub-2/target/compile.txt");
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4048:sub-1:jar:1.1-SNAPSHOT"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
index 69fa365d28..c050284caf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
index 885c084d9d..bd606179b2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4053">MNG-4053</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
index 5ffa82b311..8eb4678ebf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4056">MNG-4056</a>.
*
@@ -54,36 +55,36 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest extends A
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("consumer/target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("consumer/target/artifacts.txt");
if (matchesVersionRange("[3.0-alpha-3,)")) {
// artifact type unchanged to match type as declared in dependency
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4056:producer:jar:tests:0.1"));
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4056:producer:jar:tests:0.1"), artifacts.toString());
assertTrue(
- artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4056:producer:jar:sources:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:jar:sources:0.1"), artifacts.toString());
assertTrue(
- artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4056:producer:jar:javadoc:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:jar:javadoc:0.1"), artifacts.toString());
assertTrue(
- artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4056:producer:jar:client:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:jar:client:0.1"), artifacts.toString());
} else {
// artifact type updated to match type of active artifact
assertTrue(
- artifacts.toString(),
- artifacts.contains("org.apache.maven.its.mng4056:producer:test-jar:tests:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:test-jar:tests:0.1"),
+ artifacts.toString());
assertTrue(
- artifacts.toString(),
- artifacts.contains("org.apache.maven.its.mng4056:producer:java-source:sources:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:java-source:sources:0.1"),
+ artifacts.toString());
assertTrue(
- artifacts.toString(),
- artifacts.contains("org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1"),
+ artifacts.toString());
assertTrue(
- artifacts.toString(),
- artifacts.contains("org.apache.maven.its.mng4056:producer:ejb-client:client:0.1"));
+ artifacts.contains("org.apache.maven.its.mng4056:producer:ejb-client:client:0.1"),
+ artifacts.toString());
}
- List<String> classpath = verifier.loadLines("consumer/target/compile.txt", "UTF-8");
- assertTrue(classpath.toString(), classpath.contains("producer/test.jar"));
- assertTrue(classpath.toString(), classpath.contains("producer/client.jar"));
+ List<String> classpath = verifier.loadLines("consumer/target/compile.txt");
+ assertTrue(classpath.contains("producer/test.jar"), classpath.toString());
+ assertTrue(classpath.contains("producer/client.jar"), classpath.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index 4811de54fa..107b6d2e84 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -120,7 +119,7 @@ public class MavenITmng4068AuthenticatedMirrorTest extends AbstractMavenIntegrat
filterProps.put("@mirrorPort@", Integer.toString(port));
Verifier verifier = newVerifier(testDir.getAbsolutePath());
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng4068");
verifier.addCliArgument("--settings");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
index fe495ea9c1..7afdd6775c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4070">MNG-4070</a>.
*
@@ -50,14 +51,14 @@ public class MavenITmng4070WhitespaceTrimmingTest extends AbstractMavenIntegrati
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4070");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(Collections.singletonList("org.apache.maven.its.mng4070:a:jar:0.1"), artifacts);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
index d72e4746f3..f8bcdcf809 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -47,9 +46,9 @@ public class MavenITmng4072InactiveProfileReposTest extends AbstractMavenIntegra
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng4072");
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8");
- verifier.filterFile("profiles-template.xml", "profiles.xml", "UTF-8");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("pom-template.xml", "pom.xml");
+ verifier.filterFile("profiles-template.xml", "profiles.xml");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
try {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
index 4297696299..1c076d025f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -48,7 +47,7 @@ public class MavenITmng4087PercentEncodedFileUrlTest extends AbstractMavenIntegr
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4087");
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8");
+ verifier.filterFile("pom-template.xml", "pom.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
index 4a1c21bf94..2518c633a6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java
@@ -23,10 +23,12 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4091">MNG-4091</a>:
* Bad plugin descriptor error handling
@@ -44,16 +46,11 @@ public class MavenITmng4091BadPluginDescriptorTest extends AbstractMavenIntegrat
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
- try {
- verifier.addCliArgument("validate");
- verifier.execute();
-
- fail("should throw an error during execution.");
- } catch (VerificationException e) {
- // expected...it'd be nice if we could get the specifics of the exception right here...
- }
+ verifier.addCliArgument("validate");
+ VerificationException exception =
+ assertThrows(VerificationException.class, verifier::execute, "should throw an error during execution.");
- List<String> logFile = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
+ List<String> logFile = verifier.loadLogLines();
String msg = "Plugin's descriptor contains the wrong version: 2.0-SNAPSHOT";
@@ -65,7 +62,7 @@ public class MavenITmng4091BadPluginDescriptorTest extends AbstractMavenIntegrat
}
}
- assertTrue("User-friendly message was not found in output.", foundMessage);
+ assertTrue(foundMessage, "User-friendly message was not found in output.");
}
@Test
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
index 0d0525ecc3..fb18b817e0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4102">MNG-4102</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
index 61998ee37c..8a208c6a04 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4106">MNG-4106</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
index 0faa06f34c..65f757e670 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4107">MNG-4107</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
index 9c0aa1f62d..946c53fc77 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegrationTestCase {
public MavenITmng4112MavenVersionPropertyTest() {
@@ -49,11 +51,11 @@ public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegra
Properties props = verifier.loadProperties("target/pom.properties");
String testMavenVersion = props.getProperty("project.properties.simpleVersion", "");
- assertFalse(testMavenVersion, testMavenVersion.contains("$"));
- assertTrue(testMavenVersion, testMavenVersion.matches("[0-9]+\\.[0-9]+.*"));
+ assertFalse(testMavenVersion.contains("$"), testMavenVersion);
+ assertTrue(testMavenVersion.matches("[0-9]+\\.[0-9]+.*"), testMavenVersion);
String testMavenBuildVersion = props.getProperty("project.properties.fullVersion", "");
- assertTrue(testMavenBuildVersion, testMavenBuildVersion.contains(testMavenVersion));
+ assertTrue(testMavenBuildVersion.contains(testMavenVersion), testMavenBuildVersion);
verifier.verifyErrorFreeLog();
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
index 3ac3626489..1a01103649 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4116">MNG-4116</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
index daaec472e4..d4eb22fd43 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
@@ -23,10 +23,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4129">MNG-4129</a>.
*
@@ -57,14 +58,14 @@ public class MavenITmng4129PluginExecutionInheritanceTest extends AbstractMavenI
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> executions = verifier.loadLines("target/executions.txt", "UTF-8");
+ List<String> executions = verifier.loadLines("target/executions.txt");
Collections.sort(executions);
assertEquals(Arrays.asList(new String[] {"inherited-execution", "non-inherited-execution"}), executions);
- List<String> executions1 = verifier.loadLines("child-1/target/executions.txt", "UTF-8");
+ List<String> executions1 = verifier.loadLines("child-1/target/executions.txt");
assertEquals(Collections.singletonList("inherited-execution"), executions1);
- List<String> executions2 = verifier.loadLines("child-2/target/executions.txt", "UTF-8");
+ List<String> executions2 = verifier.loadLines("child-2/target/executions.txt");
assertEquals(Collections.singletonList("inherited-execution"), executions2);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
index 69e7f92218..6b7738f03e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Collection;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-505">MNG-505</a>.
*
@@ -49,18 +51,18 @@ public class MavenITmng4150VersionRangeTest extends AbstractMavenIntegrationTest
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4150");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- Collection<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ Collection<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(4, artifacts.size());
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4150:a:jar:1.1"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4150:b:jar:1.0"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4150:c:jar:3.8"));
- assertTrue(artifacts.toString(), artifacts.contains("org.apache.maven.its.mng4150:d:jar:2.1.1"));
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4150:a:jar:1.1"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4150:b:jar:1.0"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4150:c:jar:3.8"), artifacts.toString());
+ assertTrue(artifacts.contains("org.apache.maven.its.mng4150:d:jar:2.1.1"), artifacts.toString());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
index db55f250a0..57b47537ba 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java
@@ -21,10 +21,12 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4162">MNG-4162</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
index fd27b1c23d..79c6417f81 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4166">MNG-4166</a>.
*
@@ -52,7 +53,7 @@ public class MavenITmng4166HideCoreCommonsCliTest extends AbstractMavenIntegrati
verifier.deleteDirectory("target");
verifier.deleteArtifact("commons-cli", "commons-cli", "0.1.4166", "jar");
verifier.deleteArtifact("commons-cli", "commons-cli", "0.1.4166", "pom");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
index 98766b407c..c5546cdd17 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4172">MNG-4172</a>.
*
@@ -53,7 +54,7 @@ public class MavenITmng4172EmptyDependencySetTest extends AbstractMavenIntegrati
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
assertEquals(new ArrayList<String>(), artifacts);
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
index db708216d9..fbdafffcd1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
@@ -23,10 +23,11 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4180">MNG-4180</a>.
*
@@ -52,14 +53,14 @@ public class MavenITmng4180PerDependencyExclusionsTest extends AbstractMavenInte
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4180");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
Collections.sort(artifacts);
List<String> expected = new ArrayList<>();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index 3efa29ade4..0a4982a78c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4189">MNG-4189</a>.
*
@@ -43,7 +44,7 @@ public class MavenITmng4189UniqueVersionSnapshotTest extends AbstractMavenIntegr
Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts("org.apache.maven.its.mng4189");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
// depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
verifier = newVerifier(testDir.getAbsolutePath());
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
index c20c4af719..22aa9b4258 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
@@ -24,10 +24,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4190">MNG-4190</a>.
*
@@ -54,14 +55,14 @@ public class MavenITmng4190MirrorRepoMergingTest extends AbstractMavenIntegratio
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4190");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
Collections.sort(artifacts);
List<String> expected = new ArrayList<>();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
index 1105a2767c..7657b83d7b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java
@@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
index 17f892761b..e1b5453d4e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
@@ -21,10 +21,13 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4196">MNG-4196</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
index 365f61a672..7f86fe2e3a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
@@ -21,10 +21,13 @@ package org.apache.maven.it;
import java.io.File;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4199">MNG-4199</a>.
*
@@ -56,50 +59,50 @@ public class MavenITmng4199CompileMeetsRuntimeScopeTest extends AbstractMavenInt
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4199");
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("pom-template.xml", "pom.xml");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt", "UTF-8");
+ List<String> compileArtifacts = verifier.loadLines("target/compile-artifacts.txt");
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.mng4199:system:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.mng4199:system:jar:0.1"), compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(),
- compileArtifacts.contains("org.apache.maven.its.mng4199:provided:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.mng4199:provided:jar:0.1"),
+ compileArtifacts.toString());
assertTrue(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.mng4199:compile:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.mng4199:compile:jar:0.1"), compileArtifacts.toString());
assertFalse(
- compileArtifacts.toString(), compileArtifacts.contains("org.apache.maven.its.mng4199:runtime:jar:0.1"));
+ compileArtifacts.contains("org.apache.maven.its.mng4199:runtime:jar:0.1"), compileArtifacts.toString());
assertEquals(3, compileArtifacts.size());
- List<String> compileClassPath = verifier.loadLines("target/compile-cp.txt", "UTF-8");
- assertTrue(compileClassPath.toString(), compileClassPath.contains("system-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("provided-0.1.jar"));
- assertTrue(compileClassPath.toString(), compileClassPath.contains("compile-0.1.jar"));
- assertFalse(compileClassPath.toString(), compileClassPath.contains("runtime-0.1.jar"));
+ List<String> compileClassPath = verifier.loadLines("target/compile-cp.txt");
+ assertTrue(compileClassPath.contains("system-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("provided-0.1.jar"), compileClassPath.toString());
+ assertTrue(compileClassPath.contains("compile-0.1.jar"), compileClassPath.toString());
+ assertFalse(compileClassPath.contains("runtime-0.1.jar"), compileClassPath.toString());
assertEquals(4, compileClassPath.size());
- List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt", "UTF-8");
+ List<String> runtimeArtifacts = verifier.loadLines("target/runtime-artifacts.txt");
assertFalse(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.mng4199:system:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.mng4199:system:jar:0.1"), runtimeArtifacts.toString());
assertFalse(
- runtimeArtifacts.toString(),
- runtimeArtifacts.contains("org.apache.maven.its.mng4199:provided:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.mng4199:provided:jar:0.1"),
+ runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.mng4199:compile:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.mng4199:compile:jar:0.1"), runtimeArtifacts.toString());
assertTrue(
- runtimeArtifacts.toString(), runtimeArtifacts.contains("org.apache.maven.its.mng4199:runtime:jar:0.1"));
+ runtimeArtifacts.contains("org.apache.maven.its.mng4199:runtime:jar:0.1"), runtimeArtifacts.toString());
assertEquals(2, runtimeArtifacts.size());
- List<String> runtimeClassPath = verifier.loadLines("target/runtime-cp.txt", "UTF-8");
- assertFalse(runtimeClassPath.toString(), runtimeClassPath.contains("system-0.1.jar"));
- assertFalse(runtimeClassPath.toString(), runtimeClassPath.contains("provided-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("compile-0.1.jar"));
- assertTrue(runtimeClassPath.toString(), runtimeClassPath.contains("runtime-0.1.jar"));
+ List<String> runtimeClassPath = verifier.loadLines("target/runtime-cp.txt");
+ assertFalse(runtimeClassPath.contains("system-0.1.jar"), runtimeClassPath.toString());
+ assertFalse(runtimeClassPath.contains("provided-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("compile-0.1.jar"), runtimeClassPath.toString());
+ assertTrue(runtimeClassPath.contains("runtime-0.1.jar"), runtimeClassPath.toString());
assertEquals(3, runtimeClassPath.size());
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
index 494e8f21b8..08ba39cdf0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
@@ -23,10 +23,11 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4203">MNG-4203</a>.
*
@@ -51,14 +52,14 @@ public class MavenITmng4203TransitiveDependencyExclusionTest extends AbstractMav
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4203");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
- List<String> artifacts = verifier.loadLines("target/artifacts.txt", "UTF-8");
+ List<String> artifacts = verifier.loadLines("target/artifacts.txt");
Collections.sort(artifacts);
List<String> expected = new ArrayList<>();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
index 0ba2ee0097..56b311cb85 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
index 0e01d707a0..eaee0d3495 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4208">MNG-4208</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
index 8816f951bd..50739c72b0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -50,7 +49,7 @@ public class MavenITmng4214MirroredParentSearchReposTest extends AbstractMavenIn
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4214");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
index b5323a2af0..4177c37a63 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
@@ -22,10 +22,11 @@ import java.io.File;
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4231">MNG-4231</a>.
*
@@ -56,14 +57,14 @@ public class MavenITmng4231SnapshotUpdatePolicyTest extends AbstractMavenIntegra
filterProps.put("@updates@", "always");
filterProps.put("@repo@", "repo-1");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setLogFileName("log-always-1.txt");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
filterProps.put("@repo@", "repo-2");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setLogFileName("log-always-2.txt");
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
@@ -94,14 +95,14 @@ public class MavenITmng4231SnapshotUpdatePolicyTest extends AbstractMavenIntegra
filterProps.put("@updates@", "never");
filterProps.put("@repo@", "repo-1");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setLogFileName("log-never-1.txt");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
filterProps.put("@repo@", "repo-2");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", filterProps);
+ verifier.filterFile("settings-template.xml", "settings.xml", filterProps);
verifier.setLogFileName("log-never-2.txt");
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
index cc7fddfa99..1673ae6812 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4233">MNG-4233</a>.
*
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
index 2cc2e4f310..d5c5107900 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
@@ -31,7 +31,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.it.utils.DeployedResource;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.jetty.security.ConstraintMapping;
@@ -53,6 +52,7 @@ import org.junit.jupiter.api.Test;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4235">MNG-4235</a>.
@@ -135,7 +135,7 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest extends AbstractMaven
filterProps.put("@port@", Integer.toString(port));
Verifier verifier = newVerifier(testDir.getAbsolutePath());
- verifier.filterFile("pom-template.xml", "pom.xml", "UTF-8", filterProps);
+ verifier.filterFile("pom-template.xml", "pom.xml", filterProps);
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng4235");
verifier.deleteDirectory("repo");
@@ -165,10 +165,9 @@ public class MavenITmng4235HttpAuthDeploymentChecksumsTest extends AbstractMaven
private void assertHash(Verifier verifier, String dataFile, String hashExt, String algo) throws Exception {
String actualHash = ItUtils.calcHash(new File(verifier.getBasedir(), dataFile), algo);
- String expectedHash =
- verifier.loadLines(dataFile + hashExt, "UTF-8").get(0).trim();
+ String expectedHash = verifier.loadLines(dataFile + hashExt).get(0).trim();
- assertTrue("expected=" + expectedHash + ", actual=" + actualHash, expectedHash.equalsIgnoreCase(actualHash));
+ assertTrue(expectedHash.equalsIgnoreCase(actualHash), "expected=" + expectedHash + ", actual=" + actualHash);
}
private static class RepoHandler extends ResourceHandler {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index c91c43047a..b76fd09502 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3506">MNG-3506</a>.
*
@@ -61,12 +63,12 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest extends AbstractMav
// IF IT DIDN'T, we have a .pom and a .coreit in the local repo...
String path = verifier.getArtifactPath(GID, AID, VERSION, TYPE);
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID, VERSION, "pom");
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID, VERSION, BAD_TYPE);
- assertFalse(path + " should NOT have been installed.", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should NOT have been installed.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
index 50c19153ea..4ded7a676f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
index e6448d9497..e53f34fd81 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
index 6d884d64d9..60fe31b763 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.it;
import java.io.File;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
@@ -53,7 +52,7 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest extends AbstractMa
// NOTE: It's a crucial prerequisite to create the output directory, i.e. the bad choice
new File(testDir, "target/classes").mkdirs();
verifier.deleteArtifacts("org.apache.maven.its.mng4269");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
+ verifier.filterFile("settings-template.xml", "settings.xml");
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
// This should use the previous installation/deployment from the repo, not the invalid output directory
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index 7af19e1c50..6c4675bd86 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -22,10 +22,12 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.shared.verifier.VerificationException;
-import org.apache.maven.shared.verifier.Verifier;
import org.apache.maven.shared.verifier.util.ResourceExtractor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4270">MNG-4270</a>.
*
@@ -63,12 +65,12 @@ public class MavenITmng4270ArtifactHandlersFromPluginDepsTest extends AbstractMa
// IF IT DIDN'T, we have a .pom and a .coreit in the local repo...
String path = verifier.getArtifactPath(GID, AID, VERSION, TYPE);
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID, VERSION, "pom");
- assertTrue(path + " should have been installed.", new File(path).exists());
+ assertTrue(new File(path).exists(), path + " should have been installed.");
path = verifier.getArtifactPath(GID, AID, VERSION, BAD_TYPE);
- assertFalse(path + " should NOT have been installed.", new File(path).exists());
+ assertFalse(new File(path).exists(), path + " should NOT have been installed.");
}
}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
index f2632bab1a..37ba50fcfc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java
@@ -21,10 +21,11 @@ package org.apache.maven.it;
... 8909 lines suppressed ...