Eclipse EMF Compare 2.1.0
Primary tabs
The release deliverables have the same form as is found in most Eclipse projects. Namely:
- EMF Compare source code release, available as versions tagged with "R2_1" in the project's GIT repository.
- EMF Compare SDK, which includes runtime, sources, examples, and documentation, and is available as a download or on the update site.
- EMF Compare binary distribution, available as a download or on the update site.
EMF Compare 2.0 was a full overhaul of the project, including its design and architecture.
As such, the project's API is not compatible with its previous 1.* versions. Version 2.1 brings few API breakages and new features but is mostly compatible with 2.0 version. A migration guide will be provided in order to ease the adoption effort to this new version.
EMF Compare is developped with and targets the following projects :
- Eclipse Platform SDK version 4.3
- EMF Core 2.9
The ultimate EMF Compare release will be compatible with the released version of its dependencies and will publish binary and source compatibilities with migration guides on subsequent releases.
The Eclipse Platform is designed as the basis for internationalized products. The user interface elements provided by the Eclipse SDK components, including dialogs and error messages, are externalized.
The English strings are provided as the default resource bundles.
Similarly, the EMF Compare project will externalize all its user interface elements, provide English strings for them in its default bundles, and localize a subset of the locales offered by the Platform.
The download page will provide the details as they become available.
In order to remain current, each Eclipse release targets reasonably current versions of the underlying operating environments. The EMF Compare project depends upon on the Platform,which is mostly "pure" Java™. The 4.3 release of the Eclipse Platform Project is written and compiled against version 1.5 of the Java Platform APIs, and targeted to run on version 1.5 of the Java Runtime Environment, Standard Edition. EMF Compare rely on EMF Core which is written and compiled against version 1.5 of the Java Platform APIs., EMF Compare relies on Java 5.
Eclipse Platform SDK 4.3 will be tested and validated on a number of reference platforms.
EMF Compare will be tested and validated against a subset of those listed for the platform.
Given that there is no operating system dependent code in EMF Compare, it's expected that EMF Compare will work anywhere the Eclipse Platform does.
- EMF compare should handle contributions changes [205420]
(target milestone: Kepler M5) - Add a 'namespacePattern' attribute on EMF Compare extension points [296701]
(target milestone: Kepler M5) - Conflicting ecore content type [318408]
(target milestone: Kepler M5) - Conflicts are not tested for extLibrary*.
ecore [381143] (target milestone: Kepler M6) - IndexOutOfBoundException when merging [388759]
(target milestone: Kepler M5) - GenericDiffEngine does not handle EAttributes of type EFeatureMap$Entry correctly [389584]
(target milestone: Kepler M5) - Cross-references not added during merge [390788]
(target milestone: Kepler M5) - Renaming detected instead of addition .
deletion [391657] (target milestone: Kepler M5) - elements with reference changes are not matched anymore [391798]
(target milestone: Kepler M5) - NoClassDefFoundError org.
eclipse. emf. compare. uml2. UMLComparePackage$Literals [396618] (target milestone: Kepler M5) - Extension point for filters and groups [398358]
(target milestone: Kepler M5) - Provide a merge extension mechanism [398863]
(target milestone: Kepler M6) - EMF Compare should provide an UI-independant RCP plugin [399264]
(target milestone: Kepler M6) - Diff merging time increases exponentially [399361]
(target milestone: Kepler M5) - Extensible mergers [400221]
(target milestone: Kepler M6) - Reordering not recognized [400412]
(target milestone: Kepler M6) - Adjust API to be able to read the description of a difference [401440]
(target milestone: Kepler M6) - update import-pacakge dependencies for guava [401595]
(target milestone: Kepler M6) - NotSerializableException when attempting to save the comparison model [402421]
(target milestone: Kepler M7) - Provide a match engine extension mechanism [403055]
(target milestone: Kepler M6) - Ordering post processors.
[403187] (target milestone: Kepler M6) - NullPointerException in UMLProfileApplicationChangeFactory [403423]
(target milestone: Kepler M6) - Deadlock during model resolving [403425]
(target milestone: Kepler M6) - EcoreUtil.
convertToString() is called if attribute is not serializeable [403543] (target milestone: Kepler M6) - platform:.
plugin. org. eclipse. emf. compare. uml2. model. uml2diff. genmodel is missing [404088] (target milestone: Kepler M6) - Provide an adapter factory extension mechanism [404274]
(target milestone: Kepler M7) - Respect the "ordered" status of containment references.
[405000] (target milestone: Kepler M7) - Undo doesn't work after a merge [405720]
(target milestone: Kepler M7) - start method should call super [406524]
(target milestone: Kepler M7) - Save does not work after certain merge operations [406626]
(target milestone: Kepler M7)
- Comparison fails when nsURI contains XSD reference [434773] (target milestone: ---)
- Extension point to expose generation package is misplaced [467517] (target milestone: ---)
- Infomations lost on features map comparison (with local history) [471653] (target milestone: ---)
- It should be possible to remove the association between a file extension and EMF Compare [480309] (target milestone: ---)
- EKeys are not considered as exact match in a IObjectMatcher [485006] (target milestone: ---)
- DefaultWeightProvider and EcoreWeightProvider do not cache irrelevant features [485423] (target milestone: ---)
- ProximityMatcher should not use order for unordered containment references [485425] (target milestone: ---)
- A weight provider cannot be registered for two nsURI's [485433] (target milestone: ---)
- Pseudo conflicts wrongly detected when adding different children [505931] (target milestone: ---)
- Publish EMF Compare Core on Maven [510458] (target milestone: ---)
- Performance problem ComparisonSpec [517046] (target milestone: ---)
- Merging dependencies with different targets gives multiple targets [526397] (target milestone: ---)
- ClassCastException in FeatureMapChangeMerger when FeatureMap.
Enry should be removed [538697] (target milestone: ---) - Error when doing SVN compare (from synchronize window) on oomph setup file [542959] (target milestone: ---)
- DefaultMatchEngine#createResourceMatcher() referenced in doc is deprecated [559769] (target milestone: ---)
- IllegalStateException when running Batchmerger.
copyAllLeftToRight on two UML models [562708] (target milestone: ---) - Lose the top-level match when containment of the root object is reversed [569948] (target milestone: ---)
- Multi-valued attribute changes are not merged properly after deserialization of comparison model [581194] (target milestone: ---)
- ChangeModel to DiffModel [292409] (target milestone: ---)
- Differencing distinct Metamodels fails for elements with different number of attributes [303052] (target milestone: ---)
- Resources Level cross referencer [361534] (target milestone: ---)
- Move of Resource Content not detected [405861] (target milestone: ---)
- We need a way to rollback merge operations [406101] (target milestone: ---)
- CMOF file serialization should be supported [411998] (target milestone: ---)
- The cache of the defaultMatchEngine(Factory) is never cleared.
[415335] (target milestone: ---) - Equal files are not equal [419374] (target milestone: ---)
- Java heap space in DiffUtil.
shortLongestCommonSubsequence [432497] (target milestone: ---) - Set the state of macro differences to "DISCARDED" if one of it's "refined by" differences is merged [437258] (target milestone: ---)
- Separate the differencing and integrity concerns [439869] (target milestone: ---)
- Batch merger may be smarter and compute LCS only once per list to be merged.
[442264] (target milestone: ---) - Wrong conflict type for adding identical values in a different order in two different models [454754] (target milestone: ---)
- MonitoredProxyCreationListener#proxyCreated is too permissive [457670] (target milestone: ---)
- Match content variations between local models and shared models [458419] (target milestone: ---)
- Potential logical model resolution failure with relative cross-refs [461901] (target milestone: ---)
- Users should be able to provide their own EqualityHelpers [462547] (target milestone: ---)
- Comparison of EGenerics inside EType Parameters [467816] (target milestone: ---)
- EMFModelProvider is caching too eagerly [469492] (target milestone: ---)
- Erroneous jar file for the doc plugin [470548] (target milestone: ---)
- Default instances of IModelResolver and IModelMinimizer are internal [471024] (target milestone: ---)
- Comparison of isolated model includes new remote models even if not related [471592] (target milestone: ---)
- test testDemandShutdownWithLongRunningTaskThatInterruptsImproperly is uncertain [474773] (target milestone: ---)
- Refined diffs shouldn't be merged on accept all when refining diff is in conflict [479407] (target milestone: ---)
- proxies unresolved on one side should not cause differences [488745] (target milestone: ---)
- Factorize the "isUnset" checks [497690] (target milestone: ---)
- The EMF Compare documentation is not available in the Neon Help Center [499405] (target milestone: ---)
- AbstractMerger.
SUB_DIFF_AWARE_OPTION should not be considered in Git merge [507952] (target milestone: ---) - Let clients register FeatureFilters to be used in DefaultDiffEngine depending on a comparison context [510392] (target milestone: ---)
- UML extensions can not properly merge changes in certain cases that involve "subsets" [511448] (target milestone: ---)
- ResourceSetHooks need more information to trigger properly [515445] (target milestone: ---)
- logical model resolution won't work on remote resolutions for custom metamodels [518682] (target milestone: ---)
- ID function for IdentifierEObjectMatcher should not be restricted to Strings [520153] (target milestone: ---)
- Identifying and structuring matches should be separate steps [520155] (target milestone: ---)
- EMF Compare NullPointerException in compare session [521103] (target milestone: ---)
- Documentation is outdated on accesses to EMFCompareRCPPlugin [521358] (target milestone: ---)
- Open API to allow redefinition of the IdentifierEObjectMatcher [528709] (target milestone: ---)
- EMF Compare may not needs to handle Ecore XMI Content Type [534250] (target milestone: ---)
- Allow intramodel merge in XMI [539378] (target milestone: ---)
- Insufficient support for add-add conflict resolution [545187] (target milestone: ---)
- EMF Compare Oomph setup contains non existing update site [549478] (target milestone: ---)
- NPE on git merge [559633] (target milestone: ---)
- IllegalStateException in ReferenceChangeMerger: Couldn't add in target because its parent hasn't been merged yet [568373] (target milestone: ---)
- Comparison.
getMatch(e) can return null and cause various NPEs [577000] (target milestone: ---) - Pre-merge on Papyrus models may delete representations of deleted elements with no way of restoring them [475587] (target milestone: ---)
- Facade models for language customizations [521930] (target milestone: ---)
- Please wait gets stuck on new added resource [522101] (target milestone: ---)
- Real instead of pseudo conflicts on containment ref changes when resource attachment change involved [493819] (target milestone: ---)
- Detection of a Resource move when there is none [494027] (target milestone: ---)
- ADD.
ADD conflicts with children pseudo-conflicts lose children when merged [510239] (target milestone: ---) - Support of redefinable elements [512514] (target milestone: ---)
- Update Documentation regarding latest TreeContentMergeViewer [510430] (target milestone: ---)
- StackOverFlowError on three way comparison [486923] (target milestone: ---)
- EMF compare fails to open ecore contained in gerrit review [514198] (target milestone: ---)
- Trying to merge models that refers to projects out of current git repo causes IllegalArgumentException [469365] (target milestone: ---)
- IdentifierEObjectMatcher doesn't add non-matches to a comparison if it has no delegate [433886] (target milestone: ---)
- having the comparison progress bar as a background operation [199166]
(target milestone: Kepler M7) - Display Bug.
Defective update of window [206461] (target milestone: Kepler M5) - EMF Compare doesn't allow editing model when opened in EGit Merge Tool [366553]
(target milestone: Kepler M5) - Properties views are not appropriate when comparing large string attributes [378352]
(target milestone: Kepler M5) - Paint problem with the "diff rectangles" [392568]
(target milestone: Kepler M7) - The MatchResource items displayed in the UI have their text trimmed too much [396257]
(target milestone: Kepler M5) - The structure merge viewer should not unload all resources at dispose time [396260]
(target milestone: Kepler M7) - Allow the editing of textual attribute [398083]
(target milestone: Kepler M5) - Enhance readability of the structural differences [398099]
(target milestone: Kepler M5) - Provide content merge viewer for resource attachment changes [398360]
(target milestone: Kepler M5) - The save action does not work in a content merge viewer different from TableContentMergeViewer [398405]
(target milestone: Kepler M7) - Copy All Non-Conflicting Changes action does not work [398412]
(target milestone: Kepler M7) - Control.
Uncontrol differences are not detected from the user interface [398887] (target milestone: Kepler M7) - NPE when switching from TextMergeViewer to another merge viewer [399229]
(target milestone: Kepler M5) - Save as "emfdiff" does not work with local (or scm) history [399270]
(target milestone: Kepler M6) - Let new actions be contributed to the StructureMergeViewer through extension points [399273]
(target milestone: Kepler M7) - Fragments are not resolved when comparing from the UI [399652]
(target milestone: Kepler M5) - CompareEditorInput doesn't work anymore [400234]
(target milestone: Kepler M6) - New filters and trees under groups [401659]
(target milestone: Kepler M6) - Expand and collapse structure merge viewer and content merge viewer sides [401854]
(target milestone: Kepler M7) - ConcurentModificationException after a merge of a difference in a Group [401870]
(target milestone: Kepler M7) - Display unresolved differences number in the 3-way comparison group [401873]
(target milestone: Kepler M6) - Improve the description of the features [402450]
(target milestone: Kepler M6) - Merge sub diffs when filter "Sub diffs elements" is active.
[402536] (target milestone: Kepler M6) - NullPointerException in SaveComparisonModelAction [403434]
(target milestone: Kepler M7) - Cannot save the merge of two models if the comparison is not launched directly on the models themself [403436]
(target milestone: Kepler M7) - java.
net. URISyntaxException if the file compared as a space in its path [403438] (target milestone: Kepler M7) - Update Conflicts group arborescence.
[404541] (target milestone: Kepler M7) - StackOverFlow error when merging a diff [405274]
(target milestone: Kepler M7) - NPE when expanding sub-differences [405885]
(target milestone: Kepler M7) - Diff not selected in TreeViewer [406201]
(target milestone: Kepler M7) - Item doesn't collapse after slecting a new diff [406310]
(target milestone: Kepler M7) - SingleStructuralFeature Item doesn't highlight when selecting in StructureMergeViewer [406401]
(target milestone: Kepler M7) - Copy all right to left doesn't do anything.
[406445] (target milestone: Kepler M7) - Allow selection of the "placeholders" [406513]
(target milestone: Kepler M7) - Textual merge does not set dirty state [406536]
(target milestone: Kepler M7) - Edition of textual differences [406537]
(target milestone: Kepler M7) - NPE when using groups [406539]
(target milestone: Kepler M7) - Diff not selected in content viewers [406540]
(target milestone: Kepler M7) - Compare with > each other
cannot merge [406541] (target milestone: Kepler M7) - Cannot merge after saving [406548]
(target milestone: Kepler M7) - CCM with merge all [406634]
(target milestone: Kepler M7) - Undo unavailable after two consecutive "merge all" [406644]
(target milestone: Kepler M7) - diff "disappears" from the UI after a merge [409289]
(target milestone: Kepler RC1) - delete shows an objet on both content side [409290]
(target milestone: Kepler RC1) - Exporting comparison model fails after a merge [409293]
(target milestone: Kepler RC1) - Add color preference for EMF Compare viewer [426975]
(target milestone: Kepler M6) - In-line editing [193946]
(target milestone: Kepler M5)
- Invalid thread access when the command stack is modified outside the EMF Compare editor [409262] (target milestone: Kepler)
- Non-Deterministic SWTException when opening CompareDialog without differences [474033] (target milestone: ---)
- Eclipse Freeze when canceling CompareDialog for new XMI-Instances [474040] (target milestone: ---)
- SWT error when accepting a conflict on linux [480310] (target milestone: ---)
- Undo action doesn't work during comparison in dialog view [480400] (target milestone: ---)
- NullPointerException in DropDownMergeMenuAction.
setTextAndImage [498413] (target milestone: ---) - Provide predefined filter that hides formatting-only changes in a diagram [505784] (target milestone: ---)
- some move differences or sub-differences of move differences are not located in tree content viewer [508719] (target milestone: ---)
- EPackage.
eClassifiers ordering ignored in display [412095] (target milestone: ---) - EMF Compare crashes Eclipse when opening comparison editor [432130] (target milestone: ---)
- Pseudo conflict difference labels are not correct [435051] (target milestone: ---)
- Present ordered comparison [439806] (target milestone: ---)
- Provide language-specific content merge viewer e.
g. for Java, OCL and C [459011] (target milestone: ---) - UI Improvement - icons "left to right" and "right to left" are misleading [463096] (target milestone: ---)
- Make sure that long-running git merge operations can be canceled at any time [463260] (target milestone: ---)
- Refactor Merge Actions algorithms [468320] (target milestone: ---)
- Looking for uncommitted changes can take for ever on XMI files [470219] (target milestone: ---)
- After accept all non-conflicting changes, some icons of merged diffs.
are not updated [479401] (target milestone: ---) - Consistently check for subclasses of UMLDiff in UMLRefinedElementsFilter [489957] (target milestone: ---)
- Stereotypes not displayed in SMV [494763] (target milestone: ---)
- interactions between pseudo-conflict and cascading filters prevent merging [496174] (target milestone: ---)
- Document the "exceptional" merge cases [496287] (target milestone: ---)
- Rejecting an addition can leads to the modification of its containing match [501567] (target milestone: ---)
- Problems using the UI compare with dynamic Ecore models [511549] (target milestone: ---)
- unload resources out of the UI thread [515182] (target milestone: ---)
- Toolbar button for navigating to next .
previous unresolved diff missing [516248] (target milestone: ---) - When the Conflict group is fold up, the editor can loose tracks of user changes [517438] (target milestone: ---)
- Sort Matches regarding deleted Elements in SMV [518878] (target milestone: ---)
- Remove the cascading filter [522063] (target milestone: ---)
- Rigth Taversal override with Base traversal when combining two independent logical models using workspace scope.
[525557] (target milestone: ---) - IdenticalResourceMinimizer only consider the name of the resource and not the full path [525558] (target milestone: ---)
- Potential NPE on the title builder [532231] (target milestone: ---)
- Add UI actions to merge all differences at once by getting a side's version [532438] (target milestone: ---)
- The EMF Compare UI should allow proxy resolution [532484] (target milestone: ---)
- Saving when the properties CMV is displayed doesn't work [547546] (target milestone: ---)
- EMF Compare doesn't display a content merge viewer for comparisons with only added.
deleted files [552997] (target milestone: ---) - NPE in EMFCompareConfiguration on UI disposal [558505] (target milestone: ---)
- MergeAction is disabled in content viewer [564765] (target milestone: ---)
- Duplicate "copyAll" actions prevent accepting differences when TextMergeViewer is shown first [581114] (target milestone: ---)
- Content merge viewer for Papyrus richt-text comments [458956] (target milestone: ---)
- Missing Diff in diagram conflict delete vs coordinate change [480437] (target milestone: ---)
- Folder comparison: local resources manager disposes images [508279] (target milestone: ---)
- Show all differences at once when comparing diagrams [491760] (target milestone: ---)
- Models marked as dirty even if commands don't change them [495875] (target milestone: ---)
- Editor isn't reloaded after saving (after merge of conflict(s)) [480286] (target milestone: ---)
- Make selection in compare editor available via page selection [477253] (target milestone: ---)
- AdapterFactory with lower rank is permanently favoured if it was loaded first [487591] (target milestone: ---)
- Disable toolbar actions if no diff is visible.
selected [515818] (target milestone: ---) - Text Compare may diff wrong file in model comparisons involving multiple files [508526] (target milestone: ---)
- Dysfunctional "accept contained non-conflicting changes" (--> data loss) [512805] (target milestone: ---)
- Filter diagrams from PapyrusTreeContentMergeViewer [514679] (target milestone: ---)
- Allow to resolve multiple conflicts with one click [516259] (target milestone: ---)
- Empty SMV tree causes IndexOutOfBoundsException in EMFCompareDiffTreeRuler [521940] (target milestone: ---)
- Support changing the state of a diff already in a terminal state [521948] (target milestone: ---)
- Auto expansion and expand all in SMV can lock the UI thread for a long time if large SMV trees [522372] (target milestone: ---)
- Toolbar of content merge viewer is incorrect after group switch [522422] (target milestone: ---)
- Selection in tree content merge viewer doesn't work for deletion of object when swapped [527858] (target milestone: ---)
- Connecting lines in tree content merge viewer break if accepting deletions [527864] (target milestone: ---)
- Add a preference page for Resource Set Hook [508214] (target milestone: ---)
- Allow opening Model Merge Tool from Papyrus node if it contains a conflicting resource [512835] (target milestone: ---)
- Merge actions are enabled but don't do anything for diffs in terminal state [512948] (target milestone: ---)
- Applicability of DiffAccessorFactory.
MatchAccessorFactory not specific enough [543707] (target milestone: ---) - The extremity of the edge phantom should be attached to an other phantom and not to (0,0) [416115] (target milestone: ---)
- Create delta reports based on a Merge operation [488697] (target milestone: ---)
- The Sirius technical elements filter needs to be revised [532398] (target milestone: ---)
- Styling of stereotype elements not applied [485197] (target milestone: ---)
- Allow users to specify the zoom level of diagrams and synchronize the zoom leven [529882] (target milestone: ---)
- Edge reorientation is not recognized as a graphical change [450096] (target milestone: ---)
- ResourceAttachmentChanges between uml and notation files should be linked [510724] (target milestone: ---)
- Addition of message conflicts with move of unrelated message in sequence diagram [507679] (target milestone: ---)
- Move Papyrus-specific plugins to Papyrus project [515373] (target milestone: ---)
- Overriding CSS style gives unexplained EAnnotation addition in Comparison editor [509068] (target milestone: ---)
- .
. . . . references fail in EGIT Head compare [367475] (target milestone: Kepler M5)
- Static profiles involve unhandled ecore.
genmodel comparison [488880] (target milestone: ---) - ProjectModelResolver shouldn't use content-types [417425] (target milestone: ---)
- Limit the number of IO operations when computing local model [470709] (target milestone: ---)
- Model resolving - reduce IO from updating graph [470792] (target milestone: ---)
- Comparison with new remote projects [479206] (target milestone: ---)
- Improve Default Model Inclusion Strategy [532437] (target milestone: ---)
- Git tests failing [542079] (target milestone: ---)
- Comparing with previous version does not use the correct revision.
[437049] (target milestone: ---) - Incorrect differences reported when git repo is in merging state with conflicts [464160] (target milestone: ---)
- Flaky test ResourceComputationSchedulerWithEventBusTest.
testDemandShutdownWithLongRunningTaskThatInterruptsGracefully [515591] (target milestone: ---)