Refactor the build
Add two features representing the fetch factory and releng
tools integration.
Change-Id: I4ff0b3c1f45182fb402e8c6067ae5adee210cade
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
diff --git a/org.eclipse.egit.pde-feature/.gitignore b/org.eclipse.egit.fetchfactory-feature/.gitignore
similarity index 100%
copy from org.eclipse.egit.pde-feature/.gitignore
copy to org.eclipse.egit.fetchfactory-feature/.gitignore
diff --git a/org.eclipse.egit.pde-feature/.project b/org.eclipse.egit.fetchfactory-feature/.project
similarity index 100%
copy from org.eclipse.egit.pde-feature/.project
copy to org.eclipse.egit.fetchfactory-feature/.project
diff --git a/org.eclipse.egit.pde-feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.fetchfactory-feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
copy from org.eclipse.egit.pde-feature/.settings/org.eclipse.core.resources.prefs
copy to org.eclipse.egit.fetchfactory-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.egit.pde-feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.fetchfactory-feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
copy from org.eclipse.egit.pde-feature/.settings/org.eclipse.core.runtime.prefs
copy to org.eclipse.egit.fetchfactory-feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.egit.pde-feature/build.properties b/org.eclipse.egit.fetchfactory-feature/build.properties
similarity index 100%
copy from org.eclipse.egit.pde-feature/build.properties
copy to org.eclipse.egit.fetchfactory-feature/build.properties
diff --git a/org.eclipse.egit.pde-feature/epl-v10.html b/org.eclipse.egit.fetchfactory-feature/epl-v10.html
similarity index 100%
copy from org.eclipse.egit.pde-feature/epl-v10.html
copy to org.eclipse.egit.fetchfactory-feature/epl-v10.html
diff --git a/org.eclipse.egit.pde-feature/feature.properties b/org.eclipse.egit.fetchfactory-feature/feature.properties
similarity index 98%
copy from org.eclipse.egit.pde-feature/feature.properties
copy to org.eclipse.egit.fetchfactory-feature/feature.properties
index 2157f5c..d03183d 100644
--- a/org.eclipse.egit.pde-feature/feature.properties
+++ b/org.eclipse.egit.fetchfactory-feature/feature.properties
@@ -6,14 +6,14 @@
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-featureName=Eclipse EGit PDE Support (Incubation)
+featureName=Git Fetch Factory for PDE Build (Incubation)
providerName=Eclipse EGit
updateSiteName=Eclipse Update Site (experimental)
# description property - text of the "Feature Descrption"
description=\
-Git support for PDE Build.\n
+Git fetch factory support for PDE Build.\n
################ end of description property ##################################
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/org.eclipse.egit.pde-feature/feature.xml b/org.eclipse.egit.fetchfactory-feature/feature.xml
similarity index 90%
rename from org.eclipse.egit.pde-feature/feature.xml
rename to org.eclipse.egit.fetchfactory-feature/feature.xml
index e73178a..0036f65 100644
--- a/org.eclipse.egit.pde-feature/feature.xml
+++ b/org.eclipse.egit.fetchfactory-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.egit.pde"
+ id="org.eclipse.egit.fetchfactory"
label="%featureName"
version="0.10.0.qualifier"
provider-name="%providerName">
@@ -18,8 +18,8 @@
</license>
<url>
- <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
- <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/egit/pde/updates"/>
+ <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/pde/updates"/>
</url>
<requires>
diff --git a/org.eclipse.egit.pde-feature/license.html b/org.eclipse.egit.fetchfactory-feature/license.html
similarity index 100%
copy from org.eclipse.egit.pde-feature/license.html
copy to org.eclipse.egit.fetchfactory-feature/license.html
diff --git a/org.eclipse.egit.pde-feature/pom.xml b/org.eclipse.egit.fetchfactory-feature/pom.xml
similarity index 92%
rename from org.eclipse.egit.pde-feature/pom.xml
rename to org.eclipse.egit.fetchfactory-feature/pom.xml
index c356906..479484b 100644
--- a/org.eclipse.egit.pde-feature/pom.xml
+++ b/org.eclipse.egit.fetchfactory-feature/pom.xml
@@ -19,7 +19,7 @@
<version>0.10.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.egit-feature</artifactId>
+ <artifactId>org.eclipse.egit.fetchfactory-feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>Git Fetch Factory for PDE Build Feature (Incubation)</name>
diff --git a/org.eclipse.egit.pde-updatesite/pom.xml b/org.eclipse.egit.pde-updatesite/pom.xml
index f2c00f7..4f4d72e 100644
--- a/org.eclipse.egit.pde-updatesite/pom.xml
+++ b/org.eclipse.egit.pde-updatesite/pom.xml
@@ -22,7 +22,7 @@
<artifactId>org.eclipse.egit.pde-updatesite</artifactId>
<packaging>eclipse-update-site</packaging>
- <name>Git Support for PDE Build Update Site (Incubation)</name>
+ <name>EGit PDE Tools Update Site (Incubation)</name>
<!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
<version>0.10.0-SNAPSHOT</version>
diff --git a/org.eclipse.egit.pde-updatesite/site.xml b/org.eclipse.egit.pde-updatesite/site.xml
index a135040..b944dfa 100644
--- a/org.eclipse.egit.pde-updatesite/site.xml
+++ b/org.eclipse.egit.pde-updatesite/site.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <description url="Eclipse Git Plugin">
- Git support for PDE Build.
+ <description url="EGit PDE Tools">
+ EGit PDE Tools
</description>
- <feature url="features/org.eclipse.egit.pde_0.0.0.qualifier.jar" id="org.eclipse.egit.pde" version="0.0.0" patch="false">
+ <feature url="features/org.eclipse.egit.fetchfactory_0.0.0.qualifier.jar" id="org.eclipse.egit.fetchfactory" version="0.0.0" patch="false">
<category name="Git Fetch Factory for PDE Build (Incubation)"/>
</feature>
- <category-def name="Git Fetch Factory for PDE Build (Incubation)" label="Git Fetch Factory for PDE Build (Incubation)">
+ <feature url="features/org.eclipse.egit.relengtools_0.0.0.qualifier.jar" id="org.eclipse.egit.relengtools" version="0.0.0" patch="false">
+ <category name="EGit Releng Tools Integration (Incubation)"/>
+ </feature>
+ <category-def name="EGit PDE Tools (Incubation)" label="EGit PDE Tools (Incubation)">
<description>
- Git Fetch Factory for PDE Build (Incubation)
+ A Git Fetch Factory for PDE Build and Releng Tools integration.
</description>
</category-def>
</site>
diff --git a/org.eclipse.egit.pde-feature/.gitignore b/org.eclipse.egit.relengtools-feature/.gitignore
similarity index 100%
rename from org.eclipse.egit.pde-feature/.gitignore
rename to org.eclipse.egit.relengtools-feature/.gitignore
diff --git a/org.eclipse.egit.pde-feature/.project b/org.eclipse.egit.relengtools-feature/.project
similarity index 100%
rename from org.eclipse.egit.pde-feature/.project
rename to org.eclipse.egit.relengtools-feature/.project
diff --git a/org.eclipse.egit.pde-feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.relengtools-feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.egit.pde-feature/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.egit.relengtools-feature/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.egit.pde-feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.relengtools-feature/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.egit.pde-feature/.settings/org.eclipse.core.runtime.prefs
rename to org.eclipse.egit.relengtools-feature/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.egit.pde-feature/build.properties b/org.eclipse.egit.relengtools-feature/build.properties
similarity index 100%
rename from org.eclipse.egit.pde-feature/build.properties
rename to org.eclipse.egit.relengtools-feature/build.properties
diff --git a/org.eclipse.egit.pde-feature/epl-v10.html b/org.eclipse.egit.relengtools-feature/epl-v10.html
similarity index 100%
rename from org.eclipse.egit.pde-feature/epl-v10.html
rename to org.eclipse.egit.relengtools-feature/epl-v10.html
diff --git a/org.eclipse.egit.pde-feature/feature.properties b/org.eclipse.egit.relengtools-feature/feature.properties
similarity index 98%
rename from org.eclipse.egit.pde-feature/feature.properties
rename to org.eclipse.egit.relengtools-feature/feature.properties
index 2157f5c..42c2fe7 100644
--- a/org.eclipse.egit.pde-feature/feature.properties
+++ b/org.eclipse.egit.relengtools-feature/feature.properties
@@ -6,14 +6,14 @@
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-featureName=Eclipse EGit PDE Support (Incubation)
+featureName=EGit Releng Tools Integration (Incubation)
providerName=Eclipse EGit
updateSiteName=Eclipse Update Site (experimental)
# description property - text of the "Feature Descrption"
description=\
-Git support for PDE Build.\n
+Eclipse release engineering tools integration for Git.\n
################ end of description property ##################################
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/org.eclipse.egit.pde-feature/feature.xml b/org.eclipse.egit.relengtools-feature/feature.xml
similarity index 86%
copy from org.eclipse.egit.pde-feature/feature.xml
copy to org.eclipse.egit.relengtools-feature/feature.xml
index e73178a..7fa103d 100644
--- a/org.eclipse.egit.pde-feature/feature.xml
+++ b/org.eclipse.egit.relengtools-feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.egit.pde"
+ id="org.eclipse.egit.relengtools"
label="%featureName"
version="0.10.0.qualifier"
provider-name="%providerName">
@@ -18,8 +18,8 @@
</license>
<url>
- <update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
- <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/egit/pde/updates"/>
+ <discovery label="%updateSiteName" url="http://download.eclipse.org/egit/pde/updates"/>
</url>
<requires>
@@ -29,7 +29,7 @@
</requires>
<plugin
- id="org.eclipse.egit.fetchfactory"
+ id="org.eclipse.egit.relengtools"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.egit.pde-feature/license.html b/org.eclipse.egit.relengtools-feature/license.html
similarity index 100%
rename from org.eclipse.egit.pde-feature/license.html
rename to org.eclipse.egit.relengtools-feature/license.html
diff --git a/org.eclipse.egit.pde-feature/pom.xml b/org.eclipse.egit.relengtools-feature/pom.xml
similarity index 85%
copy from org.eclipse.egit.pde-feature/pom.xml
copy to org.eclipse.egit.relengtools-feature/pom.xml
index c356906..e87671c 100644
--- a/org.eclipse.egit.pde-feature/pom.xml
+++ b/org.eclipse.egit.relengtools-feature/pom.xml
@@ -19,9 +19,9 @@
<version>0.10.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.egit-feature</artifactId>
+ <artifactId>org.eclipse.egit.relengtools-feature</artifactId>
<packaging>eclipse-feature</packaging>
- <name>Git Fetch Factory for PDE Build Feature (Incubation)</name>
+ <name>EGit Releng Tools Integration Feature (Incubation)</name>
</project>
diff --git a/org.eclipse.egit.relengtools/META-INF/MANIFEST.MF b/org.eclipse.egit.relengtools/META-INF/MANIFEST.MF
index ba21a58..cb6abed 100644
--- a/org.eclipse.egit.relengtools/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.relengtools/META-INF/MANIFEST.MF
@@ -3,13 +3,15 @@
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.egit.relengtools;singleton:=true
Bundle-Version: 0.10.0.qualifier
-Require-Bundle: org.eclipse.releng.tools;bundle-version="3.6.0",
+Require-Bundle: org.eclipse.releng.tools;bundle-version="[3.3.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="3.6.0",
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.team.core;bundle-version="[3.5.100,4.0.0)",
org.eclipse.team.ui;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.core.resources;bundle-version="3.6.0"
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.egit.core;bundle-version="0.10.0",
+ org.eclipse.jgit;bundle-version="0.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.eclipse.egit.relengtools.internal;x-internal:=true
diff --git a/org.eclipse.egit.relengtools/OSGI-INF/l10n/bundle.properties b/org.eclipse.egit.relengtools/OSGI-INF/l10n/bundle.properties
index 45a5514..251836e 100644
--- a/org.eclipse.egit.relengtools/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.egit.relengtools/OSGI-INF/l10n/bundle.properties
@@ -11,4 +11,4 @@
###############################################################################
#Properties file for org.eclipse.egit.relengtools
Bundle-Vendor = Eclipse EGit
-Bundle-Name = Git RelEng Integration (Incubation)
\ No newline at end of file
+Bundle-Name = EGit Releng Tools Integration (Incubation)
diff --git a/org.eclipse.egit.relengtools/pom.xml b/org.eclipse.egit.relengtools/pom.xml
index e996e36..94bc2eb 100644
--- a/org.eclipse.egit.relengtools/pom.xml
+++ b/org.eclipse.egit.relengtools/pom.xml
@@ -25,7 +25,7 @@
<artifactId>org.eclipse.egit.relengtools</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>EGit RelEng Integration (Incubation)</name>
+ <name>EGit Releng Tools Integration (Incubation)</name>
<!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
<build>
diff --git a/pom.xml b/pom.xml
index 8d6b4b2..3f44dc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,9 @@
<tycho-version>0.10.0</tycho-version>
<platform-version-name>helios</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
+ <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/target/site</jgit-site>
+ <egit-site>file:/${basedir}/../../egit/org.eclipse.egit-updatesite/target/site</egit-site>
+ <relengtools-site>http://download.eclipse.org/eclipse/updates/3.6</relengtools-site>
</properties>
<profiles>
@@ -76,8 +79,10 @@
<modules>
<module>org.eclipse.egit.fetchfactory</module>
+ <module>org.eclipse.egit.relengtools</module>
- <module>org.eclipse.egit.pde-feature</module>
+ <module>org.eclipse.egit.fetchfactory-feature</module>
+ <module>org.eclipse.egit.relengtools-feature</module>
<module>org.eclipse.egit.pde-updatesite</module>
</modules>
@@ -87,6 +92,21 @@
<layout>p2</layout>
<url>${eclipse-site}</url>
</repository>
+ <repository>
+ <id>jgit</id>
+ <layout>p2</layout>
+ <url>${jgit-site}</url>
+ </repository>
+ <repository>
+ <id>egit</id>
+ <layout>p2</layout>
+ <url>${egit-site}</url>
+ </repository>
+ <repository>
+ <id>relengtools</id>
+ <layout>p2</layout>
+ <url>${relengtools-site}</url>
+ </repository>
</repositories>
<pluginRepositories>
