Bump versions and fix new plugins for Mars M3

Change-Id: I068b7bbe616aca47e490a597de4b3e78006ee229
Add missing copyrights

Change-Id: Idf3ab05962b4f53a66216a0825fa8b9ef28f228a
Fix the "copy all non-conflicting" actions

This will ensure that the two "copy all" actions from the
EMF Compare UI will merge only the differences that are
neither in conflict nor depending (directly or not) from a
difference that is in a real conflict with another.

Change-Id: Ia6e70c660e4e952a5b4bb8a3fcf414d1b6778894
[449162] Fix IllegalStateException: The resource set is disposed

Bug: 449162
Change-Id: I6dfebe9e66d296229b3fa99267a9c33ef699c8cd
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Also-by: Laurent Goubet <laurent.goubet@obeo.fr>
Merge "[449162] Fix IllegalStateException: The resource set is disposed"
Various API issues

Change-Id: I90b2bb9d1264046589c95e505b9c91c52927a317
[449162] Fix IllegalStateException: The resource set is disposed

Reverts change I6dfebe9e66d296229b3fa99267a9c33ef699c8cd to
patch set 1.

Bug: 449162
Change-Id: Ic874d60f5a971c317652ad073987bb6526c6e90e
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Also-by: Laurent Goubet <laurent.goubet@obeo.fr>
[451048] Avoids IllegalArgumentException for custom diff types

Makes sure that DiffUtil.getTargetFeature and
DiffUtil.getTargetContainer is only called for supported diff types but
not for potentially added custom diff types.

Bug: 451048
Change-Id: I02bc4048ade54120864e2154aa5dbb146e02bc4f
Signed-off-by: Philip Langer <planger@eclipsesource.com>
[450949] Avoid shortcuts in DefaultDiffEngine for certain FeatureMaps

Changes in FeatureMaps should be merged via FeatureMapChanges in the
FeatureMapChangeMerger. In cases of added / removed elements the
DefaultDiffEngine prevents the calculation of required FeatureMapChanges
since they only affect attributes of those elements. This leads to
ordering problems since the ReferenceChangeMerger can not handle
FeatureMaps properly. This fix removes the calculation prevention for
these cases.

Includes testcases for this issue.

Bug: 450949
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: Ie21a54c2e08b27bcc421f1c28d42e542407b990d
The ConflictMerger ranking should be above that of most others

As it was, the conflictmerger was nerver called for custom diff types
such as UML reference changes, which were merge through
UMLReferenceChangeMerger. This lead merge operations through the UI to
merge one side of the conflict while ignoring the other (instead of
rejecting it). The UMLReferenceChangeMerge (or other custom mergers)
will still be called, but only through the proxy of the ConflictMerger.

Change-Id: I0625b3c3b96f967c8b86edee360cc6d1b355c28c
[441172] Extend findMasterEquivalence to not only check eOpposites

Currently the findMasterEquivalence method only considers equivalences
whose reference is the eOpposite of the given diff. But sometimes the
equivalence's reference is the same as the one given by the diff. The
findMasterEquivalence method is extended to handle these cases too.

Includes testcases for this issue.

Bug: 441172
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Also-by: Laurent Goubet <laurent.goubet@obeo.fr>
Change-Id: Ic3678939c0798c9993c41d329f6c0d4e4d098c27
Merge remote-tracking branch 'origin/master' into improved-fuzzy-test