[MNG-7661] Replace deprecated 'verifier.newDefaultFilterProperties()'
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
index 351d573..eefff04 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java
@@ -52,7 +52,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0010" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
index 3d14e0f..8a76f0f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java
@@ -49,7 +49,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0011" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
index 5dfbb51..fd0b804 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java
@@ -49,7 +49,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
index c452a51..a54cc40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java
@@ -50,7 +50,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "-Pprofile-2" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
index 0aa1661..1a17f5f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java
@@ -54,7 +54,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
index 2c21d6a..285c64a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0087" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
index b289eaf..1be92dd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -61,9 +60,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0142" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- 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", "UTF-8" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
index 4eac9c5..9c5fb65 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
@@ -24,7 +24,7 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -250,8 +250,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target-" + scope );
verifier.deleteArtifacts( "org.apache.maven.its.it0143" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@scope@", scope );
+ 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.addCliArgument( "--settings" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
index dc9e1fa..cee4dc0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java
@@ -25,7 +25,7 @@
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -91,9 +91,9 @@
{
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@host@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
- properties.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ properties.put( "@host@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
+ properties.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
@@ -131,9 +131,9 @@
verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@host@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
- properties.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ properties.put( "@host@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
+ properties.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 53a9e40..3487ac7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0377" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "-Dtouch.outputFile=target/file.txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index c71641b..fd93b3a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
@@ -67,7 +67,7 @@
}
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -112,7 +112,7 @@
}
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
index c4dc964..19448f1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0461" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index 274e433..6a452cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
@@ -69,7 +69,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
@@ -134,7 +134,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0479" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
@@ -152,7 +152,7 @@
verifier = newVerifier( new File( testDir, "test-2" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
@@ -172,7 +172,7 @@
verifier = newVerifier( new File( testDir, "test-3" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
@@ -193,7 +193,7 @@
verifier = newVerifier( new File( testDir, "test-4" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
index 7d934de..b86d6cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
@@ -60,7 +60,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0505" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index e383c03..88e490b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -23,8 +23,9 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.HashMap;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -127,8 +128,8 @@
{
testDir = new File( testDir, "test-1" );
- Properties filterProps = new Properties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = new HashMap<>();
+ filterProps.put( "@port@", Integer.toString( port ) );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -157,11 +158,11 @@
{
testDir = new File( testDir, "test-2" );
- Properties filterProps = new Properties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = new HashMap<>();
+ filterProps.put( "@port@", Integer.toString( port ) );
// NOTE: The upper-case scheme name is essential part of the test
String secUrl = "FILE://" + new File( testDir, "relocated-settings-security.xml" ).toURI().getRawPath();
- filterProps.setProperty( "@relocation@", secUrl );
+ filterProps.put( "@relocation@", secUrl );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
index 6932f05..821a80b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0059" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
index 996883b..cb3d9f7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0080" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
index 18b5b1c..37747b4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0820" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
index a18c2f1..1ecfd44 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng836" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
// Maven 3.x aims to separate plugins and project dependencies (MNG-4191)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
index 720aeae..4184e44 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "project/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0870" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "initialize" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
index 77b92db..032791d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0947" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
index f13dcae..7780bee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
@@ -55,7 +55,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng0956" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index f39e282..b555d46 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "client/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1088" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
// NOTE: It's essential part of the test to invoke a phase before "compile"
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
index 6a50e3a..299772a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java
@@ -78,7 +78,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng1142" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
index 171b5d8..309cbed 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.it0083" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
index e5cbcb2..6e42144 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -61,7 +61,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index 8c5d72b..36f9f2f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
@@ -55,7 +55,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
index 245c6d2..47f9280 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java
@@ -53,7 +53,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng1412" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
index 7fa093a..4a3ecf9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
@@ -56,7 +56,7 @@
Verifier verifier = newVerifier( new File( testDir, "child" ).getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
index 65d9187..08077f8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java
@@ -73,7 +73,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
index 9605e95..238df87 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java
@@ -24,7 +24,7 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -60,7 +60,7 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -241,9 +241,9 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties props = verifier.newDefaultFilterProperties();
- props.setProperty( "@scope.a@", scopeA );
- props.setProperty( "@scope.b@", scopeB );
+ 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.setLogFileName( "log-" + scopeB + "-vs-" + scopeA + ".txt" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
index 14f9233..44aa610 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng2098" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
index a1e0066..ddfd6b3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java
@@ -49,7 +49,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2123" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
index cd2e45b..636b7c0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2174" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
index 07b5587..14627f0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2228" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
index 1299bd4..17564e1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
@@ -29,7 +29,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -105,9 +105,9 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2305" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@proxy.http@", Integer.toString( httpPort ) );
- filterProps.setProperty( "@proxy.https@", Integer.toString( proxyPort ) );
+ 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.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index c7928df..518dc79 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -24,7 +24,7 @@
import java.io.File;
import java.net.InetAddress;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -126,10 +126,10 @@
{
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@host@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
- properties.setProperty( "@port@", Integer.toString( port ) );
- properties.setProperty( "@proxyPort@", Integer.toString( proxyPort ) );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ 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.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index 0681c0b..860f002 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -58,7 +58,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "it:touch" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
index 2b22f51..91551af 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java
@@ -83,7 +83,7 @@
verifier.deleteDirectory( "target" );
// enforce remote resolution
verifier.deleteArtifacts( "org.apache.maven.its.mng2486" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
index 40ad546..62569d0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java
@@ -61,7 +61,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng2695" );
verifier.setAutoclean( false );
verifier.setLogFileName( "log1.txt" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
index 0748d0c..6ad1458 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
@@ -55,7 +55,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
index 8488380..c680546 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2749" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
index 12f55a8..0bc31e7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
@@ -51,7 +51,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "A/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2861" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
index 525095e..98f9377 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
@@ -23,7 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -98,8 +97,7 @@
Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2865" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
index f6f2184..27dd584 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
@@ -58,7 +58,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
index 7e1d9b8..151c848 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
@@ -69,8 +69,7 @@
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-default.txt" );
- verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8",
- verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings-default.xml" );
verifier.addCliArgument( "mng-2926:apache" );
@@ -80,8 +79,7 @@
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-custom.txt" );
- verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8",
- verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings-custom.xml" );
verifier.addCliArgument( "mng-2926:custom" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
index dd64dc9..978bbc5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
@@ -56,7 +56,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
@@ -88,7 +88,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
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/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
index 216beda..6591ffc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
@@ -53,7 +53,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
index 914936f..c3be001 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
@@ -57,7 +57,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
index ba4e0f8..dd6b8aa 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
@@ -23,7 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -60,10 +59,9 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3052" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
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", filterProps );
+ "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
index 8c69d75..11735cb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3092" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
index 122383d..3150695 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3099" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "org.apache.maven.its.mng3099:maven-mng3099-plugin:0.1:touch" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
index 0d1e57e..07ec51f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3139" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.setLogFileName( "log1.txt" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
index 0d04fac..49e9408 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
@@ -58,7 +58,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index 1c922c5..6a78f78 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
@@ -53,8 +53,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
- verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
@@ -74,8 +73,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3220" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
- verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
index 43045b0..6d8a00e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java
@@ -60,7 +60,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
index a0712ae..bde113a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java
@@ -59,7 +59,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
index 91c0257..5846384 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
@@ -59,7 +59,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "-Dmaven.artifact.threads=16" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
index 6646949..b732c3b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
@@ -63,7 +63,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3380" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index 5f9053f..e9aadf9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
@@ -28,7 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Deque;
-import java.util.Properties;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -96,7 +96,7 @@
setupDummyDependency( verifier, testDir, true );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ 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 );
@@ -199,7 +199,7 @@
int port = ( (NetworkConnector) server.getConnectors()[0] ).getLocalPort();
System.out.println( "Bound server socket to the port " + port );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ 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 );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index 92d7ab4..67ad9ee 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -27,7 +27,7 @@
import java.io.File;
import java.io.IOException;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -66,8 +66,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
@@ -140,8 +139,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@test.port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@test.port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
@@ -175,8 +174,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
index 172ff1d..b8a8838 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3470" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
index 6937d45..0dc0996 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
@@ -50,7 +50,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3482" );
verifier.addCliArgument( "-s" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
index 3228f85..0b87ca2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
@@ -59,7 +59,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
index 9fcf2f4..6979002 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java
@@ -61,7 +61,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng3667" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
index b4d5e3b..c4ca756 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3680" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index 953d3c5..4544696 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -59,8 +60,8 @@
new File( javaHome, "bin/javac.exe").createNewFile();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@javaHome@", javaHome.getAbsolutePath() );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ properties.put( "@javaHome@", javaHome.getAbsolutePath() );
verifier.filterFile( "toolchains.xml", "toolchains.xml", "UTF-8", properties );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
index eccf6ba..437ff05 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3769" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
index a3da5ea..fcb1a40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java
@@ -99,7 +99,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng3775" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
index 69104f5..a69068c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3805" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
index d813cb6..1d26e5a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3813" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index 6d1084c..e012ee7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
@@ -55,7 +55,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
index 587adc5..ffe33d1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -57,8 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3872" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
index 4c63cfc..a1674cd 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3890" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
index 1abe928..0a68a7d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3899" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
index 6eb66df..35c541a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3906" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index bec90ff..542fd6a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -57,7 +57,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
- verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
index 54e9ee1..43141db 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
@@ -57,7 +57,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
- verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -79,7 +79,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
- verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index cc07ea7..39fef68 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
@@ -56,7 +56,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
index f2f6ddf..fd2696c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
- verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -83,7 +83,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
- verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
index 991515a..2d50a40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
@@ -53,7 +53,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings.xml", "settings.xml", "UTF-8" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index b6821dc..441099e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -23,7 +23,8 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -128,8 +129,8 @@
public void testit()
throws Exception
{
- Properties filterProps = new Properties();
- filterProps.setProperty( "@mirrorPort@", Integer.toString( port ) );
+ Map<String, String> filterProps = new HashMap<>();
+ filterProps.put( "@mirrorPort@", Integer.toString( port ) );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
index 5137b69..c1e8608 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4070" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
index 0aeba54..d133879 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java
@@ -23,7 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -55,10 +54,9 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4072" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
- verifier.filterFile( "profiles-template.xml", "profiles.xml", "UTF-8", filterProps );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ 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.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
index 3537785..39c563c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
@@ -55,7 +55,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4087" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
index 36fb785..fb41ee6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4150" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
index c6e08a4..7e5af01 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
@@ -59,7 +59,7 @@
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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
index af84aaf..1861385 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4180" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index b97c266..4f88d31 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -50,7 +50,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng4189" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
// depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
verifier = newVerifier( testDir.getAbsolutePath() );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
index b7e3378..529cb92 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java
@@ -61,7 +61,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4190" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
index 73e0007..b2bbed9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -64,9 +63,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4199" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- 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", "UTF-8" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
index 6f06660..27a4916 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4203" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
index 534b755..516ce04 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4214" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
index 8ce2346..c85ca66 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -58,17 +59,17 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "always" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "always" );
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-always-1.txt" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-always-2.txt" );
verifier.deleteDirectory( "target" );
@@ -99,17 +100,17 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "never" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "never" );
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-never-1.txt" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-never-2.txt" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
index dd4556c..c750f2d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
@@ -30,7 +30,8 @@
import java.io.IOException;
import java.nio.file.Files;
import java.util.Deque;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.apache.maven.it.utils.DeployedResource;
@@ -143,8 +144,8 @@
public void testit()
throws Exception
{
- Properties filterProps = new Properties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = new HashMap<>();
+ filterProps.put( "@port@", Integer.toString( port ) );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
index 96352fb..0ce6c84 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java
@@ -60,7 +60,7 @@
// 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.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
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/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
index 929a5cb..09e3e03 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java
@@ -61,7 +61,7 @@
verifier.deleteArtifact( "org.apache.maven", "maven-core", "2.0.4274", "pom" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "jar" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "pom" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
index f364c2b..27511de 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4275" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
index b1b5d3c..85d9a19 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4276" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4276", "jar" );
verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4276", "pom" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
index 2538cdd..10dd775 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java
@@ -68,7 +68,7 @@
verifier.setAutoclean( false );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
index bfb03af..876b9e3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
@@ -24,7 +24,6 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -61,9 +60,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4293" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- 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", "UTF-8" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
index 0afd7d0..3c0f7ab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4317" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.mng4317:maven-mng4317-plugin:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
index 9267bbc..8c8badb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4320" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
index a20188c..b706e81 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java
@@ -31,7 +31,7 @@
import java.util.Date;
import java.util.Deque;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.eclipse.jetty.server.Handler;
@@ -154,8 +154,8 @@
// test 1: resolve snapshot, just built local copy should suppress daily remote update check
verifier = newVerifier( new File( testDir, "test" ).getAbsolutePath() );
verifier.setAutoclean( false );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
index b30fd2d..6628597 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4335" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
try
{
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
index 8ce84b9..32ea410 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
@@ -30,7 +30,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Deque;
-import java.util.Properties;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.eclipse.jetty.server.Handler;
@@ -156,9 +156,9 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "always" );
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "always" );
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
blockAccess = true;
@@ -212,9 +212,9 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "never" );
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "never" );
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
blockAccess = true;
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
index 2b964ef..67f3d2d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
@@ -63,7 +63,7 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
index 27b7915..ae21d75 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -104,8 +104,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4348" );
verifier.deleteDirectory( "target" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
index e69079e..4fb37ac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
@@ -58,7 +58,7 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4349" );
verifier.deleteDirectory( "target" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
index 50800c9..74ca949 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -56,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4353" );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.filterFile( "repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/template.pom",
"repo-1/org/apache/maven/its/mng4353/maven-mng4353-plugin/0.1/maven-mng4353-plugin-0.1"
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
index 3f32db3..cb9e1c2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java
@@ -23,7 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -56,8 +55,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4355" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
index 92acf67..d324032 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java
@@ -23,7 +23,6 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -59,8 +58,7 @@
verifier.deleteDirectory( "mod-a/target" );
verifier.deleteDirectory( "mod-b/target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4357" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
index 9c45aad..bbcaa08 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
@@ -29,7 +29,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -138,8 +138,8 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4360" );
verifier.deleteDirectory( "target" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
index 219759b..87e815d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -59,9 +60,9 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.addCliArgument( "validate" );
@@ -70,7 +71,7 @@
assertNull( verifier.loadProperties( "target/checksum.properties" ).getProperty( "b-0.1-SNAPSHOT.jar" ) );
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
index c00bece..4bd2833 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4363" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "generate-sources" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
index a0e066a..f52eaea 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -57,10 +57,10 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4367" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@repourl@", filterProps.getProperty( "@baseurl@" ) + "/void" );
- filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/repo" );
- filterProps.setProperty( "@layouts@", "" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@repourl@", filterProps.get( "@baseurl@" ) + "/void" );
+ filterProps.put( "@mirrorurl@", filterProps.get( "@baseurl@" ) + "/repo" );
+ filterProps.put( "@layouts@", "" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings-a.xml" );
@@ -88,10 +88,10 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4367" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@repourl@", filterProps.getProperty( "@baseurl@" ) + "/void" );
- filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/repo" );
- filterProps.setProperty( "@layouts@", "default,legacy" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@repourl@", filterProps.get( "@baseurl@" ) + "/void" );
+ filterProps.put( "@mirrorurl@", filterProps.get( "@baseurl@" ) + "/repo" );
+ filterProps.put( "@layouts@", "default,legacy" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings-b.xml" );
@@ -119,10 +119,10 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4367" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@repourl@", filterProps.getProperty( "@baseurl@" ) + "/repo" );
- filterProps.setProperty( "@mirrorurl@", filterProps.getProperty( "@baseurl@" ) + "/void" );
- filterProps.setProperty( "@layouts@", "foo" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@repourl@", filterProps.get( "@baseurl@" ) + "/repo" );
+ filterProps.put( "@mirrorurl@", filterProps.get( "@baseurl@" ) + "/void" );
+ filterProps.put( "@layouts@", "foo" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings-c.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
index 5a1d395..5420777 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4379" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.setEnvironmentVariable( "MNG_4379_HOME", testDir.getAbsolutePath() );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
index 6c57d84..140f167 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java
@@ -55,7 +55,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4393" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
index 0572496..d26aa21 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java
@@ -55,7 +55,7 @@
Verifier verifier = newVerifier( new File( testDir, "settings" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4400" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
@@ -80,7 +80,7 @@
Verifier verifier = newVerifier( new File( testDir, "pom" ).getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4400" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
index 9a98d62..91db8fe 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4401" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
index 70f935b..2b03494 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java
@@ -60,7 +60,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4403" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
index 86d8043..44720c0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-Presolver" );
verifier.addCliArgument( "--offline" );
verifier.addCliArgument( "-s" );
@@ -92,7 +92,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4412" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-Pcollector" );
verifier.addCliArgument( "--offline" );
verifier.addCliArgument( "-s" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
index 59a2fda..a2048fc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -109,8 +109,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4413" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index 4627850..84f0490 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.eclipse.jetty.server.Connector;
@@ -137,9 +138,9 @@
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng4428" );
verifier.deleteDirectory( "target" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https" );
- filterProps.setProperty( "@port@", Integer.toString( ( (NetworkConnector) from ).getLocalPort() ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@protocol@", fromHttp ? "http" : "https" );
+ filterProps.put( "@port@", Integer.toString( ( (NetworkConnector) from ).getLocalPort() ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-X" );
verifier.addCliArgument( "--settings" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
index 08b9088..fccf456 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -58,9 +58,9 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.deleteDirectory( "target" );
@@ -71,7 +71,7 @@
verifier.verifyFilePresent( "target/old.txt" );
verifier.verifyFileNotPresent( "target/new.txt" );
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
index b04da2f..7872800 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java
@@ -84,7 +84,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4452" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
index 03f8d37..d44ed00 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java
@@ -59,7 +59,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4465" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.setLogFileName( "log1.txt" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
index 020c65d..4bd5de4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -64,9 +65,9 @@
*/
verifier.setForkJvm( true );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.deleteDirectory( "target" );
@@ -78,7 +79,7 @@
assertEquals( "old", props1.getProperty( "one" ) );
assertNull( props1.getProperty( "two" ) );
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
index fb8adb7..ab5ef0a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java
@@ -55,7 +55,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4488" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
index de60767..9c01527 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -109,8 +109,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4489" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
index 4705bdb..bb9acf6 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4498" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
index 7d2098f..8dc242c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
@@ -105,8 +105,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4500" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
index 3d7ee54..e3a5b3e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4522" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
try
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
index f2fe021..a6693d0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java
@@ -57,7 +57,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4526" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "generate-sources" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
index a11cd43..ad49422 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4553" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
index 728cd2e..5fbb9ec 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
@@ -30,7 +30,7 @@
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.utils.io.FileUtils;
import org.eclipse.jetty.server.NetworkConnector;
@@ -112,10 +112,10 @@
// expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm)
assertFalse( new File( verifier.getArtifactMetadataPath( "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" ) ).exists() );
}
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
NetworkConnector connector = (NetworkConnector) server.getConnectors()[0];
- filterProps.setProperty( "@port@", Integer.toString( connector.getLocalPort() ) );
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@port@", Integer.toString( connector.getLocalPort() ) );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
@@ -200,10 +200,10 @@
// expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm)
assertFalse( new File( verifier.getArtifactMetadataPath( "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" ) ).exists() );
}
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
NetworkConnector connector = (NetworkConnector) server.getConnectors()[0];
- filterProps.setProperty( "@port@", Integer.toString( connector.getLocalPort() ) );
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@port@", Integer.toString( connector.getLocalPort() ) );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-U" );
verifier.addCliArgument( "-s" );
@@ -291,10 +291,10 @@
// expected when running test on Windows using embedded Maven (JAR files locked by plugin class realm)
assertFalse( new File( verifier.getArtifactMetadataPath( "org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" ) ).exists() );
}
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
NetworkConnector connector = (NetworkConnector) server.getConnectors()[0];
- filterProps.setProperty( "@port@", Integer.toString( connector.getLocalPort() ) );
- filterProps.setProperty( "@repo@", "repo-it" );
+ filterProps.put( "@port@", Integer.toString( connector.getLocalPort() ) );
+ filterProps.put( "@repo@", "repo-it" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
index 74b7317..6f398b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java
@@ -28,7 +28,7 @@
import java.io.File;
import java.util.Deque;
-import java.util.Properties;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.eclipse.jetty.server.Handler;
@@ -99,8 +99,8 @@
}
int port = ( (NetworkConnector) server.getConnectors()[0] ).getLocalPort();
System.out.println( "Bound server socket to the port " + port );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--offline" );
verifier.addCliArgument( "--settings" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
index cb8142e..37dc1d2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -109,8 +109,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4561" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
index 00407ab..64d07e0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4586" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "mng4586:touch" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
index a84bd6e..e90cd52 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4590" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.setEnvironmentVariable( "MAVEN_OPTS", "-Dtest.file=pom.xml" );
verifier.addCliArgument( "-Dtest.dir=" + testDir.getAbsolutePath() );
verifier.addCliArgument( "--settings" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
index 0b76fab..0ea357a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java
@@ -82,7 +82,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4600" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
index 686b9f3..50abe6d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
@@ -56,7 +56,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4654" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
index 1efacbc..1e3c827 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
@@ -77,7 +77,7 @@
verifier.deleteArtifacts( "org.sonatype.sisu", "sisu-inject-plexus", "0.1-stub" );
verifier.deleteArtifacts( "org.sonatype.spice", "spice-inject-plexus", "0.1-stub" );
verifier.deleteArtifacts( "classworlds", "classworlds", "0.1-stub" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
index acc670a..9ed8d76 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -59,9 +59,9 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
- filterProps.setProperty( "@repo@", "repo-1" );
+ filterProps.put( "@repo@", "repo-1" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-1.txt" );
verifier.addCliArgument( "validate" );
@@ -71,7 +71,7 @@
assertChecksum( verifier, "jar", "2ea5c3d713bbaba7b87746449b91cd00e876703d" );
assertChecksum( verifier, "pom", "0b58dbbc61f81b85a70692ffdce88cf1892a8da4" );
- filterProps.setProperty( "@repo@", "repo-2" );
+ filterProps.put( "@repo@", "repo-2" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.setLogFileName( "log-force-2.txt" );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
index b9a86cd..a20d0ab 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java
@@ -102,7 +102,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4690" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
index 3bac1a9..d3040e0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java
@@ -60,7 +60,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4696" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
index e545f72..9050ecb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4720" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
index 73b2244..3be86f2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java
@@ -57,7 +57,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4721" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
index 0318282..caa49b7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.eclipse.jetty.security.ConstraintMapping;
@@ -109,8 +110,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4729" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
index 4dee697..d0e2cac 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -59,8 +60,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "always" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "always" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
writeMetadata( testDir, "1.0", "20100729123455" );
@@ -96,8 +97,8 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4745" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "never" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "never" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
writeMetadata( testDir, "1.0", "20100729123455" );
@@ -134,8 +135,8 @@
verifier.addCliArgument( "-U" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@updates@", "never" );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@updates@", "never" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
writeMetadata( testDir, "1.0", "20100729123455" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
index aa20701..50b0f13 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4750" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "initialize" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
index d63f967..87358a9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java
@@ -68,7 +68,7 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
index 3338c52..8ce3522 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java
@@ -61,7 +61,7 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4761" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
index 91f33ba..c1d2e55 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java
@@ -103,7 +103,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4768" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
index d3c1b96..ed12e3c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java
@@ -28,7 +28,7 @@
import java.io.File;
import java.util.Deque;
-import java.util.Properties;
+import java.util.Map;
import java.util.concurrent.ConcurrentLinkedDeque;
import org.eclipse.jetty.server.NetworkConnector;
@@ -96,8 +96,8 @@
System.out.println( "Bound server socket to the port " + port );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-U" );
verifier.addCliArgument( "-s" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
index a68bcee..a9a1290 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java
@@ -30,7 +30,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
@@ -97,8 +97,8 @@
System.out.println( "Bound server socket to the port " + port );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-U" );
verifier.addCliArgument( "-s" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
index 01cf4ec..ea2505f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4785" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
index fe1e3f1..0350c1a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java
@@ -59,7 +59,7 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
index 7bd2f2a..3abc133 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4791" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
index 826c65e..81fd14c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java
@@ -71,7 +71,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4800" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
index 81f341b..c8d8e07 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java
@@ -61,7 +61,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4814" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArguments( "validate",
"org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:aggregate-test" );
verifier.execute();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
index 024e340..2d22b51 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4829" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
index 8e18ad9..8778475 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4834" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
index 735867b..b572e40 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java
@@ -57,7 +57,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4840" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
try
{
verifier.addCliArgument( "validate" );
@@ -89,7 +89,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4840" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.mng4840:maven-mng4840-plugin:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
index 682a0d1..62c0bfb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java
@@ -60,7 +60,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4842" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -90,7 +90,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4842" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
index 1756076..e3e85c4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java
@@ -57,7 +57,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4883" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
try
{
verifier.addCliArgument( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
index 93e347f..2edde45 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4895" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
index 06cb0a7..26eb10d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java
@@ -59,7 +59,7 @@
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
verifier.addCliArgument( "-Dmng4913.version=98.76" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
index c70aa1d..02c3894 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4925" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
index d2f74a2..ffaee38 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java
@@ -23,7 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.jupiter.api.Test;
@@ -58,7 +58,7 @@
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4952" );
- Properties props = verifier.newDefaultFilterProperties();
+ Map<String, String> props = verifier.newDefaultFilterMap();
props.put( "@version@", "1.0" );
verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", props );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
index 2a029b9..a1df8e1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java
@@ -66,7 +66,7 @@
verifier.deleteDirectory( "target" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
index 6f1789c..24fbca5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4963" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
index 7af83ca..4522332 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java
@@ -60,7 +60,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4973" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
index 1abfc46..f8a4fe5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java
@@ -59,7 +59,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng4987" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
index 45740e3..7d3ce1b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java
@@ -25,7 +25,7 @@
import java.io.File;
import java.net.InetAddress;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -94,12 +94,12 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng4991" );
- Properties filterProps = verifier.newDefaultFilterProperties();
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
int port = ( (NetworkConnector) server.getConnectors()[0] ).getLocalPort();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ filterProps.put( "@port@", Integer.toString( port ) );
int proxyPort = ( (NetworkConnector) proxy.getConnectors()[0] ).getLocalPort();
- filterProps.setProperty( "@proxyPort@", Integer.toString( proxyPort ) );
- filterProps.setProperty( "@localhost@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
+ filterProps.put( "@proxyPort@", Integer.toString( proxyPort ) );
+ filterProps.put( "@localhost@", InetAddress.getLoopbackAddress().getCanonicalHostName() );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
index 33ec425..bfa0cf2 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java
@@ -61,7 +61,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng5006" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
index 5008539..9e8d215 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java
@@ -57,7 +57,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng5019" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
index acd7a90..4c60d9a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
@@ -107,8 +107,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5064" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "-nsu" );
verifier.addCliArgument( "-s" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
index c8e47c3..9bdc417 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java
@@ -60,7 +60,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng5096" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
index d64fbad..9f17c88 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java
@@ -58,7 +58,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng5135" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:aggregate-test" );
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index f401973..537e63e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
@@ -28,7 +28,8 @@
import java.io.File;
import java.io.IOException;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.NetworkConnector;
@@ -122,8 +123,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties filterProps = new Properties();
- filterProps.setProperty( "@port@", Integer.toString( port ) );
+ Map<String, String> filterProps = new HashMap<>();
+ filterProps.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
index 01d3313..cc8a4cc 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java
@@ -31,7 +31,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.Properties;
+import java.util.Map;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Request;
@@ -101,8 +101,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5280" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@httpserver.port@", Integer.toString( httpPort ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@httpserver.port@", Integer.toString( httpPort ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
@@ -138,8 +138,8 @@
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5280" );
- Properties filterProps = verifier.newDefaultFilterProperties();
- filterProps.setProperty( "@httpserver.port@", Integer.toString( httpPort ) );
+ Map<String, String> filterProps = verifier.newDefaultFilterMap();
+ filterProps.put( "@httpserver.port@", Integer.toString( httpPort ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
index 624a39c..da7315c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java
@@ -48,7 +48,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng5639" );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
index ef7f4d4..061ef7a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java
@@ -53,8 +53,8 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.mng5663" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8" );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "--settings" );
verifier.addCliArgument( "settings.xml" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 7f0b8cc..51d8199 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -23,6 +23,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
+import java.util.Map;
import java.util.Properties;
import org.junit.jupiter.api.Test;
@@ -57,8 +58,8 @@
new File( javaHome, "bin/javac.exe").createNewFile();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty( "@javaHome@", javaHome.getAbsolutePath() );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ properties.put( "@javaHome@", javaHome.getAbsolutePath() );
verifier.filterFile( "toolchains.xml", "toolchains.xml", "UTF-8", properties );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
index 739ab8d..b38260b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java
@@ -4,7 +4,7 @@
import org.apache.maven.shared.verifier.Verifier;
import java.io.File;
-import java.util.Properties;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -28,7 +28,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
@@ -47,7 +47,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "client-no-descriptor" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
@@ -79,8 +79,8 @@
server.start();
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- Properties properties = verifier.newDefaultFilterProperties();
- properties.setProperty("@port@", Integer.toString( server.port() ) );
+ Map<String, String> properties = verifier.newDefaultFilterMap();
+ properties.put("@port@", Integer.toString( server.port() ) );
String mirrorOf;
if ( matchesVersionRange( "[4.0.0-alpha-1,)" ) )
{
@@ -90,7 +90,7 @@
{
mirrorOf = "external:*";
}
- properties.setProperty("@mirrorOf@", mirrorOf );
+ properties.put("@mirrorOf@", mirrorOf );
verifier.filterFile( "settings-template-mirror-auth.xml", "settings.xml", "UTF-8", properties );
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
@@ -117,7 +117,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "client-properties" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
@@ -142,7 +142,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "client-config" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
index 7f9c9b3..7f8e636 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java
@@ -24,7 +24,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5774-configuration-processors" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "build-with-one-processor-valid" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
@@ -49,7 +49,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5774-configuration-processors" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "build-with-two-processors-invalid" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
index 0ed236c..fb52bd5 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java
@@ -47,7 +47,7 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6210-core-extensions-scopes" );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8" );
verifier = newVerifier( new File( testDir, "client" ).getAbsolutePath() );
verifier.deleteDirectory( "target" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
index 1264920..1d6a3ce 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
@@ -58,7 +58,7 @@
overrideGlobalSettings( testDir, verifier );
verifier.deleteArtifacts( "org.apache.maven.its.mng6772" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "validate" );
verifier.execute();
@@ -76,7 +76,7 @@
overrideGlobalSettings( testDir, verifier );
verifier.deleteArtifacts( "org.apache.maven.its.mng6772" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8" );
verifier.addCliArgument( "compile" );
verifier.execute();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
index d5961ea..3ff0a91 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java
@@ -53,7 +53,7 @@
verifier.addCliArgument("--settings");
verifier.addCliArgument("settings.xml");
- verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties());
+ verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8");
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
index a0715be..1f0cf8d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java
@@ -37,7 +37,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng7566" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
try
{
verifier.addCliArgument( "validate" );
@@ -69,7 +69,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng7566" );
verifier.addCliArgument( "-s" );
verifier.addCliArgument( "settings.xml" );
- verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8" );
verifier.addCliArgument( "org.apache.maven.its.mng7566:maven-mng7566-plugin:touch" );
verifier.execute();
verifier.verifyErrorFreeLog();
