Skip to main content
summaryrefslogtreecommitdiffstats
path: root/org.eclipse.emf.compare-parent
AgeCommit message (Collapse)AuthorFilesLines
2019-09-18Bump to 3.3.9lgoubet4-5/+5
Change-Id: I71dcf57ca08878c2a46e8d2f594500a2048c2c2b
2019-09-11Update setup filelgoubet1-14/+7
Bug: 549478 Change-Id: I5ce44923b2d904df6d7b6abd616bfb691bbdd024
2019-09-10Target platform based on 2019-063.3.8RC13.3.8lgoubet6-5/+162
We need to switch to tycho 1.4.0 to build against such a platform Change-Id: I8adc6e212801a736c6d293a6b5269b03edc00377
2019-09-09Remove the 32 bit platforms for our target configurationslgoubet1-10/+0
Change-Id: I37f41e29d992036012dd64098dfe5a9f88225d3d
2019-07-10Bump versions to 3.3.83.3.8M1lgoubet4-5/+5
Change-Id: I1fdea8b2deb42916ee25689914386fc9b4880bbd
2019-03-21Bump EMF Compare to 3.3.7 in preparation for 2019-063.3.7M1lgoubet4-5/+5
Change-Id: I019d6a0d2750416baa640cae3f854b33aeb9ca77
2019-02-26Bump versions for 3.3.6 for 2019-033.3.6M33.3.6lgoubet4-5/+5
Change-Id: Iecff93ea50642e4d83b650acccc587cb2082a9eb
2018-12-03Bump versions to 3.3.5lgoubet4-5/+5
Change-Id: I66b4134d4385fa4a42952039db437b701c075d84
2018-12-03Use a released version of Siriuslgoubet2-2/+2
Change-Id: I6515db5f58e1e7973d51907c08517f52f8d68112
2018-06-22bump feature versions3.3.4M13.3.4lgoubet4-5/+5
Change-Id: Ia9adaa877d6f3c00032b3c7fc7d7bf42766445a6
2018-03-13Removing the subversive integration pluginslgoubet8-10/+0
The subversive integration has never been thoroughly tested, and subversive is currently in the process of being removed from the release train. Change-Id: I9fbde5fb03f870f34b804dc32b11efb275c6db9a
2018-01-30Bump plugin and feature versions for Photon3.3.3M5lgoubet4-5/+5
Change-Id: Ia16da9144a488ccd63ff4d83738b445cc82ff4c6
2018-01-24Removing the Papyrus plugins and features from the EMF Compare gitlgoubet4-26/+2
These plugins have been moved to the Papyrus git repository and can now be removed from EMF Compate itself. Change-Id: I8ac478d68cad4f6c263122161943d6230bae18e8
2017-09-28Switch to official SysML releases in Oxygen targetPhilip Langer2-5/+6
We have to switch to the SysML releases repository as we run into ambiguous dependencies to org.eclipse.papyrus.uml.diagram.sequence since Oxygen.1 otherwise. SysML 1.4 however is not compatible with the ProfileMigrationTest. Thus, we have to ignore this test temporarily until it has been migrated to SysML 1.4. Change-Id: Iecccf5e93aafe99654543a5e2c30b2e9c4f0168a Signed-off-by: Philip Langer <planger@eclipsesource.com>
2017-09-08[515581] Make test plug-ins available from the update-sitePhilip Langer1-0/+2
Add feature org.eclipse.emf.compare.tests-feature, which contains all relevant test plug-ins, including their sources. Also removes an unnecessary plug-in dependency to SysML from uml2.tests. Change-Id: Ica529319eebd2393fe9d66384b9b771f08a69650 Signed-off-by: Philip Langer <planger@eclipsesource.com>
2017-09-04[521845] Fix Eclipse Platform requirement in Oxygen TP.Christian W. Damus3-94/+94
Ensure that the TP on Mac platform includes the binaries that the PDE's target resolution will attempt to chmod, to avert total failure of the target platform resolution. Bug: 521845 Change-Id: I2ab390f9a10b8a2c4ca9409e7906e617fe9606e4 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
2017-08-23Bumping versions for Oxygen.13.3.2RC1Laurent Goubet4-5/+5
Change-Id: I9c994b3e0e7f661741cbe2005c6039a61b385f36
2017-08-23Removing non functional profiles from pomLaurent Goubet1-63/+0
Change-Id: Iea70c4e4d00e6db35795bd11c031c2a70acb4983
2017-08-22Separate core & extra buildsLaurent Goubet17-404/+172
Papyrus and sirius are "polluting" the target platform and preventing some of our builds to succeed. This will allow us to build the core EMF Compare separately from the support for extra tools while also decoupling our target platforms. Change-Id: I0f783a21c3333f7dc77cbe28539dfc08b28eac67
2017-07-06[519261] [Oomph] Setup model problems for OxygenChristian W. Damus1-9/+39
Add target platforms for Neon and Oxygen. Fix the EclEmma feature. Fix the JRE version. Add working sets for Papyrus and Git integrations. Bug: 519261 Change-Id: If0d2732237acde648d2432b3b9c2ca37a8ddd57b Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
2017-07-06[519170] [Checkstyle] Author format constraint is too restrictiveChristian W. Damus1-1/+1
Allow more flexibility in the name (still at least two names required, even if one is an initial) and in the e-mail address. Use a beginning-of-input anchor to try to enforce the e-mail tag format if there is anything before the name. Bug: 519170 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com> Change-Id: I199d6eef474b5bb3755bd2e1d5ea826c3ac61913
2017-07-06Use the released version of EGitLaurent Goubet5-178/+179
Change-Id: I3ece48b241398bd3aa7cffb273dbda430c85feb1
2017-06-06Update Oxygen target to new SysML 1.1 update sitePhilip Langer2-3/+6
SysML has been moved - see bug 516687 Change-Id: I07b1b66bc92f7e2735ab6cd7224fed89f26d9641 Signed-off-by: Philip Langer <planger@eclipsesource.com>
2017-05-11Compatibility with guava 21Laurent Goubet2-9/+9
- Objects.ToStringHelper has been moved to MoreObjects. We now reimplement the functionality in order to be compatible with both guava 15 and guava 21 - com.google.common.base.Predicate now extends java.util.Function.Predicate. As a result static imports of "and" and "or" from Predicates are shadowed by java.util.function.Predicate variants, preventing the statics from being called unless explicitely qualified. Change-Id: Ie33d5eedd9e1a6dbea8f4af2db9aa36ec8567cf5
2017-04-07Bump versions for EMF Compare 3.3.1Laurent Goubet4-5/+5
Change-Id: Iabc80b8657f790bf7702d1dc36ee6f6202e1ee09
2017-04-07Make sure we cannot import unsupported guava versionsLaurent Goubet1-0/+3
Change-Id: If76b9cb0a91180ebfb7208f10bdcc84d5901bd9a
2017-03-22[513915] Switch to Papyrus nightly build for Oxygen streamPhilip Langer2-61/+61
Bug: 513915 Change-Id: I43c2ad1ce5f0f231d98c92e3c00b620823b43368 Signed-off-by: Philip Langer <planger@eclipsesource.com>
2017-01-24Depend on JDK-7Laurent Delaigue1-1/+1
Change-Id: Ica2dbe31ebbafed7c52134258afc4b4b834464af Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2016-12-08switch neon tp to fixed update sitesLaurent Goubet2-8/+8
Change-Id: I9fa6d35d42905153a5b32c4190a3e9db3038b042
2016-11-22Use obeo's github instead of axel'sLaurent Goubet6-6/+6
Change-Id: Iec31d505d3f27648dce4cf554f07635695771bde
2016-11-21Use tycho 0.26Laurent Goubet1-2/+2
Change-Id: I60c2cc13882e7be6b87c68cf3f480199f3263daf
2016-11-03Don't build the update site unless it's using the latest tpLaurent Goubet1-6/+1
Change-Id: I9b0448a08a72c959db395853c12798befd8be385
2016-11-03First version of an Oxygen tpLaurent Goubet3-1/+159
Change-Id: Ibbf420de0faa672826c2f186d3d171bac40f54ab
2016-09-14Bump versions for EMF Compare 3.3.0Laurent Goubet4-5/+5
Change-Id: If58253d9e062b447173cb5a6ed26afe953a364f9 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
2016-07-07update tp to follow UML designerLaurent Goubet2-3/+3
Change-Id: I74d44a3114b036b736d3ce5dbb710dd590bce941
2016-07-01[495259] Add support for UML profile migration scenariosMartin Fleck7-109/+126
Integrate the model repair capabilities of Papyrus using a resource set hook. For any missing stereotype, we aim to find an available profile definition (EPackage) that provides the stereotype from the package registry. Local workspace profiles are not considered. If possible, we use the ProfileNamespaceURIPattern available in Papyrus since Neon to find a suitable profile definition. Otherwise, we use a distance measure. Extend the UMLPostProcessor to also consider the profile annotation URIs of the origin side. Extend test suite to support resource set hooks and provide more information through the test support class. Includes tests based on SysML models. SysML added to target definition. Bug: 495259 Change-Id: I49e301190f54e825336b0667d618c301e7d7b11e Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
2016-06-15Switch to Eclipse mars.2Mathieu Cartaud2-272/+285
Format all non generated classes to get ride of formatter incompatibilities Migrate checkstyle config for checkstyle 6.19 Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
2016-05-31Add EMFCompare specific runner for runtime testsMathieu Cartaud1-0/+3
Makes it easier to write tests that involve comparisons or git merges and to run them with several configurations. Change-Id: I5d45d86c854f0e2d994702275ab155a84468e8b6 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
2016-05-31[493650] Fix order of merged childrenLaurent Delaigue8-15/+20
Improved after discussion with Laurent Goubet. A test is added to check that when merging every diff and resolving conflicts by: - first reject all target side conflicting diffs - then accepting all other diffs yields models to be identical on both sides, no matter in what order the diffs are accepted/rejected. The test uses Collections2.permutations, which appeared in guava 12, so an update of the TP was necessary. Bug: 493650 Change-Id: Ib790b992184f6038806bf890f7af96ae2c447ca7 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2016-05-30Remove jdt.annotations from Target PlatformsLaurent Delaigue4-6/+2
Change-Id: Iff7950d25a73bcc50b138d38b1a74b3247908e6c Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2016-04-01Update Neon target fileAxel Richard1-56/+57
Change-Id: Ifacaa3b9eea2cb90a1396e5ab4fd4bbda6026103 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
2016-02-29Fix target platform for marsLaurent Delaigue2-54/+55
Change-Id: I49b778636c14721f554cedcb71b667ae0cc494bf Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
2016-02-19Add Google GSON in target platform (required by JGit)Mathieu Cartaud2-1/+3
Change-Id: If694e5c7296b1bec13a5c24a5a4bd5c4590f7e9f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
2016-02-15[473985] Enable comparison dialog in pure e4Stefan Dirix1-0/+1
Removes all runtime dependencies to the workbench which allows the comparison dialog to run in pure e4 applications when platform/compare is modified in the same way. Adds a new org.eclipse.emf.compare.ide.ui.e4 bundle which contains modified versions of org.eclipse.ui.progress classes. This bundle is only required for pure e4 applications. Bug: 473985 Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com> Change-Id: I8610a1d27e51dd954fd88edcdfed08fedd9b2d98
2016-02-08Cope with API changes in PapyrusLaurent Goubet1-1/+1
Some of the classes we depend on have been moved from *sasheditor* to *sashwindows*. This commit also touches the target platform file to force eclipse into reloading it on checkout. Change-Id: I31ed0f1179b27c81b5e84301021bd2007a764070
2016-01-21target platform for NeonLaurent Goubet3-2/+151
Change-Id: Ib6c91f967f843ee9955206dd669e20c70685fbcb
2015-12-24Add experimental support for Sirius diagram comparisoncbrun9-4/+78
This commit adds preliminary support for diagram comparison for Sirius based modelers. - introduce the corresponding plug-ins - introduce a new installable feature bringing these capabilities - introduce a filter enabled by default to hide technical parts of the Sirius model. - introduce a post processor which setup basic diff refinements and requirements - declare the .aird file as a model EMF compare should handle. Current status : - diagram differences are displayed using the graphical editor as one would expect (tested with EcoreTools 3.0.0) - no specific logical model support is wired yet regarding the .aird file - merging the diagram content will probably not be ok as some requires and refinements are still missing from the post processor. - no tests yet but as this brings back support to a recent version of EcoreTools we should be able to add RCPTT tests fairly easily. - feature and plugins are branded as "Experimental" Change-Id: I705e4ec3ac18fa6ddb7ccfec6fc24aec95c4c8c7 Signed-off-by: Cedric Brun <cedric.brun@obeo.fr> Also-by: Axel Richard <axel.richard@obeo.fr>
2015-10-21Add SWTBot to Mars Logical target platformsAxel Richard5-2/+25
Allows to add new SWTBot tests on EGit side Change-Id: I06c2344286dd585bd00ef47e1041cd4088a9692f Signed-off-by: Axel Richard <axel.richard@obeo.fr>
2015-09-24[476207] Handle Move kind for ResourceAttachmentChangesAxel Richard1-0/+1
EMFCompare currently does not consider situations where resources may have multiple root EObjects and these objects are moved between resources. As for ResourceLocationChange, the ResourceAttachmentChanges of kind Move are only detected for non-local comparison. Change-Id: I04160e5bf64c6a84bdd963693719cd4483c50479 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
2015-09-23Model Merge Tool + classes to do model merges with EGitMathieu Cartaud1-0/+1
Introduce classes to be able to perform merges interacting with EGit from code hosted by EMFCompare. This will allow us to abandon reviews 22674 and 22672 in EGit. Change-Id: I28e96903c09206f34b510f3c08ec93d7fb91eba0 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

Back to the top