Bug 475932 Merged eclipse.pde into eclipse.pde.ui repositoryHEADY20160526-1000Y20160519-1000Y20160513-1000Y20160505-1000Y20160428-1430Y20160428-1000Y20160421-1000Y20160414-1000Y20160407-1000Y20160331-1000Y20160324-1000Y20160317-0800Y20160310-0830Y20160310-0800R4_6master

This merges the master branch for eclipse.pde into eclipse.pde.ui to
simplify the maintenance of the pde feature. See
https://bugs.eclipse.org/bugs/show_bug.cgi?id=475932 for details. 

The URL for cloning the merged eclipse.pde repository (now integrated
into this repository) can be found via the Gerrit review server

https://git.eclipse.org/r/#/admin/projects/pde/eclipse.pde

For example:

git://git.eclipse.org/gitroot/pde/eclipse.pde


Change-Id: I475ad06c6f0cbb8ac1198f68a7de3ce654f47768
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

11 files changed, 10 insertions, 403 deletions

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0e41017
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+The content of this repo and the history of the master branch has been integrated into the eclipse.pde.ui repository. 
+
+See https://bugs.eclipse.org/bugs/show_bug.cgi?id=475932 for details. The new clone location can be found via: 
+
+https://git.eclipse.org/r/#/admin/projects/pde/eclipse.pde.ui 
+
+For example: git://git.eclipse.org/gitroot/pde/eclipse.pde.ui
+
+
+
diff --git a/org.eclipse.pde-feature/.project b/org.eclipse.pde-feature/.project
deleted file mode 100644
index fe6ac4e..0000000
--- a/org.eclipse.pde-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.pde-feature</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.FeatureBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.FeatureNature</nature>

-	</natures>

-</projectDescription>

diff --git a/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index c522e1f..0000000
--- a/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1

-line.separator=\n

diff --git a/org.eclipse.pde-feature/build.properties b/org.eclipse.pde-feature/build.properties
deleted file mode 100644
index 7e06f09..0000000
--- a/org.eclipse.pde-feature/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2012 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
-###############################################################################
-bin.includes=\
-feature.xml,\
-feature.properties
diff --git a/org.eclipse.pde-feature/feature.properties b/org.eclipse.pde-feature/feature.properties
deleted file mode 100644
index b58333f..0000000
--- a/org.eclipse.pde-feature/feature.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2014 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse Plug-in Development Environment
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse plug-in development environment.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2015 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/org.eclipse.pde-feature/feature.xml b/org.eclipse.pde-feature/feature.xml
deleted file mode 100644
index 0cb9f44..0000000
--- a/org.eclipse.pde-feature/feature.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde"
-      label="%featureName"
-      version="3.12.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jdt" version="3.12.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.pde"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.build"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.junit.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ui.templates"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.log"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm.tree"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.api.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ds.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ds.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ua.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ua.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.trace"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.ds.annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.pde-feature/forceQualifierUpdate.txt b/org.eclipse.pde-feature/forceQualifierUpdate.txt
deleted file mode 100644
index ee221ef..0000000
--- a/org.eclipse.pde-feature/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Bug 390930] [1.8] Update to ASM 5.x
-[Bug 428468] [1.8][compiler] Finishing touches for Java 8 release - Touching bundle to pick up new ASM version
-[Bug 430892] PDE feature needs to be "touched" (for I-build)
-[Bug 399749] update to Orbit M7 S-build URL
-[Bug 486479 ] pde feature needs to be 'touched'
diff --git a/org.eclipse.pde-feature/pom.xml b/org.eclipse.pde-feature/pom.xml
deleted file mode 100644
index 612485b..0000000
--- a/org.eclipse.pde-feature/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2014 Eclipse Foundation and others.
-  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>
-    <artifactId>eclipse.pde</artifactId>
-    <groupId>eclipse.pde</groupId>
-    <version>4.6.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.pde.feature</groupId>
-  <artifactId>org.eclipse.pde</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
-        <version>${tycho-extras.version}</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
-            <goals>
-              <goal>source-feature</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                  <plugin id="org.eclipse.pde"/>
-                  <plugin id="org.eclipse.pde.doc.user"/>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>attached-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties b/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index d8b7e6c..0000000
--- a/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2014 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse PDE Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse plug-in development environment, including documentation and source code zips.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2015 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index c79f998..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2015 Eclipse Foundation and others.
-  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>org.eclipse</groupId>
-    <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.6.0-SNAPSHOT</version>
-    <relativePath>../eclipse-platform-parent</relativePath>
-  </parent>
-
-  <groupId>eclipse.pde</groupId>
-  <artifactId>eclipse.pde</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/pde/eclipse.pde.git</tycho.scmUrl>
-  </properties>
-
-  <!-- 
-    To build individual bundles, we specify a repository where to find parent pom, 
-    in case it is not in local maven cache already
-    and that parent pom also has fuller individual-bundle profile 
-    defined that is combined with this one. --> 
-  <profiles>
-    <profile>
-      <id>build-individual-bundles</id>
-      <repositories>
-        <repository>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-          <id>eclipse-hosted</id>
-          <url>https://repo.eclipse.org/content/repositories/eclipse/</url>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-
-  <modules>
-    <module>org.eclipse.pde-feature</module>
-  </modules>
-
-</project>