From f58519649507bbc1ec9ec32e71fbce13c53f9f81 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 19 Jan 2015 16:14:45 +0100 Subject: Scalability: don't run incremental update if there are too many changes Always check if the number of changed files exceeds the magic limit for incremental index updates. In case of huge repositories with lot of ignored files (> 65000) the incremental merge of ignored lists can be highly inefficient if the number of changed files is higher then 2000. Added tests for job scheduling to make sure reload and update are used as expected. Bug: 452237 Change-Id: I6cb733ae24a1eec33becb3aff0f96da151365a41 Signed-off-by: Andrey Loskutov --- .../indexdiff/IndexDiffCacheEntryTest.java | 258 +++++++++++++++++++++ .../core/internal/indexdiff/IndexDiffDataTest.java | 88 +++++++ 2 files changed, 346 insertions(+) create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffDataTest.java (limited to 'org.eclipse.egit.core.test') diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java new file mode 100644 index 0000000000..650abf5d0e --- /dev/null +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheEntryTest.java @@ -0,0 +1,258 @@ +/******************************************************************************* + * Copyright (C) 2015 Andrey Loskutov 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 + *******************************************************************************/ +package org.eclipse.egit.core.internal.indexdiff; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.jobs.IJobManager; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.egit.core.Activator; +import org.eclipse.egit.core.JobFamilies; +import org.eclipse.egit.core.test.GitTestCase; +import org.eclipse.egit.core.test.TestRepository; +import org.eclipse.jgit.lib.Repository; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class IndexDiffCacheEntryTest extends GitTestCase { + + // trigger reload if more than one file is changed + private static final int MAX_FILES_FOR_UPDATE = 1; + + private static final int MAX_WAIT_TIME = 10 * 1000; + + + private TestRepository testRepository; + + private Repository repository; + + private IndexDiffCacheEntry2 entry; + + @Test + public void basicTest() throws Exception { + prepareCacheEntry(); + + entry.refresh(); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // on refresh, full reload is triggered + assertTrue(entry.reloadScheduled); + assertFalse(entry.updateScheduled); + cleanEntryFlags(); + + entry.refreshFiles(Arrays.asList("a")); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // one single file: no reload + assertFalse(entry.reloadScheduled); + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + entry.refreshFiles(Arrays.asList("a", "b")); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // two files: update is triggered, but decides to run full reload + assertTrue(entry.reloadScheduled); + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + entry.getUpdateJob().addChanges(Arrays.asList("a", "b"), + Collections. emptyList()); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // two files: update is not triggered (we call through the job directly) + // but this calls full reload + assertTrue(entry.reloadScheduled); + assertFalse(entry.updateScheduled); + cleanEntryFlags(); + } + + @Test + public void testReloadAndUpdate() throws Exception { + prepareCacheEntry(); + + testRepository.connect(project.project); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // on a simple connect, nothing should be called + assertFalse(entry.reloadScheduled); + assertFalse(entry.updateScheduled); + cleanEntryFlags(); + + // adds .project and .classpath files: more than limit of 1, + // so update redirects to reload + testRepository.addToIndex(project.project); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + assertTrue(entry.reloadScheduled); + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + testRepository.createInitialCommit("first commit\n"); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // RefsChangedEvent causes always full update + assertTrue(entry.reloadScheduled); + // single "dummy" file from commit + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + public void run(IProgressMonitor monitor) throws CoreException { + try { + project.createFile("bla", "bla\n".getBytes("UTF-8")); + project.createFile("blup", "blup\n".getBytes("UTF-8")); + } catch (Exception e) { + throw new CoreException(Activator.error("Failure", e)); + } + + } + }, null); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // adds 2 files: more than limit of 1, + // so update redirects to reload + assertTrue(entry.reloadScheduled); + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + public void run(IProgressMonitor monitor) throws CoreException { + try { + project.createFile("blip", "blip\n".getBytes("UTF-8")); + } catch (Exception e) { + throw new CoreException(Activator.error("Failure", e)); + } + + } + }, null); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // adds 1 file: less than limit of 1, so no reload + assertFalse(entry.reloadScheduled); + assertTrue(entry.updateScheduled); + cleanEntryFlags(); + + ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + public void run(IProgressMonitor monitor) throws CoreException { + try { + project.createFile(".gitignore", "\n".getBytes("UTF-8")); + } catch (Exception e) { + throw new CoreException(Activator.error("Failure", e)); + } + + } + }, null); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // adds .gitignore file: always full reload + assertTrue(entry.reloadScheduled); + assertFalse(entry.updateScheduled); + cleanEntryFlags(); + } + + /** + * Waits at least 50 milliseconds until no jobs of given family are running + * + * @param maxWaitTime + * @param family + * @throws InterruptedException + */ + private void waitForJobs(long maxWaitTime, Object family) + throws InterruptedException { + Thread.sleep(50); + long start = System.currentTimeMillis(); + IJobManager jobManager = Job.getJobManager(); + + Job[] jobs = jobManager.find(family); + while (jobs.length > 0) { + Thread.sleep(100); + jobs = jobManager.find(family); + if (System.currentTimeMillis() - start > maxWaitTime) { + return; + } + } + } + + private void cleanEntryFlags() { + entry.reloadScheduled = false; + entry.updateScheduled = false; + } + + private IndexDiffCacheEntry2 prepareCacheEntry() throws Exception { + entry = new IndexDiffCacheEntry2(repository); + waitForJobs(MAX_WAIT_TIME, JobFamilies.INDEX_DIFF_CACHE_UPDATE); + + // on creation, full reload is triggered + assertTrue(entry.reloadScheduled); + assertFalse(entry.updateScheduled); + cleanEntryFlags(); + return entry; + } + + @Before + public void setUp() throws Exception { + super.setUp(); + testRepository = new TestRepository(gitDir); + repository = testRepository.getRepository(); + } + + @After + public void tearDown() throws Exception { + entry.dispose(); + testRepository.dispose(); + repository = null; + super.tearDown(); + } + + class IndexDiffCacheEntry2 extends IndexDiffCacheEntry { + + boolean reloadScheduled; + + boolean updateScheduled; + + public IndexDiffCacheEntry2(Repository repository) { + super(repository); + } + + @Override + protected void scheduleReloadJob(String trigger) { + reloadScheduled = true; + super.scheduleReloadJob(trigger); + } + + @Override + protected void scheduleUpdateJob(Collection filesToUpdate, + Collection resourcesToUpdate) { + updateScheduled = true; + super.scheduleUpdateJob(filesToUpdate, resourcesToUpdate); + } + + @Override + protected boolean shouldReload(Collection filesToUpdate) { + return filesToUpdate.size() > MAX_FILES_FOR_UPDATE; + } + + public IndexDiffUpdateJob getUpdateJob() { + return super.getUpdateJob(); + } + } + +} diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffDataTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffDataTest.java new file mode 100644 index 0000000000..3e3886804a --- /dev/null +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffDataTest.java @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (C) 2015 Andrey Loskutov 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 + *******************************************************************************/ +package org.eclipse.egit.core.internal.indexdiff; + +import static java.util.Arrays.asList; +import static org.eclipse.egit.core.internal.indexdiff.IndexDiffData.isAnyPrefixOf; +import static org.eclipse.egit.core.internal.indexdiff.IndexDiffData.mergeIgnored; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.egit.core.test.GitTestCase; +import org.junit.Test; + +public class IndexDiffDataTest extends GitTestCase { + + @Test + public void testIsAnyPrefixOf() { + Collection possiblePrefixes = asList("", "/"); + assertTrue(isAnyPrefixOf("", possiblePrefixes)); + + possiblePrefixes = asList("", "/"); + assertTrue(isAnyPrefixOf("/", possiblePrefixes)); + + possiblePrefixes = asList("a"); + assertTrue(isAnyPrefixOf("a", possiblePrefixes)); + + possiblePrefixes = asList("a/"); + assertTrue(isAnyPrefixOf("a", possiblePrefixes)); + + possiblePrefixes = asList("b"); + assertFalse(isAnyPrefixOf("a", possiblePrefixes)); + + possiblePrefixes = asList("b", "ab", "b/", "aa"); + assertFalse(isAnyPrefixOf("a", possiblePrefixes)); + } + + @Test + public void testMergeIgnored() { + Set result; + Set expected = new HashSet(); + Set oldIgnoredPaths = new HashSet(); + Collection changedPaths = new HashSet(); + Set newIgnoredPaths = new HashSet(); + + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + newIgnoredPaths.add("a"); + changedPaths.add("a"); + expected.add("a"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + newIgnoredPaths.add("b"); + expected.add("b"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + changedPaths.add("b"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + oldIgnoredPaths.add("b"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + oldIgnoredPaths.add("c"); + expected.add("c"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + + newIgnoredPaths.add("b"); + expected.add("b"); + result = mergeIgnored(oldIgnoredPaths, changedPaths, newIgnoredPaths); + assertEquals(expected, result); + } +} -- cgit v1.2.3 From 7ed7c8262a72a3479efc8c7d4ac491d1bc777478 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Feb 2015 00:01:49 +0100 Subject: EGit v3.7.0.201502031740-rc1 Change-Id: Ia4dff70fcfaf199febb564c3b57e70536b3d6865 Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 2 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 26 files changed, 27 insertions(+), 27 deletions(-) (limited to 'org.eclipse.egit.core.test') diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 0e9073f79c..4118490e17 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index c09c3fa683..d090064659 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 333fb88def..5af78501a8 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-Name: Git Team Provider Core Test Plug-in Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test Fragment-Host: org.eclipse.egit.core -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 9001fbacb5..f5af29b8e0 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.core.test diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 9595931fce..aab0b52704 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 4d99e349d0..f8cf4aa7cc 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.core diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index 20b41365b3..9662412212 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[2.0.0,3.0.0)";resolution:=optional, diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index bbf5450e67..48e57cc811 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.doc diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index f540f6a552..83abd57ea0 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index d807ae1307..3b34bd6fa5 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.feature 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 18fe97bb79..aba1b7b7f2 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 Fragment-Host: org.eclipse.egit.mylyn.ui 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 6fd4616117..83ab1a4f6d 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index 0d7ef742cb..b9918874cd 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 64616afd76..b40c2a4a6b 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 957899e888..899486fe14 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index df69923ca3..930bf67381 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index ade428bd7b..72c7ea2e92 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index 6bc941ebf7..c89fa9d82f 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 1d95e5e91e..ea782c030e 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index ac14fc4e52..12e98d2e01 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-Name: Git Team Provider UI Test Fragment Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 e32c2a74da..31f827a4af 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.ui.test diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index e466870503..a3490b4d08 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 8347ee84dc..d91b039294 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 7694794793..9739ea6920 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.0.201502031740-rc1 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 0ab2942419..81e1dff00e 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 org.eclipse.egit diff --git a/pom.xml b/pom.xml index 9d2f88f716..04841233f5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.eclipse.egit egit-parent - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 pom EGit Parent @@ -62,7 +62,7 @@ - 3.7.0-SNAPSHOT + 3.7.0.201502031740-rc1 0.22.0 ${tycho-version} 1.8.4 -- cgit v1.2.3 From d9754134f067f1617ec419ada7c40a1c58af42ec Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Feb 2015 02:16:56 +0100 Subject: Prepare post 3.7.0.201502031740-rc1 builds Change-Id: I3ca05472be02232041a9ed4a8add1316b2759f7f Signed-off-by: Matthias Sohn --- org.eclipse.egit-feature/feature.xml | 2 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core.test/pom.xml | 2 +- org.eclipse.egit.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.core/pom.xml | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.mylyn-feature/feature.xml | 2 +- org.eclipse.egit.mylyn-feature/pom.xml | 2 +- org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui.test/pom.xml | 2 +- org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 2 +- org.eclipse.egit.source-feature/feature.xml | 2 +- org.eclipse.egit.source-feature/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui.test/pom.xml | 2 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.ui/pom.xml | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 4 ++-- 26 files changed, 27 insertions(+), 27 deletions(-) (limited to 'org.eclipse.egit.core.test') diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 4118490e17..0e9073f79c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index d090064659..c09c3fa683 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index 5af78501a8..333fb88def 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-Name: Git Team Provider Core Test Plug-in Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.core.test Fragment-Host: org.eclipse.egit.core -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 f5af29b8e0..9001fbacb5 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.core.test diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index aab0b52704..9595931fce 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 f8cf4aa7cc..4d99e349d0 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.core diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index 9662412212..20b41365b3 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[2.0.0,3.0.0)";resolution:=optional, diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 48e57cc811..bbf5450e67 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.doc diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml index 83abd57ea0..f540f6a552 100644 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ b/org.eclipse.egit.mylyn-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 3b34bd6fa5..d807ae1307 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.feature 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 aba1b7b7f2..18fe97bb79 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Git Team Provider Mylyn UI Test Fragment Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.0.qualifier Fragment-Host: org.eclipse.egit.mylyn.ui 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 83ab1a4f6d..6fd4616117 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.mylyn.ui.test diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF index b9918874cd..0d7ef742cb 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 b40c2a4a6b..64616afd76 100644 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ b/org.eclipse.egit.mylyn.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.mylyn.ui diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index 899486fe14..957899e888 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.repository diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 930bf67381..df69923ca3 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 72c7ea2e92..ade428bd7b 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.feature diff --git a/org.eclipse.egit.target/META-INF/MANIFEST.MF b/org.eclipse.egit.target/META-INF/MANIFEST.MF index c89fa9d82f..6bc941ebf7 100644 --- a/org.eclipse.egit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.target/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.egit.target -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index ea782c030e..1d95e5e91e 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -18,7 +18,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 12e98d2e01..ac14fc4e52 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-Name: Git Team Provider UI Test Fragment Bundle-Vendor: Eclipse.org Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 31f827a4af..e32c2a74da 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.ui.test diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index a3490b4d08..e466870503 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 d91b039294..8347ee84dc 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit.ui diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index 9739ea6920..7694794793 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.egit -Bundle-Version: 3.7.0.201502031740-rc1 +Bundle-Version: 3.7.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 81e1dff00e..0ab2942419 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -16,7 +16,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT org.eclipse.egit diff --git a/pom.xml b/pom.xml index 04841233f5..9d2f88f716 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.eclipse.egit egit-parent - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT pom EGit Parent @@ -62,7 +62,7 @@ - 3.7.0.201502031740-rc1 + 3.7.0-SNAPSHOT 0.22.0 ${tycho-version} 1.8.4 -- cgit v1.2.3