Bug 406825 - consolidate master-x features into one.
Bug 432776 - move and simplify eclipse.platform.repository
diff --git a/features/master/.project b/features/master/.project
deleted file mode 100644
index a83ecf0..0000000
--- a/features/master/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>master</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/features/master/build.properties b/features/master/build.properties
deleted file mode 100644
index 22dd601..0000000
--- a/features/master/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#outputUpdateJars = true
diff --git a/features/master/feature.xml b/features/master/feature.xml
deleted file mode 100644
index 032e084..0000000
--- a/features/master/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="master"
- version="3.4.0.qualifier">
-
- <includes
- id="org.eclipse.equinox.p2.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.p2.discovery.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.core.runtime.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.osgi.compatibility.plugins.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.pde.api.tools.ee.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.sdk"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.sdk.examples"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.sdk.examples.source"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.releng.tools"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.equinox.executable"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jdt.core.compiler.batch"
- version="0.0.0" />
-
-</feature>
diff --git a/features/master/forceQualifierUpdate.txt b/features/master/forceQualifierUpdate.txt
deleted file mode 100644
index aede5b4..0000000
--- a/features/master/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
-Bug 406825 - consolidate master-x features into one. (temp work around)
\ No newline at end of file
diff --git a/features/master/pom.xml b/features/master/pom.xml
deleted file mode 100644
index af8821a..0000000
--- a/features/master/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012 Eclipse Foundation.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>eclipse.platform.releng</groupId>
- <artifactId>eclipse.platform.releng</artifactId>
- <version>4.4.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
- <groupId>org.eclipse.releng.feature</groupId>
- <artifactId>master</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/pom.xml b/pom.xml
index 85a5042..6efeb12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,6 @@
<module>bundles/org.eclipse.test.performance</module>
<module>bundles/org.eclipse.test.performance.win32</module>
- <module>features/master</module>
-
<module>features/org.eclipse.help-feature</module>
<module>features/org.eclipse.platform-feature</module>
<module>features/org.eclipse.rcp</module>
