Update EGit and JGit version, regenerate target & fix test for Jgit 5
Change-Id: I34152ace7a3d2d957524b2ba558164685a009a2c
Signed-off-by: Philip Langer <planger@eclipsesource.com>
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/plugins/compare/targetplatforms/compare-nightly.target
index 1930d58..976e896 100644
--- a/plugins/compare/targetplatforms/compare-nightly.target
+++ b/plugins/compare/targetplatforms/compare-nightly.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly" sequenceNumber="1520586617">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1529911221">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -20,8 +20,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/plugins/compare/targetplatforms/compare-nightly.tpd
index 3a2dd24..dfee621 100755
--- a/plugins/compare/targetplatforms/compare-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare-nightly.tpd
@@ -21,8 +21,8 @@
* Search all references to egit.p2.repo
*/
location "http://download.eclipse.org/egit/updates" EGit {
- org.eclipse.egit.feature.group [4.9.0,5.0.0)
- org.eclipse.jgit.feature.group [4.9.0,5.0.0)
+ org.eclipse.egit.feature.group [4.9.0,6.0.0)
+ org.eclipse.jgit.feature.group [4.9.0,6.0.0)
}
location papyrusNightly "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
diff --git a/plugins/compare/targetplatforms/compare-release-base.target b/plugins/compare/targetplatforms/compare-release-base.target
index 43275b5..6aca7e4 100644
--- a/plugins/compare/targetplatforms/compare-release-base.target
+++ b/plugins/compare/targetplatforms/compare-release-base.target
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Base for Release" sequenceNumber="1520586709">
+<target name="Compare Target Platform - Base for Release" sequenceNumber="1529913499">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.7.2.v20171130-0906"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.4.v20180330-0919"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
<unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
@@ -24,8 +24,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="egit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -38,19 +38,19 @@
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
+ <unit id="javaewah" version="0.7.9.v201605172130"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.lang" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.text" version="0.0.0"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
diff --git a/plugins/compare/targetplatforms/compare-release.target b/plugins/compare/targetplatforms/compare-release.target
index 0230cbb..f0e7d7d 100644
--- a/plugins/compare/targetplatforms/compare-release.target
+++ b/plugins/compare/targetplatforms/compare-release.target
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release" sequenceNumber="1520586845">
+<target name="Compare Target Platform - Release" sequenceNumber="1529913496">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.7.2.v20171130-0906"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.4.v20180330-0919"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
<unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
@@ -24,8 +24,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="egit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -38,28 +38,28 @@
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
<unit id="com.google.inject" version="0.0.0"/>
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
+ <unit id="javaewah" version="0.7.9.v201605172130"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.commons.lang" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.text" version="0.0.0"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.2.0.201712060842"/>
- <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201712060842"/>
- <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201712060842"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201712060842"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="3.4.0.201805210649"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201805210649"/>
+ <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201805210649"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201805210649"/>
<repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/>
</location>
</locations>
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/plugins/compare/targetplatforms/compare.tests-nightly.target
index cea8c17..506fd66 100644
--- a/plugins/compare/targetplatforms/compare.tests-nightly.target
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1520586823">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1529913468">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -20,8 +20,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/staging/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/plugins/compare/targetplatforms/compare.tests-release.target
index a34af2b..cdc0137 100644
--- a/plugins/compare/targetplatforms/compare.tests-release.target
+++ b/plugins/compare/targetplatforms/compare.tests-release.target
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release, Tests" sequenceNumber="1520586816">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1529913462">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.7.2.v20171130-0906"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.7.2.v20171130-0510"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.13.2.v20171130-0906"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.3.v20180330-0919"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.13.4.v20180330-0919"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.1.1.v20170906-1259"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
<unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
@@ -24,25 +24,25 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="egit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.apache.commons.io" version="0.0.0"/>
- <unit id="org.apache.commons.io.source" version="0.0.0"/>
- <unit id="com.google.inject" version="0.0.0"/>
+ <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+ <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
+ <unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
- <unit id="javaewah" version="0.0.0"/>
- <unit id="org.apache.commons.compress" version="0.0.0"/>
- <unit id="org.apache.commons.lang" version="0.0.0"/>
- <unit id="org.kohsuke.args4j" version="0.0.0"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+ <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="0.0.0"/>
- <unit id="org.hamcrest.library" version="0.0.0"/>
- <unit id="org.hamcrest.integration" version="0.0.0"/>
- <unit id="org.hamcrest.text" version="0.0.0"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+ <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
diff --git a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
index 1c53517..84f2e34 100644
--- a/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
+++ b/plugins/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/GitTestRepository.java
@@ -105,7 +105,7 @@
workdirPrefix += "/";
}
- this.disposers = new ArrayList<Runnable>();
+ this.disposers = new ArrayList<>();
}
public Repository getRepository() {
@@ -351,7 +351,7 @@
}
public void ignore(File... files) throws Exception {
- final Set<IPath> paths = new LinkedHashSet<IPath>();
+ final Set<IPath> paths = new LinkedHashSet<>();
for (File file : files) {
paths.add(new Path(file.getPath()));
}
@@ -529,7 +529,7 @@
public void createBranch(String refName, String newRefName) throws IOException {
RefUpdate updateRef;
updateRef = repository.updateRef(newRefName);
- Ref startRef = repository.getRef(refName);
+ Ref startRef = repository.exactRef(refName);
ObjectId startAt = repository.resolve(refName);
String startBranch;
if (startRef != null) {
@@ -604,7 +604,7 @@
* Name of a commit to rebase the current HEAD on.
*/
public void rebaseLogical(String refName) throws CoreException, IOException {
- new RebaseOperation(repository, repository.getRef(refName)).execute(null);
+ new RebaseOperation(repository, repository.exactRef(refName)).execute(null);
}
/**
@@ -616,7 +616,7 @@
public void cherryPickLogical(String refName) throws CoreException, IOException {
RevWalk revWalk = new RevWalk(repository);
try {
- RevCommit commitId = revWalk.parseCommit(repository.getRef(refName).getObjectId());
+ RevCommit commitId = revWalk.parseCommit(repository.exactRef(refName).getObjectId());
new CherryPickOperation(repository, commitId).execute(null);
} catch (IOException e) {
Activator.logError(e.getMessage(), e);
@@ -712,6 +712,7 @@
final GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(dataSet);
subscriber.init(new NullProgressMonitor());
disposers.add(new Runnable() {
+ @Override
public void run() {
subscriber.dispose();
}
@@ -751,6 +752,7 @@
subscriber, remoteContext, true);
final GitSubscriberMergeContext context = new GitSubscriberMergeContext(subscriber, manager, dataSet);
disposers.add(new Runnable() {
+ @Override
public void run() {
manager.dispose();
context.dispose();
@@ -787,6 +789,7 @@
subscriber, remoteContext, true);
final GitSubscriberMergeContext context = new GitSubscriberMergeContext(subscriber, manager, dataSet);
disposers.add(new Runnable() {
+ @Override
public void run() {
manager.dispose();
context.dispose();
@@ -824,7 +827,7 @@
private static ResourceMapping[] getResourceMappings(IFile file, ResourceMappingContext context) {
final IModelProviderDescriptor[] modelDescriptors = ModelProvider.getModelProviderDescriptors();
- final Set<ResourceMapping> mappings = new LinkedHashSet<ResourceMapping>();
+ final Set<ResourceMapping> mappings = new LinkedHashSet<>();
for (IModelProviderDescriptor candidate : modelDescriptors) {
try {
final IResource[] resources = candidate.getMatchingResources(new IResource[] {file, });
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
index 87146da..2c480d9 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Collaborative Modeling Target Platform" sequenceNumber="1520586221">
+<target name="Collaborative Modeling Target Platform" sequenceNumber="1529913597">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -15,8 +15,8 @@
<repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="4.11.0.201803080745-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="4.11.0.201803080745-r"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.0.1.201806211838-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.0.1.201806211838-r"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
index 2c58b88..bafaedd 100755
--- a/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
+++ b/releng/targetplatforms/org.eclipse.papyrus.collaborativemodeling.targetplatform/org.eclipse.papyrus.collaborativemodeling.targetplatform.tpd
@@ -13,8 +13,8 @@
}
location "http://download.eclipse.org/egit/updates" EGit {
- org.eclipse.egit.feature.group [4.9.0,5.0.0)
- org.eclipse.jgit.feature.group [4.9.0,5.0.0)
+ org.eclipse.egit.feature.group [4.9.0,6.0.0)
+ org.eclipse.jgit.feature.group [4.9.0,6.0.0)
}
//emf.transaction requires emf.validation
