2021-09 tp + 2021-12 milestone of EGit to cope with API breaks
Change-Id: I34b9c00a54f7dd3c84c6121b6ce6d1636a042e49
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 72ce531..684fb32 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -366,7 +366,7 @@
<profiles>
<!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
<profile>
- <id>2021-06</id>
+ <id>2021-09</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -381,6 +381,27 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
+ <classifier>targetPlatforms/2021-09-sdk</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>2021-06</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>emf.compare-parent</artifactId>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/2021-06-sdk</classifier>
</artifact>
</target>
@@ -540,6 +561,27 @@
<module>../plugins/org.eclipse.emf.compare.diagram.sirius.tests.design</module>
</modules>
</profile>
+ <profile>
+ <id>2021-09-extras</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <artifactId>emf.compare-parent</artifactId>
+ <version>${parent-version}</version>
+ <classifier>targetPlatforms/extras/2021-09-extras-sdk</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>2021-06-extras</id>
<build>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.target
new file mode 100644
index 0000000..8aa680a
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.target
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="EMF Compare based on 2021-09 SDK" sequenceNumber="1633593319">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+ <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+ <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.assertj" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+ <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/2021-09"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/egit/staging/v6.0.0.202110060947-m1/"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.tpd
new file mode 100644
index 0000000..88312bd
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/2021-09-sdk.tpd
@@ -0,0 +1,20 @@
+target "EMF Compare based on 2021-09 SDK"
+
+include "fragments/licence.tpd"
+include "fragments/orbit.tpd"
+include "fragments/perf.tpd"
+
+with source, requirements
+
+location "http://download.eclipse.org/releases/2021-09" {
+ org.eclipse.platform.feature.group lazy
+ org.eclipse.emf.sdk.feature.group lazy
+ org.eclipse.emf.transaction.sdk.feature.group lazy
+ org.eclipse.uml2.feature.group lazy
+ org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.diagram.ui lazy
+}
+
+location "https://download.eclipse.org/egit/staging/v6.0.0.202110060947-m1/" {
+ org.eclipse.egit.feature.group lazy
+}
\ No newline at end of file
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.target
new file mode 100644
index 0000000..23560c3
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.target
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="EMF Compare with extras based on 2021-09" sequenceNumber="1633594517">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
+ <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="1.1.12.v20210622-2206"/>
+ <unit id="org.apache.commons.compress" version="1.20.0.v20210713-1928"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.assertj" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+ <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/2021-09"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/egit/staging/v6.0.0.202110060947-m1/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.tpd
new file mode 100644
index 0000000..5be789d
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/2021-09-extras-sdk.tpd
@@ -0,0 +1,15 @@
+target "EMF Compare with extras based on 2021-09"
+
+include "../2021-09-sdk.tpd"
+
+with source, requirements
+
+// Sirius
+
+location "https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/" {
+ org.eclipse.sirius lazy
+ org.eclipse.sirius.diagram lazy
+ org.eclipse.sirius.runtime.feature.group lazy
+ org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+ org.eclipse.sirius.runtime.aql.feature.group lazy
+}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
index 73911cf..d3c8d48 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
@@ -2,7 +2,7 @@
with source, requirements
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository/" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" {
com.google.guava [27.0.0,30.2.0)
com.google.gson [2.2.4,3.0.0)
org.junit [4,5)
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF
index e87d03b..58b7f83 100755
--- a/plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF
@@ -6,20 +6,20 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.emf.compare.egit,
- org.eclipse.egit.ui;bundle-version="4.2.0",
+ org.eclipse.egit.ui;bundle-version="6.0.0",
org.eclipse.core.runtime,
org.eclipse.compare,
org.eclipse.ui,
org.eclipse.core.resources,
- org.eclipse.jgit;bundle-version="4.2.0",
+ org.eclipse.jgit;bundle-version="6.0.0",
org.eclipse.team.core,
org.eclipse.team.ui,
- org.eclipse.egit.core;bundle-version="4.2.0",
+ org.eclipse.egit.core;bundle-version="6.0.0",
org.eclipse.ui.ide,
org.eclipse.emf.compare,
org.eclipse.emf.compare.ide.ui,
org.eclipse.emf.compare.ide,
- org.eclipse.egit;bundle-version="4.2.0",
+ org.eclipse.egit;bundle-version="6.0.0",
org.eclipse.core.filesystem,
org.eclipse.ui.workbench.texteditor
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
index 01d38db..3519798 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
+++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java
@@ -458,7 +458,7 @@
if (mapping == null) {
return conflictingResources;
}
- final IndexDiffCacheEntry indexDiffCacheEntry = IndexDiffCache.getInstance()
+ final IndexDiffCacheEntry indexDiffCacheEntry = IndexDiffCache.INSTANCE
.getIndexDiffCacheEntry(mapping.getRepository());
if (indexDiffCacheEntry == null) {
return conflictingResources;
@@ -546,7 +546,7 @@
throw new InvocationTargetException(e);
}
setTitle(NLS.bind(UIText.GitMergeEditorInput_MergeEditorTitle,
- new Object[] {RepositoryUtil.getInstance().getRepositoryName(repository),
+ new Object[] {RepositoryUtil.INSTANCE.getRepositoryName(repository),
rightCommit.getShortMessage(), fullBranch }));
}
@@ -1009,7 +1009,7 @@
}
}
if (gitPath != null && repository != null) {
- IndexDiffCacheEntry indexDiffCacheForRepository = IndexDiffCache.getInstance()
+ IndexDiffCacheEntry indexDiffCacheForRepository = IndexDiffCache.INSTANCE
.getIndexDiffCacheEntry(repository);
if (indexDiffCacheForRepository != null) {
indexDiffCacheForRepository.refreshFiles(Collections.singletonList(gitPath));
diff --git a/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
index 71b985b..e13fde1 100644
--- a/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Version: 1.2.4.qualifier
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
- org.eclipse.jgit;bundle-version="[4.9.0,6.0.0)",
+ org.eclipse.jgit;bundle-version="6.0.0",
org.eclipse.team.core;bundle-version="3.7.0",
- org.eclipse.egit.core;bundle-version="4.2.0",
+ org.eclipse.egit.core;bundle-version="6.0.0",
org.eclipse.emf.compare.ide;bundle-version="3.2.0",
org.eclipse.emf.compare.rcp,
org.eclipse.emf.compare,
- org.eclipse.egit.ui;bundle-version="4.2.0"
+ org.eclipse.egit.ui;bundle-version="6.0.0"
Import-Package: com.google.common.collect;version="[27.0.0,30.2.0)",
org.apache.log4j;version="[1.2.15,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java
index 4787d70..91047c6 100644
--- a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java
+++ b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java
@@ -35,7 +35,7 @@
@Override
public IPath getFullPath() {
- final RepositoryUtil repositoryUtil = RepositoryUtil.getInstance();
+ final RepositoryUtil repositoryUtil = RepositoryUtil.INSTANCE;
IPath repoPath = new Path(repositoryUtil.getRepositoryName(db));
String pathString = super.getFullPath().toPortableString() + " index"; //$NON-NLS-1$
return repoPath.append(Path.fromPortableString(pathString));
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
index f4b54d3..b8ae62d 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
@@ -10,9 +10,9 @@
org.junit;bundle-version="4.8.0",
org.eclipse.emf.compare,
org.eclipse.emf.compare.ide.ui.tests,
- org.eclipse.jgit;bundle-version="4.2.0",
+ org.eclipse.jgit;bundle-version="6.0.0",
org.eclipse.core.resources,
- org.eclipse.egit.core;bundle-version="4.2.0",
+ org.eclipse.egit.core;bundle-version="6.0.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.eclipse.team.core;bundle-version="3.5.0",
org.eclipse.emf.compare.ide.ui;bundle-version="3.1.0",
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/InternalGitTestSupport.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/InternalGitTestSupport.java
index b615279..3d81760 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/InternalGitTestSupport.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/statements/InternalGitTestSupport.java
@@ -166,7 +166,7 @@
*/
private void connectRepository(File file) throws IOException {
File gitDir = findGitDir(file);
- this.repository = RepositoryCache.getInstance().lookupRepository(gitDir);
+ this.repository = RepositoryCache.INSTANCE.lookupRepository(gitDir);
this.disposers = new ArrayList<Runnable>();
}
@@ -291,7 +291,7 @@
iProject.delete(true, new NullProgressMonitor());
}
}
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
File file = new File(workspaceRoot.getLocation().toOSString());
File[] listFiles = file.listFiles();
@@ -323,7 +323,7 @@
disposers.clear();
}
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
if (projects != null) {
List<IProject> disconnectMe = new ArrayList<>();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/META-INF/MANIFEST.MF
index a677d57..d5ed7e7 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.emf.compare.ide.ui.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.egit.core;bundle-version="4.2.0",
- org.eclipse.jgit;bundle-version="4.2.0",
+Require-Bundle: org.eclipse.egit.core;bundle-version="6.0.0",
+ org.eclipse.jgit;bundle-version="6.0.0",
org.eclipse.emf.compare.egit;bundle-version="1.1.0",
org.eclipse.emf.compare.ide.ui.tests.git.framework;bundle-version="1.0.0",
org.eclipse.emf.compare.ide.ui.tests.framework;bundle-version="1.0.0"
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
index e7f255d..f67d686 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
@@ -101,7 +101,7 @@
super.setUp();
// ensure there are no shared Repository instances left
// when starting a new test
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
final MockSystemReader mockSystemReader = new MockSystemReader();
SystemReader.setInstance(mockSystemReader);
mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY, ResourcesPlugin.getWorkspace()
@@ -120,7 +120,7 @@
@After
public void tearDown() throws Exception {
repository.dispose();
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
if (gitDir.exists()) {
try (Stream<java.nio.file.Path> walk = Files.walk(gitDir.toPath())) {
walk.sorted(Comparator.reverseOrder()).map(java.nio.file.Path::toFile).forEach(File::delete);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java
index fdbcc98..dd17729 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java
@@ -93,7 +93,7 @@
FileRepository tmpRepository = new FileRepository(gitDir);
tmpRepository.create();
tmpRepository.close();
- repository = RepositoryCache.getInstance().lookupRepository(gitDir);
+ repository = RepositoryCache.INSTANCE.lookupRepository(gitDir);
try {
workdirPrefix = repository.getWorkTree().getCanonicalPath();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java
index 116c39a..eb5b16b 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java
@@ -103,7 +103,7 @@
public void setUp() throws Exception {
// ensure there are no shared Repository instances left
// when starting a new test
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
final MockSystemReader mockSystemReader = new MockSystemReader();
SystemReader.setInstance(mockSystemReader);
final IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
@@ -122,7 +122,7 @@
.getModelProviderDescriptor(EMFModelProvider.PROVIDER_ID).getModelProvider();
emfModelProvider.clear();
repository.dispose();
- RepositoryCache.getInstance().clear();
+ RepositoryCache.INSTANCE.clear();
if (gitDir.exists()) {
File gitRoot = gitDir.getParentFile();
if (gitRoot.exists()) {
