Skip to main content
Jump to: navigation, search

Difference between revisions of "EMF DiffMerge/Download"

(Patterns)
m
 
(46 intermediate revisions by 3 users not shown)
Line 1: Line 1:
=  Releases  =
 
  
The tool is tested in Eclipse Modeling 3.6 (Helios), 3.7 (Indigo), 3.8/4.2 (Juno) and 4.3 (Kepler).<br>
+
[[Image:Egg-incubation.png|left]]
  
== 0.1.0 - 11/2012 ==
+
= Releases =
  
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.1.0/EMF-DiffMerge-0.1.0.v20121106-1043-Site-Incubation.zip Update site] (local use with p2)
+
'''Go to releases page''' : https://github.com/eclipse/org.eclipse.emf.diffmerge.core/releases
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.1.0/EMF-DiffMerge-0.1.0.v20121106-1043-Dropins-Incubation.zip Dropins]
+
  
== 0.2.0 - Kepler 06/2013  ==
 
  
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.2.0/EMF-DiffMerge-0.2.0.v20130523-0727-Site-Incubation.zip Update site] (local use with p2)&nbsp;
+
== Older releases ==
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.2.0/EMF-DiffMerge-0.2.0.v20130523-0727-Dropins-Incubation.zip Dropins]
+
  
== 0.3.0 - Luna 06/2014 ==
+
== v0.13.1 (12/2021) ==
 +
https://github.com/eclipse/org.eclipse.emf.diffmerge.core/releases
  
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.3.0/EMF-DiffMerge-0.3.0.v20140611-1329-Site-Incubation.zip Update site] (local use with p2)&nbsp;
+
== v0.13.0 (12/2020) ==
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.3.0/EMF-DiffMerge-0.3.0.v20140611-1329-Dropins-Incubation.zip Dropins]
+
The API changes between versions 0.2.0 and 0.3.0 can be found [http://wiki.eclipse.org/EMF_DiffMerge/Changes here].
+
  
== 0.4.0 - 12/2014  ==
+
It is now possible to launch diffmerge on pure Java Objects
 +
 
 +
Compatible (at least) with Eclipse 2019-06 and 2020-06
 +
 
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.13.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.13.0/EMF-DiffMerge-0.13.0.v20201021-1615-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
== v0.12.0 (10/2019)  ==
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.14 (2019-12) and corresponding releases of EGit. Includes support for Sirius 6.3 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.12.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.12.0/EMF-DiffMerge-0.12.0.v20191002-0901-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.11.2-2019-06 - Part of the Eclipse 2019-06, 2019-09 and 2019-12 release trains  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.12 (2019-06) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.11.2/2019-06/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.11.2/2019-06/EMF-DiffMerge-0.11.2.v20190610-0817-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.11.2 (04/2019)  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.11.2/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.11.2/EMF-DiffMerge-0.11.2.v20190418-1359-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.11.1 (03/2019)  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.11.1/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.11.1/EMF-DiffMerge-0.11.1.v20190326-1059-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.11.0 (11/2018)  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.9 (2018-09) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.11.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.11.0/EMF-DiffMerge-0.11.0.v20181028-1700-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.10.1 - Part of the Eclipse 2018-12 and 2019-03 release trains  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.10.1/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.10.1/EMF-DiffMerge-0.10.1.v20181113-1034-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.10.0 - Part of the Eclipse Photon and 2018-09 release trains  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.9 (2018-09) and corresponding releases of EGit. Includes support for Sirius 5.1 or greater.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.10.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.10.0/EMF-DiffMerge-0.10.0.v20180531-1703-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.9.0 (11/2017)  ===
 +
 
 +
Compatible with Eclipse from 4.5 (Mars) to 4.7 (Oxygen), except for the extensions that depend on EGit, Subversive or Sirius.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.9.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.9.0/EMF-DiffMerge-0.9.0.v20171027-1456-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
 
 +
All releases from v0.1.0 to v0.8.0 are compatible with Eclipse Modeling from 3.6 (Helios) to 4.7 (Oxygen), except for the extensions that depend on EGit, Subversive or Sirius.
 +
<br>
 +
 
 +
=== v0.8.0 - Part of the Eclipse Oxygen release train (06/2017)  ===
 +
 
 +
Includes support for Sirius 4.1.
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.8.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.8.0/EMF-DiffMerge-0.8.0.v20170612-0810-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
 
 +
=== v0.7.0 (11/2016)  ===
 +
 
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.7.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.7.0/EMF-DiffMerge-0.7.0.v20161020-1434-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.7.0/EMF-DiffMerge-0.7.0.v20161020-1434-Dropins-Incubation.zip Dropins]
 +
 
 +
=== v0.6.0 - Part of the Eclipse Neon release train (06/2016)  ===
 +
 
 +
Includes support for Git and SVN via integrations with [https://www.eclipse.org/egit/ EGit] and [https://www.eclipse.org/subversive/ Subversive].
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.6.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.6.0/EMF-DiffMerge-0.6.0.v20160523-1452-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.6.0/EMF-DiffMerge-0.6.0.v20160523-1452-Dropins-Incubation.zip Dropins]
 +
 
 +
=== v0.5.1 (10/2015)  ===
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.5.1/emf-diffmerge-site
 +
Fixes [https://bugs.eclipse.org/bugs/show_bug.cgi?id=471650 471650], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=477436 477436], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=477915 477915], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=478204 478204], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=445878 445878], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=478306 478306], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=480191 480191].
 +
 
 +
=== v0.5.0 - Part of the Eclipse Mars release train (06/2015)  ===
 +
 
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.5.0/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.5.0/EMF-DiffMerge-0.5.0.v20150608-0931-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.5.0/EMF-DiffMerge-0.5.0.v20150608-0931-Dropins-Incubation.zip Dropins]
 +
 
 +
=== v0.4.1 (03/2015)  ===
 +
 
 +
*Update site location: http://download.eclipse.org/diffmerge/releases/0.4.1/emf-diffmerge-site
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.1/EMF-DiffMerge-0.4.1.v20150311-1624-Site-Incubation.zip Update site] (local use with p2)&nbsp;
 +
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.1/EMF-DiffMerge-0.4.1.v20150311-1624-Dropins-Incubation.zip Dropins]
 +
Fixes [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461377 461377], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461935 461935], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461936 461936].
 +
 
 +
=== v0.4.0 (12/2014) ===
  
 
*Update site location: http://download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site
 
*Update site location: http://download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site
Line 26: Line 116:
 
The API changes between versions 0.3.0 and 0.4.0 can be found [http://wiki.eclipse.org/EMF_DiffMerge/Changes here].
 
The API changes between versions 0.3.0 and 0.4.0 can be found [http://wiki.eclipse.org/EMF_DiffMerge/Changes here].
  
=== Patterns ===
+
=== v0.3.0 - Part of the Eclipse Luna release train (06/2014)  ===
A new major application of the diff/merge engine is available with this release: a [http://wiki.eclipse.org/EMF_DiffMerge/Patterns tool for handling modeling patterns] in modeling tools based on [http://eclipse.org/sirius/ Sirius] technology. The tool requires EMF Diff/Merge 0.4.x.
+
  
Beware that using the tool in a new modeling environment is likely to require a new customization.
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.3.0/EMF-DiffMerge-0.3.0.v20140611-1329-Site-Incubation.zip Update site] (local use with p2)&nbsp;  
*Update site location: http://download.eclipse.org/diffmerge/releases/0.4.0/edm-patterns-site
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.3.0/EMF-DiffMerge-0.3.0.v20140611-1329-Dropins-Incubation.zip Dropins]
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.0/EDM-Patterns-Sirius-0.4.0.v20141028-0841-Site-Incubation.zip Patterns update site] (local use with p2)&nbsp;  
+
The API changes between versions 0.2.0 and 0.3.0 can be found [http://wiki.eclipse.org/EMF_DiffMerge/Changes here].
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.0/EDM-Patterns-Sirius-0.4.0.v20141028-0841-Dropins-Incubation.zip Patterns dropins]
+
  
== 0.4.1 - 03/2015 ==
+
=== v0.2.0 - Part of the Eclipse Kepler release train (06/2013) ===
  
*Update site location: http://download.eclipse.org/diffmerge/releases/0.4.1/emf-diffmerge-site
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.2.0/EMF-DiffMerge-0.2.0.v20130523-0727-Site-Incubation.zip Update site] (local use with p2)&nbsp;  
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.1/EMF-DiffMerge-0.4.1.v20150311-1624-Site-Incubation.zip Update site] (local use with p2)&nbsp;  
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.2.0/EMF-DiffMerge-0.2.0.v20130523-0727-Dropins-Incubation.zip Dropins]
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.4.1/EMF-DiffMerge-0.4.1.v20150311-1624-Dropins-Incubation.zip Dropins]
+
Fixes bugs [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461377 461377], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461935 461935], [https://bugs.eclipse.org/bugs/show_bug.cgi?id=461936 461936]. Compatible with Patterns (see above).
+
  
== 0.5.0 - Mars 06/2015 ==
+
=== v0.1.0 (11/2012) ===
  
*Update site location: http://download.eclipse.org/diffmerge/releases/0.5.0/emf-diffmerge-site
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.1.0/EMF-DiffMerge-0.1.0.v20121106-1043-Site-Incubation.zip Update site] (local use with p2)  
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.5.0/EMF-DiffMerge-0.5.0.v20150608-0931-Site-Incubation.zip Update site] (local use with p2)&nbsp;
+
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.1.0/EMF-DiffMerge-0.1.0.v20121106-1043-Dropins-Incubation.zip Dropins]
*[http://www.eclipse.org/downloads/download.php?file=/diffmerge/releases/0.5.0/EMF-DiffMerge-0.5.0.v20150608-0931-Dropins-Incubation.zip Dropins]
+
  
 
= Last build  =
 
= Last build  =
  
*[https://hudson.eclipse.org/diffmerge/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/site.p2/ Update site]  
+
*[https://hudson.eclipse.org/diffmerge/view/Master/job/emf-diffmerge-core-master/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.diffmerge.update/target/repository/ Update site]
*[https://hudson.eclipse.org/diffmerge/job/buckminster-emf-diffmerge-master/lastSuccessfulBuild/artifact/result/publish/org.eclipse.emf.diffmerge.sdk.feature/dropins/*zip*/dropins.zip Dropins]
+
*[https://hudson.eclipse.org/diffmerge/view/Master/job/emf-diffmerge-core-master/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.diffmerge.update/target/repository/*zip*/EDM-Last.zip Update site (zipped for local use)]
 
+
[[Image:Egg-incubation.png|left]]
+

Latest revision as of 09:47, 4 July 2022

Egg-incubation.png

Releases

Go to releases page : https://github.com/eclipse/org.eclipse.emf.diffmerge.core/releases


Older releases

v0.13.1 (12/2021)

https://github.com/eclipse/org.eclipse.emf.diffmerge.core/releases

v0.13.0 (12/2020)

It is now possible to launch diffmerge on pure Java Objects

Compatible (at least) with Eclipse 2019-06 and 2020-06

v0.12.0 (10/2019)

Compatible with Eclipse from 4.5 (Mars) to 4.14 (2019-12) and corresponding releases of EGit. Includes support for Sirius 6.3 and greater.

v0.11.2-2019-06 - Part of the Eclipse 2019-06, 2019-09 and 2019-12 release trains

Compatible with Eclipse from 4.5 (Mars) to 4.12 (2019-06) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.

v0.11.2 (04/2019)

Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.

v0.11.1 (03/2019)

Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.

v0.11.0 (11/2018)

Compatible with Eclipse from 4.5 (Mars) to 4.9 (2018-09) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.

v0.10.1 - Part of the Eclipse 2018-12 and 2019-03 release trains

Compatible with Eclipse from 4.5 (Mars) to 4.11 (2019-03) and corresponding releases of EGit. Includes support for Sirius 5.1 and greater.

v0.10.0 - Part of the Eclipse Photon and 2018-09 release trains

Compatible with Eclipse from 4.5 (Mars) to 4.9 (2018-09) and corresponding releases of EGit. Includes support for Sirius 5.1 or greater.

v0.9.0 (11/2017)

Compatible with Eclipse from 4.5 (Mars) to 4.7 (Oxygen), except for the extensions that depend on EGit, Subversive or Sirius.


All releases from v0.1.0 to v0.8.0 are compatible with Eclipse Modeling from 3.6 (Helios) to 4.7 (Oxygen), except for the extensions that depend on EGit, Subversive or Sirius.

v0.8.0 - Part of the Eclipse Oxygen release train (06/2017)

Includes support for Sirius 4.1.

v0.7.0 (11/2016)

v0.6.0 - Part of the Eclipse Neon release train (06/2016)

Includes support for Git and SVN via integrations with EGit and Subversive.

v0.5.1 (10/2015)

Fixes 471650, 477436, 477915, 478204, 445878, 478306, 480191.

v0.5.0 - Part of the Eclipse Mars release train (06/2015)

v0.4.1 (03/2015)

Fixes 461377, 461935, 461936.

v0.4.0 (12/2014)

The API changes between versions 0.3.0 and 0.4.0 can be found here.

v0.3.0 - Part of the Eclipse Luna release train (06/2014)

The API changes between versions 0.2.0 and 0.3.0 can be found here.

v0.2.0 - Part of the Eclipse Kepler release train (06/2013)

v0.1.0 (11/2012)

Last build

Back to the top