Revert "Make Tycho's compiler use configuration from .settings/org.eclipse.jdt.core.prefs"

This reverts commit 678bfa1aad9cf5fbe6a488d168763288acabb501.

Change-Id: Ia1ec726e051392b3fefa753b6def2d937f68523e

22 files changed, 36 insertions, 28 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index 547bb438c..d9577806b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -54,7 +54,6 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin,
  org.eclipse.equinox.p2.transport.ecf;bundle-version="1.0.0",
  org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
  org.eclipse.equinox.p2.operations;bundle-version="2.1.0",
- org.eclipse.equinox.p2.metadata,
  org.eclipse.equinox.p2.ui.sdk.scheduler
 Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java
index 15850a309..286ae7fcb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java
@@ -18,7 +18,7 @@ import org.junit.rules.TemporaryFolder;
 import org.osgi.framework.*;
 
 /**
- * Provides {@link IProvisioningAgent} instances for tests. Use as JUnit 4 {@link org.junit.Rule}.
+ * Provides {@link IProvisioningAgent} instances for tests. Use as JUnit 4 {@link Rule}.
  */
 public final class TestAgentProvider extends ExternalResource {
 	private final TemporaryFolder tempManager;
@@ -43,7 +43,7 @@ public final class TestAgentProvider extends ExternalResource {
 
 	/**
 	 * Returns an instance of an {@link IProvisioningAgent}. If this class is used as a JUnit method
-	 * {@link org.junit.Rule}, a separate instance is returned per test method.
+	 * {@link Rule}, a separate instance is returned per test method.
 	 */
 	public IProvisioningAgent getAgent() throws ProvisionException {
 		if (agent == null) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
index 56e0e3e23..54b5a56e0 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
@@ -110,7 +110,7 @@ public class TestMetadataRepository extends AbstractMetadataRepository {
 	}
 
 	/**
-	 * Returns a collection of {@link org.eclipse.equinox.p2.repository.spi.RepositoryReference}.
+	 * Returns a collection of {@link RepositoryReference}.
 	 */
 	public Collection<IRepositoryReference> getReferences() {
 		return repositories;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
index 937d654d2..34045a785 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
@@ -170,7 +170,7 @@ public class ArtifactRepositoryManagerTest extends AbstractProvisioningTest {
 	}
 
 	/**
-	 * Tests for {@link org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager#refreshRepository(URI, org.eclipse.core.runtime.IProgressMonitor)}.
+	 * Tests for {@link IMetadataRepositoryManager#refreshRepository(URI, org.eclipse.core.runtime.IProgressMonitor)}.
 	 */
 	public void testRefresh() throws ProvisionException {
 		File site = getTestData("Repositoy", "/testData/artifactRepo/simple/");
@@ -265,7 +265,7 @@ public class ArtifactRepositoryManagerTest extends AbstractProvisioningTest {
 	}
 
 	/**
-	 * Tests for {@link IRepositoryManager#contains(URI)}.
+	 * Tests for {@link IRepositoryManager#contains(URI).
 	 */
 	public void testContains() {
 		File site = getTestData("Repositoy", "/testData/artifactRepo/simple/");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug351944.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug351944.java
index f097023cc..a511fc0d1 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug351944.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/Bug351944.java
@@ -87,6 +87,7 @@ public class Bug351944 extends AbstractProvisioningTest {
 	 * copy from {@link org.eclipse.equinox.internal.p2.engine.DownloadManager}
 	 * @param repository
 	 * @param requestsToProcess
+	 * @return
 	 */
 	private IArtifactRequest[] getRequestsForRepository(IArtifactRepository repository, IArtifactRequest[] requestsToProcess) {
 		ArrayList<IArtifactRequest> applicable = new ArrayList<IArtifactRequest>();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java
index 6ccc40b90..061b90caf 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java
@@ -29,7 +29,7 @@ import org.eclipse.equinox.p2.query.IQueryResult;
  * This class may be subclassed by clients. Subclasses should specify the type
  * of object they support querying on. Subclasses are also encouraged to clearly
  * specify their match algorithm, and expose the parameters involved in the match
- * computation, to allow {@link org.eclipse.equinox.p2.query.IQueryable} implementations to optimize their
+ * computation, to allow {@link IQueryable} implementations to optimize their
  * execution of the query. <P>
  * 
  * @since 2.0
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java
index 9237ec9eb..691fb6026 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.core;
 
+import org.eclipse.equinox.p2.query.MatchQuery;
+
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
@@ -17,7 +19,7 @@ import org.eclipse.equinox.p2.query.*;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
 /**
- * Tests for the {@link QueryUtil} class.
+ * Tests for the {@link org.eclipse.equinox.internal.provisional.p2.query.Query} class.
  */
 public class QueryTest extends TestCase {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/URLUtilTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/URLUtilTest.java
index a351b1fa2..4b042e033 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/URLUtilTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/URLUtilTest.java
@@ -58,7 +58,7 @@ public class URLUtilTest extends AbstractProvisioningTest {
 	}
 
 	/**
-	 * Tests for {@link URLUtil#toFile(URL)}.
+	 * Tests for {@link URLUtil#toURI(URL)}.
 	 */
 	public void testToFileFromLocalURL() throws Exception {
 		File original = new File(System.getProperty("java.io.tmpdir"), "repo");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java
index 036875c97..b8c6a8a94 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/DirectorApplicationTest.java
@@ -33,7 +33,7 @@ import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 import org.eclipse.equinox.p2.tests.StringBufferStream;
 
 /**
- * Various automated tests of the {@link org.eclipse.equinox.internal.provisional.p2.director.IDirector} API.
+ * Various automated tests of the {@link IDirector} API.
  */
 public class DirectorApplicationTest extends AbstractProvisioningTest {
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java
index 47280f5ea..82619e362 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java
@@ -10,8 +10,9 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests.director;
 
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.internal.p2.director.ProfileChangeRequest;
+
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.internal.provisional.p2.director.IDirector;
 import org.eclipse.equinox.p2.engine.*;
 import org.eclipse.equinox.p2.metadata.*;
@@ -19,7 +20,7 @@ import org.eclipse.equinox.p2.planner.IPlanner;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
 /**
- * Tests {@link IPlanner#getProvisioningPlan(org.eclipse.equinox.p2.planner.IProfileChangeRequest, ProvisioningContext, org.eclipse.core.runtime.IProgressMonitor)}
+ * Tests {@link IPlanner#getProvisioningPlan(ProfileChangeRequest, ProvisioningContext, org.eclipse.core.runtime.IProgressMonitor)}
  * involving replacing an IU with a different version.
  */
 public class ReplacePlanTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/SimpleFileLockerApp.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/SimpleFileLockerApp.java
index 75e4b3eda..8eba5c11d 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/SimpleFileLockerApp.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/SimpleFileLockerApp.java
@@ -15,8 +15,7 @@ import java.nio.channels.FileLock;
 
 /**
  * 
- * This is a tiny console app used by {@link ProfileRegistryTest#testProfileLockingNested()}
- * and {@link ProfileRegistryTest#testProfileLockingInProcessMultiThreads()},
+ * This is a tiny console app used by {@link ProfileRegistryTest#testProfileLocking()},
  * to simulate an external locking mechanism that is triggered as a new process. This
  * code is invoked via the jar file kept in testData/engineTest/SimpleFileLockerApp.jar,
  * which is generated by exporting this single class as a JAR.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/InstallableUnitTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/InstallableUnitTest.java
index bc70db2fa..cbe4a99bb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/InstallableUnitTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/InstallableUnitTest.java
@@ -14,11 +14,11 @@ import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
 
 /**
- * Black box tests for API of {@link IInstallableUnit}.
+ * Black box tests for API of {@link org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit}.
  */
 public class InstallableUnitTest extends AbstractProvisioningTest {
 	/**
-	 * Tests for {@link IInstallableUnit#satisfies(IRequirement)}.
+	 * Tests for {@link org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit#satisfies(org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability)}.
 	 */
 	public void testSatisfies() {
 		IProvidedCapability[] provides = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("testNamespace", "name", Version.createOSGi(1, 0, 0))};
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java
index ab7b5601c..425c5e1ad 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/BatchExecuteMetadataRepositoryTest.java
@@ -223,6 +223,11 @@ public class BatchExecuteMetadataRepositoryTest extends AbstractProvisioningTest
 	class FailingSimpleMetadataRepository extends LocalMetadataRepository {
 		boolean executeBatch = false;
 
+		/**
+		 * @param repositoryName
+		 * @param location
+		 * @param properties
+		 */
 		public FailingSimpleMetadataRepository() {
 			super(getAgent());
 		}
@@ -282,6 +287,11 @@ public class BatchExecuteMetadataRepositoryTest extends AbstractProvisioningTest
 		boolean executeBatch = false;
 		public boolean didSave = false;
 
+		/**
+		 * @param repositoryName
+		 * @param location
+		 * @param properties
+		 */
 		public TrackSavignSimpleMetadataRepository() {
 			super(getAgent());
 		}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
index 835630293..50c689d58 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java
@@ -174,6 +174,7 @@ public class LocalMetadataRepositoryTest extends AbstractProvisioningTest {
 
 	/**
 	 * Tests loading a repository that has a reference to itself as a disabled repository.
+	 * @throws MalformedURLException 
 	 * @throws ProvisionException 
 	 */
 	public void testLoadSelfReference() throws ProvisionException {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
index 2bf9e8e92..a316f8e49 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
@@ -78,7 +78,7 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest {
 	}
 
 	/**
-	 * Tests for {@link IRepositoryManager#contains(URI)}.
+	 * Tests for {@link IRepositoryManager#contains(URI).
 	 */
 	public void testContains() {
 		File site = getTestData("Repositoy", "/testData/metadataRepo/good/");
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
index 17d239f47..d89002c79 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/MetadataMirrorApplicationTest.java
@@ -157,6 +157,7 @@ public class MetadataMirrorApplicationTest extends AbstractProvisioningTest {
 
 	/**
 	 * Tests mirroring all metadata in a repository to a repository populated with exact duplicate data
+	 * @throws Exception
 	 * Source contains A, B
 	 * Target contains A, B
 	 */
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
index 5d7bc1ec2..863c329f5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/mirror/NewMirrorApplicationMetadataTest.java
@@ -187,6 +187,7 @@ public class NewMirrorApplicationMetadataTest extends AbstractProvisioningTest {
 
 	/**
 	 * Tests mirroring all metadata in a repository to a repository populated with exact duplicate data
+	 * @throws Exception
 	 * Source contains A, B
 	 * Target contains A, B
 	 */
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java
index 9da866754..634c8bd10 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java
@@ -93,6 +93,7 @@ public class VersionTesting extends TestCase {
 
 	/**
 	 * Asserts serialization of a VersionRange instance.
+	 * @param v
 	 */
 	public static void assertSerialized(VersionRange range) {
 		VersionRange serialized = getSerialized(range);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java
index f17789225..0919e18a3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java
@@ -184,7 +184,7 @@ public class ProductFileAdviceTest extends AbstractProvisioningTest {
 	}
 
 	/**
-	 * Test method for {@link org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice#getIcons()}.
+	 * Test method for {@link org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice#getIcons(java.lang.String)}.
 	 */
 	public void testGetIcons() {
 		String[] icons = productFileAdviceWin32.getIcons();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java
index 1884b3ff5..7c0c36402 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java
@@ -65,7 +65,7 @@ public class ProductFileTest extends TestCase {
 	}
 
 	/**
-	 * Test method for {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getConfigurationProperties()}.
+	 * Test method for {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getProperties()}.
 	 */
 	public void testGetConfigurationProperties() {
 		Map<String, String> properties = productFile.getConfigurationProperties();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerSuite.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerSuite.java
index 411822e66..7d3571122 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerSuite.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerSuite.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
  *      &nbsp;&nbsp;&nbsp;&nbsp;return suite;<br/>
  *  }<br/>
  * </code>
- * The tests in the suite should call {@link TestServerController} to make sure the server is
+ * The tests in the suite should call {@link TestServerLauncher} to make sure the server is
  * running either started by this suite, or directly when test is run individually. This is
  * handled by the class {@link AbstractTestServerClientCase} which serves as the base for
  * tests requiring access to a running server.
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 4eb6012aa..2f1ddd161 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -106,14 +106,6 @@
             </lifecycleMappingMetadata>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-compiler-plugin</artifactId>
-          <configuration>
-            <useProjectSettings>true</useProjectSettings>
-          </configuration>
-          <inherited>true</inherited>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>