Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-01-14[Releng] Bump to 0.14.0Tu Ton8-8/+8
Change-Id: I7bcef52e243e9ab03267af009ec7567a6885abf0 Signed-off-by: Tu Ton <minhtutonthat@gmail.com>
2020-03-27[releng] Support deploying to Eclipse NexusOlivier Constant1-0/+1
- Add parent relative path in all cases Change-Id: I31ca37d2e239acc1e95db155963d04fe60a32a9d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-27[releng] Support deploying to Eclipse NexusOlivier Constant7-289/+11
- Reverting build changes, just keeping Nexus params Change-Id: Id2d3048bd1081e81a1338fee02dc57bf809c5513 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-26[releng] Support deploying to Eclipse NexusOlivier Constant7-11/+289
Change-Id: I05a9d3f9d8f57b3887962076da2ae5b5abfc21e2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-26[releng] Upgrade version to 0.13.0Olivier Constant8-8/+8
Change-Id: I8c2f1165cbe30203157ba23a508b6e8f79515967 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-30Merge branch 'master' into genericOlivier Constant6-11/+11
Conflicts: releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target Change-Id: Ia5f05d21fd9d7a70f1c6ee3d93ae690a47e86e18 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27[releng] Lock license version in featuresOlivier Constant6-11/+11
Change-Id: I975ec17c698b97cbf07ff88a38ebe3d2c970b7b6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-24[releng] Update of copyrightsOlivier Constant21-28/+28
Change-Id: I5046d9d9427185c7a0203a8dc32861b873f88c43 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-18[releng] Update of copyrightsOlivier Constant21-28/+28
Change-Id: I6b83a64f7ab906e77b1dd99930907dbb8e5549be Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-09Merge branch 'master' into genericOlivier Constant3-51/+51
Conflicts: plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I245f43dfdf549ed428446ab451c38c54e84df6e2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-07-17[releng] Upgrade version to 0.12.0Olivier Constant8-8/+8
Change-Id: I9047c624a97ce799ff82ae259d14c738417bf2e6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-07-16Merge branch '0.11.x'Olivier Constant11-59/+59
Conflicts: releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I9711d30d104f3fb7e63e125e1a7400d6d0b4f246 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-04-18[releng] Upgrade version to 0.11.2v0.11.2Olivier Constant8-8/+8
Change-Id: I5e7a400daa3af6603ded47ccaf4578efa4adbdf7 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-04-01Bug 544000 - Make EDM applicable to non-EMF dataOlivier Constant8-9/+23
[releng] Updated build and feature + upgraded version to 0.12.0 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-03-26[releng] Upgrade version to 0.11.1v0.11.1Olivier Constant8-8/+8
Change-Id: If8303f285b2694566152dd9ddf562a857b9d5993 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-03-20Bug 544000 - Make EDM applicable to non-EMF dataOlivier Constant6-78/+0
Fixed getComparison() Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-02-22Bug 544000 - Make EDM applicable to non-EMF dataOlivier Constant6-0/+78
Fixed pom.xml and runtime cast exception Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 538800 - Upgrade version to 0.11.0Olivier Constant10-10/+10
- diffmerge.core Change-Id: I150287451def2fc22b9889edaef25d110db37b39 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 535213 - Switch to EPL-2.0Olivier Constant42-2873/+4634
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-28[releng] Update of contribution/notice files and copyright noticesOlivier Constant15-17/+59
Change-Id: I8fce49cd0fbe1bd2a201e7413cf74beb4cf5ca30 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-25[releng] Update for 0.10.0Olivier Constant8-9/+8
Change-Id: I73e1e8dc15eb1326600e0903bd1c2c09d8f4e563 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Reverted version upgradeOlivier Constant2-2/+2
Change-Id: I9c7ff33fb5f5f5192d0637c494dfdb2a3b4ddd66 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Bug 532614 - Rebase conflicts lead to an NPEOlivier Constant2-2/+2
Change-Id: Ib18ee639207f5970d12f4a85f93b86d899b0fdc2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Removed SVN integration from the main featureOlivier Constant1-6/+2
Change-Id: I79fcaa950b6bbf28575feb3aa7c3908040fc6225 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-09-05Releng update for 0.9.0Olivier Constant8-8/+8
Change-Id: Ie57819e13d32d6db218a623b7e2d6d3c62483b94 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-09-05Bug 521872 - Extend relation data structures with memoization and recursive ↵Olivier Constant1-0/+7
definitions Change-Id: I2a340d34e56479506ce8e69b103f74bd094516e5 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-08-25Trivial fix on feature copyrightsOlivier Constant11-11/+11
Change-Id: Id9db359eae11de6a9a7bb9ebf2062572b9b80ecf Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-06-09Updated copyrightsOlivier Constant5-5/+5
Change-Id: I1dd4cb74fc5dcb9ce75b981f42460d5ee17470f1 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-05-26[500320] Fixing license settings in featuresZoltan Ujhelyi6-1/+25
When the original builds were updated to use the common license-feature provided by CBI, the license property requirements were removed by mistake. The GMF feature includes this required property. Change-Id: I29c3a738f0d5f8d56d2572ba56ceab66c52a2c4c Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
2017-03-29[514383] Contribute EMF Diff/Merge documentation from CapellaTamas Borbas2-0/+8
the content is copied from the Capella repository http://git.polarsys.org/c/capella/capella.git Capella specific parts are removed or replaced it is integrated into the maven build Bug: 514383 Change-Id: Iaa7b4100478570af3ee14fb0c5b62db0854177b3 Signed-off-by: Tamas Borbas <tamas.borbas@incquerylabs.com>
2017-03-24Version update: 0.8.0Olivier Constant8-8/+8
Change-Id: If6d034c9b053f5870ae0f669fbea14598ba22aea Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-03-17[releng] remove tests feature from SDKAbel Hegedus1-4/+0
The tests feature seems to have been unintentionally added to the SDK. Make UI test project a plugin to add it to tests Targlet, along with tests.customization. This will make Oomph Targlet import it. Change-Id: I68de1f226803d7c591b61e586e3547dd60d9bfd1 Signed-off-by: Abel Hegedus <abel.hegedus@incquerylabs.com>
2017-03-04Integration of Sirius customization from Capella and releng updateZoltan Ujhelyi44-1921/+827
Change-Id: I55640602e6e84a731b534057f1220ad9980e5f95 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com> Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
2017-01-30[500320] Upgrade build Zoltan Ujhelyi27-883/+1166
maven experimentation Bug: 500320 Change-Id: Ie99b159e35181ca61244533627658e3361312601 Signed-off-by: Matthieu Helleboid <matthieu.helleboid@thalesgroup.com> Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
2016-06-27Clean-up and renaming for 0.7.0Olivier Constant8-54/+54
Change-Id: I9a5e5890160294be8afc908afca63f588c52b65d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-06-20Removed Perforce connectorOlivier Constant10-1034/+0
Change-Id: Ia06fcdb468b8c566b3d4d4a0168537afc0c3f0d7 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-05-23Build support for SCMs (attempt 2)v0.6.0Olivier Constant2-64/+54
Change-Id: I7ef640466d3fc966ca4791b3ad53826c7e3aca72 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-05-23Added features for SCMs other than GitOlivier Constant30-0/+3115
Change-Id: I92c7831a6b54fee6bc3323c5fd8bae4bdabc6255 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-04-21Build support for EGit integration (attempt 4)Olivier Constant1-4/+4
Change-Id: Ia336aad4eaef1d47198e3e4271772db915b2c3d6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-04-21Build support for EGit integration (attempt 3)Olivier Constant2-6/+16
Change-Id: I0e781029f67a2bd1b428b4d5991a58120084915e Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-04-21Build support for EGit integration (attempt 1)Olivier Constant11-10/+1041
Change-Id: I9cc428a505e5af3ddfab03a9c04084d27026417f Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2016-03-17Updated copyrights and featuresOlivier Constant6-146/+153
Change-Id: Id82bbb9cecd656ce8b348dec53b66fde6c24aab0 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2015-09-23Incremented version to 0.5.1Olivier Constant2-54/+54
Change-Id: I15cfcc1b246c8aa42c9d4fa6e291b1d08f7ebf38 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2015-04-20Incremented version to 0.5.0Olivier Constant2-3/+3
Change-Id: Ib0ef0e83fdfa034c7f0e3d5e0e6f3594d1b19726 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2015-03-04Increased feature+core version number to 0.4.1Olivier Constant2-62/+62
Change-Id: I17c46bebad0c9ca8c75a9814d3c3f96d621a554a Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2014-09-02Updated feature category for v0.4.0.Olivier Constant1-3/+3
Change-Id: I1a089b731c4d47be36b895cd19d4e9162adc9508 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2014-09-02Increased version number, updated copyrights, updated .gitignoreOlivier Constant2-53/+53
Change-Id: Ia9bd69484ba5983040389893e5debb14cf3b77c6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2014-04-24Bug 433376 - Update the Software User AgreementOlivier Constant4-306/+301
Change-Id: I4c976da2eae9047cd234dafa41ae840003391a93
2014-03-11Bug 430124 - Category of Update Site is incorrectOlivier Constant1-2/+2
Change-Id: I2929d7f097f16f44d62d3ca143ed9d8388d0df8f
2013-09-10Bug 416949 - Delete duplicate information in modelOlivier Constant1-1/+1
Bug 416916 - Warn users of duplicate match IDs Increased versions to 0.3.0

Back to the top