Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
AgeCommit message (Collapse)AuthorFilesLines
10 daysMerge branch 'master' into genericHEADmastergenericPhilippe DUL3-7/+11
Change-Id: I388e9d4edc0551e37f90650d32ee95c5263c065b Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
10 days[releng] Update to latest Sirius stable 6.4.0-S20200921-043506Philippe DUL2-3/+3
Change-Id: Iefa07d92f286a1334da3dda0d2e8528b56dd6b95 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
2020-08-03[releng] Update Eclipse version to 2020-06 and Sirius version toTu Ton3-8/+12
6.4.0-S20200716-044517 Change-Id: I4a39f6d1602accfc766f30b9d676ceb1abea0ef1 Signed-off-by: Tu Ton <minhtutonthat@gmail.com>
2020-03-27[releng] Support deploying to Eclipse NexusOlivier Constant3-0/+3
- 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 Constant1-1/+0
- Remove releng/configuration from modules Change-Id: Ieab62b25ab05aeb3641a8451ea660b3b405232b8 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-27[releng] Support deploying to Eclipse NexusOlivier Constant7-11/+44
- 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 Constant3-3/+6
- Fix profiles Change-Id: I19436a4d72855301fa3caea4aa67dc6565e4bc88 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-26[releng] Support deploying to Eclipse NexusOlivier Constant4-40/+16
Change-Id: I05a9d3f9d8f57b3887962076da2ae5b5abfc21e2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-26[releng] Upgrade Tycho version to 1.6Olivier Constant1-1/+1
Change-Id: Ic7b5765a998dc8c3aa9e99d33b171c7cb5504083 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-03-26[releng] Upgrade version to 0.13.0Olivier Constant10-15/+15
Change-Id: I8c2f1165cbe30203157ba23a508b6e8f79515967 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-02-17Merge branch 'master' into genericOlivier Constant2-4/+4
Conflicts: releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target Change-Id: I41c8b1921fbe39400be8ace4dea364c0cada1088 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2020-02-17[releng] Update Sirius update siteOlivier Constant2-4/+4
Change-Id: I5dde91950e2db4a348f493157ed74e732fc0d021 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-11-27[releng] Fix standalone build due to Maven copy-resources bugOlivier Constant1-4/+0
Change-Id: I2e86f8181f6284f7bfd01288ef64edb8880aefdb Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-10-17Merge branch 'master' into genericOlivier Constant1-2/+1
Conflicts: plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/scopes/IPersistentModelScope.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/FragmentedModelScope.java releng/org.eclipse.emf.diffmerge.core.javadoc/.classpath releng/org.eclipse.emf.diffmerge.core.javadoc/.settings/org.eclipse.jdt.core.prefs releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF Change-Id: I3091c9e17106dd7614b4931223f88d8cfc47c5ed Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-10-02[releng] Fixed javadocOlivier Constant10-400/+270
Change-Id: If24b64cf9cf874686be84e545afa256b449698a2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-10-01[releng] Fixed build options and javadocOlivier Constant6-110/+89
Change-Id: If24b64cf9cf874686be84e545afa256b449698a2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-30[releng] Updated javadocOlivier Constant9-393/+299
Change-Id: I4098ed26818a0fd945204da0cba0f5ed2a03c4d9 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-30Bug 551630 - [releng] Support standalone deployment outside EclipseOlivier Constant2-8/+67
Change-Id: I572563f7aeb54312f8502450fb5486ad1138fea8 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-30Merge branch 'master' into genericOlivier Constant6-35/+150
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-30[releng] TP update to 2019-06Olivier Constant4-60/+56
Change-Id: I496ecdff51b49cee163a1d366a344e34024ab83a Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-28[releng] Fix J2SE-1.5 toolchainOlivier Constant1-2/+2
Change-Id: Ifd0de61591555f4b13f30bf4004496821a4deaca Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27[releng] Reverted to Tycho 1.0 to use Java 6Olivier Constant2-4/+4
Change-Id: Id16753cbb99ae78ef577b8928bb47dae911a71d8 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27Bug 551565 - [releng] Missing *.pack.gzOlivier Constant1-1/+1
Change-Id: I3f1200ad7290e051ce04c1412859cd2e8428a310 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27Bug 551565 - [releng] Missing *.pack.gzOlivier Constant1-2/+26
Change-Id: I2482aa1bea1788fd8f1d09d2afb6046e84ef5b51 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27[releng] Lock license version in featuresOlivier Constant1-1/+1
Change-Id: I975ec17c698b97cbf07ff88a38ebe3d2c970b7b6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27[releng] Enforce JDK through Maven toolchainOlivier Constant2-3/+97
Change-Id: Iaedd1944993423a7566169092c12b44556451636 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-27[releng] Added a 'standalone' build profileOlivier Constant11-3/+610
Change-Id: Ia830b319b3623b3a650af32b8b71735ee8d56a34 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-24Merge branch 'master' into genericOlivier Constant1-27/+13
Conflicts: plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusDiffPolicy.java plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMergePolicy.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataFactory.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/UidiffdataPackage.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataFactoryImpl.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/impl/UidiffdataPackageImpl.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataAdapterFactory.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceFactoryImpl.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataResourceImpl.java plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/diffuidata/util/UidiffdataSwitch.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IComparison.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IDiffPolicy.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMapping.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatch.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMatchPolicy.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergePolicy.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IMergeSelector.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/IPureMatch.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/Role.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfiguration.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IComparisonConfigurator.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurablePolicy.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/config/IConfigurationElement.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IAttributeValuePresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IDifference.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementPresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativeDifference.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IElementRelativePresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IMergeableDifference.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IPresenceDifference.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IReferenceValuePresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/api/diff/IValuePresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EElementRelativePresence.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/EMergeableDifference.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/AttributeToValueToDifferenceEntryImpl.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EElementRelativePresenceImpl.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMergeableDifferenceImpl.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EValuePresenceImpl.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/ValueToDifferenceEntryImpl.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/AbstractExpensiveOperation.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/BidirectionalComparisonCopier.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/DiffOperation.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/MergeOperation.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/UnidirectionalComparisonCopier.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/AbstractConfigurationElement.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/policies/CachingMatchPolicy.java plugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/util/IExpensiveOperation.java Change-Id: I5fd190fedd8811f3db16f6dae063714dd3641d62 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-23[releng] Cosmetic changes to POMsOlivier Constant1-17/+13
Change-Id: I50943cbe08e244d2fa0fd47ee6f5d819ad1afc12 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-18[releng] Update of copyrightsOlivier Constant1-10/+0
Change-Id: I6b83a64f7ab906e77b1dd99930907dbb8e5549be Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-09-09Merge branch 'master' into genericOlivier Constant2-6/+11
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 Constant9-15/+15
Change-Id: I9047c624a97ce799ff82ae259d14c738417bf2e6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-07-16[releng] Update Sirius version to 6.3.0-S20190716-100145Philippe DUL2-39/+44
Change-Id: I9939d5cc3fd5023c75105603003406f9a3eece43 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
2019-07-16Merge branch '0.11.x'Olivier Constant9-15/+15
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 Constant9-15/+15
Change-Id: I5e7a400daa3af6603ded47ccaf4578efa4adbdf7 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-04-05Bug 544000 - Make EDM applicable to non-EMF dataOlivier Constant1-0/+1
POJO types made element-parameterized, persistent scope use status Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-04-01Bug 544000 - Make EDM applicable to non-EMF dataOlivier Constant9-16/+15
[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 Constant9-15/+15
Change-Id: If8303f285b2694566152dd9ddf562a857b9d5993 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2019-01-11[releng] Added tpd file, updated TP, updated RCPTTOlivier Constant5-21/+78
Change-Id: Iec5e44615b99b09be3647c4fed508f6f4f8d89ea Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 538800 - Upgrade version to 0.11.0Olivier Constant9-15/+15
- diffmerge.core Change-Id: I150287451def2fc22b9889edaef25d110db37b39 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-09-07Bug 535213 - Switch to EPL-2.0Olivier Constant2-1/+27
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-07-18[releng] Update with Sirius 6.1Olivier Constant1-6/+5
Change-Id: Iee35152e32bbc91af1050bfc87ad96c2a1c75f5b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-05-25[releng] Update for 0.10.0Olivier Constant11-30/+22
Change-Id: I73e1e8dc15eb1326600e0903bd1c2c09d8f4e563 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Reverted version upgradeOlivier Constant1-2/+2
Change-Id: I9c7ff33fb5f5f5192d0637c494dfdb2a3b4ddd66 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-03-19Bug 532614 - Rebase conflicts lead to an NPEOlivier Constant1-2/+2
Change-Id: Ib18ee639207f5970d12f4a85f93b86d899b0fdc2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-02-23[releng] Update Sirius versionOlivier Constant1-8/+8
Change-Id: Ia872c26b693e395baaf7e044f374908878892f44 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Updated RCPTT versionOlivier Constant1-1/+1
Change-Id: I8b0bceb21d793cbbe4d489a08b2f128f43975b41 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Removed SVN integration from the main featureOlivier Constant1-3/+0
Change-Id: I79fcaa950b6bbf28575feb3aa7c3908040fc6225 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2018-01-31Updated TPOlivier Constant1-14/+14
Change-Id: Iff105f3c3bbf89c64f3889a125e46bea58288833 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
2017-10-27[releng] update sirius versionv0.9.0Olivier Constant1-6/+6
Change-Id: I25c12bf5b1135daf5e27bd4002eb58c1dc68cceb Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>

Back to the top