Prepare post v1.1.0.201109151100-r builds Change-Id: I813dd6ae45c99476a6ce0379b866163ca42520ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 896ac86..a3da961 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="1.1.0.201109151100-r" + version="1.1.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit">
diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index c15b79c..be8b54f 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit-feature</artifactId>
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml index a0e0c4f..b7737f5 100644 --- a/org.eclipse.egit-updatesite/pom.xml +++ b/org.eclipse.egit-updatesite/pom.xml
@@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit-updatesite</artifactId>
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 8c5ec6b..9ddb866 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test Fragment-Host: org.eclipse.egit.core -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index 96bd30d..70b812a 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.test</artifactId>
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 6f3be32..328a040 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 63af301..08ef7c0 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml
@@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core</artifactId>
diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index e3f50f7..d10141c 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 334cbc0..9a90c0d 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId>
diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index c8845aa..8f6d87c 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.mylyn" label="%featureName" - version="1.1.0.201109151100-r" + version="1.1.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit"> @@ -24,7 +24,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="1.1.0.201109151100-r" match="greaterOrEqual"/> + <import feature="org.eclipse.egit" version="1.0.0" match="greaterOrEqual"/> <import feature="org.eclipse.mylyn.team_feature" version="3.5.0" match="greaterOrEqual"/> </requires> @@ -32,7 +32,7 @@ id="org.eclipse.egit.mylyn.ui" download-size="0" install-size="0" - version="1.1.0.201109151100-r" + version="0.0.0" unpack="false"/> </feature>
diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 78e3aaa..9e365ba 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn</artifactId>
diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF index cc55a52..be8d0c9 100644 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index 593ffc9..227d1d5 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId> @@ -92,17 +92,17 @@ <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.egit.mylyn.feature.group</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index 30642e0..df0de71 100644 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.team.core,
diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml index 14affe3..fec1950 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.mylyn.ui</artifactId>
diff --git a/org.eclipse.egit.psf-feature/feature.xml b/org.eclipse.egit.psf-feature/feature.xml index 122c5e1..41c3c10 100644 --- a/org.eclipse.egit.psf-feature/feature.xml +++ b/org.eclipse.egit.psf-feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.psf" label="%featureName" - version="1.1.0.201109151100-r" + version="1.1.0.qualifier" provider-name="%providerName"> <description>
diff --git a/org.eclipse.egit.psf-feature/pom.xml b/org.eclipse.egit.psf-feature/pom.xml index 4602ac0..9ed02e1 100644 --- a/org.eclipse.egit.psf-feature/pom.xml +++ b/org.eclipse.egit.psf-feature/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.psf</artifactId>
diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 4d12b7a..0ba9522 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.source" label="%featureName" - version="1.1.0.201109151100-r" + version="1.1.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit">
diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 670f94f..5e80423 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.source-feature</artifactId>
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index bf1f87c..f1230a9 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index cbbe36e..07c7b7a 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> @@ -92,12 +92,12 @@ <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.egit.feature.group</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0</version> </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.jgit.feature.group</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index 99735b7..c9afeb5 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %provider_name Bundle-Localization: plugin
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index 11d9960..509d850 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui</artifactId>
diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index ced8399..829b589 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit -Bundle-Version: 1.1.0.201109151100-r +Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 64d5aa6..6bff7c9 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml
@@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId>
diff --git a/pom.xml b/pom.xml index 3a16806..86afca5 100644 --- a/pom.xml +++ b/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>1.1.0.201109151100-r</version> + <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -62,7 +62,7 @@ </licenses> <properties> - <egit-version>${project.version}</egit-version> + <egit-version>1.1.0-SNAPSHOT</egit-version> <tycho-version>0.12.0</tycho-version> <mockito-version>1.8.4</mockito-version> <junit-version>4.8.1</junit-version>