Method createVerifier no longer sets the mirrors

The system properties containing the mirror URLs are no longer set in
the createVerifier(String, String) method but in the tests themselves.

In addition, the createVerifier(String, String) method has been slightly
simplified by using the setSystemProperty method.

tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedP2RepositoryTest.java

@@ -13,7 +13,6 @@
 package org.eclipse.tycho.test.target;
 
 import java.io.File;
-import java.util.Properties;
 
 import org.apache.maven.it.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
@@ -54,17 +53,29 @@ public void stopServer() throws Exception {
 		server.stop();
 	}
 
+	/**
+	 * Tries to access a p2 repository over an authenticated mirror.
+	 * 
+	 * @throws Exception
+	 */
 	@Test
 	public void testAuthMirror() throws Exception {
 		Verifier verifier = createVerifier("settings-auth-mirror.xml");
+		verifier.setSystemProperty("p2.authMirror", p2AuthMirrorUrl);
 		verifier.addCliOption("-P=repository");
 		verifier.executeGoal("package");
 		verifier.verifyErrorFreeLog();
 	}
 
+	/**
+	 * Tries to access a p2 repository over a mirror with no authentication.
+	 * 
+	 * @throws Exception
+	 */
 	@Test
 	public void testMirror() throws Exception {
 		Verifier verifier = createVerifier("settings-mirror.xml");
+		verifier.setSystemProperty("p2.mirror", p2MirrorUrl);
 		verifier.addCliOption("-P=repository");
 		verifier.executeGoal("package");
 		verifier.verifyErrorFreeLog();
@@ -96,21 +107,35 @@ public void testTargetDefinition() throws Exception {
 		verifier.verifyErrorFreeLog();
 	}
 
+	/**
+	 * Tries to resolve a target definition from a p2 repository accessed over a
+	 * mirror with no authentication.
+	 * 
+	 * @throws Exception
+	 */
 	@Test
 	public void testTargetDefinitionMirror() throws Exception {
 		Verifier verifier = createVerifier("settings-mirror.xml");
 		File platformFile = new File(verifier.getBasedir(), "platform.target");
 		TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl);
+		verifier.setSystemProperty("p2.mirror", p2MirrorUrl);
 		verifier.addCliOption("-P=target-definition");
 		verifier.executeGoal("package");
 		verifier.verifyErrorFreeLog();
 	}
 
+	/**
+	 * Tries to resolve a target definition from a p2 repository accessed over an
+	 * authenticated mirror.
+	 * 
+	 * @throws Exception
+	 */
 	@Test
 	public void testTargetDefinitionAuthMirror() throws Exception {
 		Verifier verifier = createVerifier("settings-auth-mirror.xml");
 		File platformFile = new File(verifier.getBasedir(), "platform.target");
 		TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl);
+		verifier.setSystemProperty("p2.authMirror", p2AuthMirrorUrl);
 		verifier.addCliOption("-P=target-definition");
 		verifier.executeGoal("package");
 		verifier.verifyErrorFreeLog();
@@ -133,14 +158,11 @@ private Verifier createVerifier(String settingsFile) throws Exception {
 	private Verifier createVerifier(String settingsFile, String settingsSecurityFile) throws Exception {
 		Verifier verifier = getVerifier("target.httpAuthentication", false,
 				new File("projects/target.httpAuthentication/" + settingsFile));
-		Properties systemProperties = verifier.getSystemProperties();
-		systemProperties.setProperty("p2.repo", p2RepoUrl);
-		systemProperties.setProperty("p2.mirror", p2MirrorUrl);
-		systemProperties.setProperty("p2.authMirror", p2AuthMirrorUrl);
+		verifier.setSystemProperty("p2.repo", p2RepoUrl);
 		if (settingsSecurityFile != null) {
 			// see
 			// org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher#SYSTEM_PROPERTY_SEC_LOCATION
-			systemProperties.setProperty("settings.security",
+			verifier.setSystemProperty("settings.security",
 					new File("projects/target.httpAuthentication/" + settingsSecurityFile).getAbsolutePath());
 		}
 		return verifier;