58fe16c | Thomas Mortagne | 20 August 2019, 08:03:09 UTC | [maven-release-plugin] prepare release xwiki-commons-11.7-rc-1 | 20 August 2019, 08:03:09 UTC |
add1496 | Thomas Mortagne | 20 August 2019, 08:02:44 UTC | [release] Preparing release xwiki-commons-11.7-rc-1 | 20 August 2019, 08:02:44 UTC |
2d97f9f | Thomas Mortagne | 20 August 2019, 08:02:25 UTC | [maven-release-plugin] prepare branch stable-11.7.x | 20 August 2019, 08:02:25 UTC |
f3562b2 | Simon Urli | 19 August 2019, 16:13:36 UTC | XCOMMONS-1706: Provide conflict information inside the unified diff display * Add the new API for script service. | 19 August 2019, 16:13:36 UTC |
b772490 | Simon Urli | 19 August 2019, 16:04:34 UTC | XCOMMONS-1706: Provide conflict information inside the unified diff display * Allow to get conflict information from the unified diff display. | 19 August 2019, 16:04:34 UTC |
3178dd8 | Simon Urli | 19 August 2019, 14:36:02 UTC | XCOMMONS-1682: Allow to perform custom decisions in case of merge conflict * Add missing parameters. | 19 August 2019, 14:36:02 UTC |
dbedbdc | Thomas Mortagne | 19 August 2019, 12:12:37 UTC | XCOMMONS-1703: Upgtade to Pitest JUnit5 plugin 0.9 | 19 August 2019, 12:12:37 UTC |
48ea05e | Thomas Mortagne | 19 August 2019, 08:53:48 UTC | XCOMMONS-1702: Replaying extension history records doesn't work anymore | 19 August 2019, 08:53:48 UTC |
d275c41 | Thomas Mortagne | 19 August 2019, 08:04:58 UTC | XCOMMONS-1678: Upgrade to Byte Buddy 1.10.1 | 19 August 2019, 08:04:58 UTC |
bdda05a | Thomas Mortagne | 19 August 2019, 08:00:12 UTC | XCOMMONS-1697: Upgrade to SLF4J 1.7.28 | 19 August 2019, 08:00:12 UTC |
479a34e | Thomas Mortagne | 19 August 2019, 07:03:16 UTC | XCOMMONS-1702: Replaying extension history records doesn't work anymore * bulletproof the job context | 19 August 2019, 07:03:37 UTC |
d0d4aa7 | Simon Urli | 14 August 2019, 08:38:46 UTC | XCOMMONS-1682: Allow to perform custom decisions in case of merge conflict * Add a new unit test | 14 August 2019, 08:38:46 UTC |
982de7b | Simon Urli | 09 August 2019, 15:12:49 UTC | XCOMMONS-1682: Allow to perform custom decisions in case of merge conflict * improve DiffManager#merge javadoc | 09 August 2019, 15:12:49 UTC |
6f484c9 | Simon Urli | 09 August 2019, 14:43:33 UTC | XCOMMONS-1682: Allow to perform custom decisions in case of merge conflict * Fix javadoc * Improve a bit tests | 09 August 2019, 14:43:33 UTC |
a936aac | Simon Urli | 09 August 2019, 14:42:31 UTC | XCOMMONS-1701: merge: conflicts are not always reported in case of change and insert in current and next * Use an appropriate Chunk#isOverlappingWith method to check during the merge if two changes are conflicting | 09 August 2019, 14:42:31 UTC |
c19f979 | Simon Urli | 09 August 2019, 12:54:41 UTC | XCOMMONS-1682: Allow to perform custom decisions in case of merge conflict * Add the concepts of Conflict and ConflictDecision * MergeResult returns the Conflicts and MergeConfiguration takes some ConflictDecisions * Update the DefaultDiffManager to take into account the conflict decisions to fallback in case of conflict, and to record properly the conflicts * Update tests * Change AbstractDelta#toString to help in case of problem | 09 August 2019, 13:06:09 UTC |
4464562 | Simon Urli | 09 August 2019, 09:33:32 UTC | XCOMMONS-1700: merge: conflict reporting might be wrong in case of multiple conflicts and fallback config * Check the index to get the next patch elements: skip some elements if it's before the fallback position * Add some more tests | 09 August 2019, 09:33:32 UTC |
29160ca | Thomas Mortagne | 08 August 2019, 10:12:48 UTC | XWIKI-16506: Warnings in the console about using ":" in a JMX object name when deleting an attachment from the default wiki skin | 08 August 2019, 10:13:26 UTC |
6e130d2 | Simon Urli | 07 August 2019, 17:15:19 UTC | XCOMMONS-1693: InifinispanCacheFactory should be disposed as late as possible * Inherited annotation cannot be used on interfaces: need to use it on the class instead. | 07 August 2019, 17:15:19 UTC |
204e37f | Simon Urli | 07 August 2019, 16:27:39 UTC | XCOMMONS-1699: merge: in case of conflict fallback to previous is not working properly * Fix again the fallback for previous * Add some more assert for checking the fallbacks | 07 August 2019, 16:29:31 UTC |
6cf0c62 | Thomas Mortagne | 07 August 2019, 14:35:25 UTC | XCOMMONS-1698: Upgrade to Commons DBCP2 2.7.0 | 07 August 2019, 14:35:25 UTC |
5ee5329 | Thomas Mortagne | 07 August 2019, 14:30:37 UTC | XCOMMONS-1697: Upgrade to SLF4J 1.7.27 | 07 August 2019, 14:30:37 UTC |
1ca8d99 | Thomas Mortagne | 07 August 2019, 14:28:08 UTC | XCOMMONS-1696: Upgrade to Infinispan 9.4.16.Final | 07 August 2019, 14:28:08 UTC |
a7c8ca6 | Thomas Mortagne | 07 August 2019, 14:25:08 UTC | XCOMMONS-1695: Upgrade to Caffeine 2.8.0 | 07 August 2019, 14:25:08 UTC |
e534639 | Thomas Mortagne | 07 August 2019, 14:19:08 UTC | XCOMMONS-1678: Upgrade to Byte Buddy 1.10.0 | 07 August 2019, 14:19:08 UTC |
51ef5b6 | Thomas Mortagne | 07 August 2019, 14:13:23 UTC | XCOMMONS-1694: Upgrade to Checker Qual 2.10.0 | 07 August 2019, 14:13:32 UTC |
611d6c0 | Simon Urli | 07 August 2019, 13:38:23 UTC | XCOMMONS-1693: CacheFactory implementations should be disposed as late as possible * Add revapi ignore | 07 August 2019, 13:38:23 UTC |
0587558 | Simon Urli | 07 August 2019, 13:08:28 UTC | XCOMMONS-1693: CacheFactory implementations should be disposed as late as possible | 07 August 2019, 13:08:28 UTC |
160029b | Simon Urli | 07 August 2019, 07:43:08 UTC | XCOMMONS-1692: merge: no way to fallback on another value than current if current is empty * Upgrade DefaultDiffManagerTest to junit5 | 07 August 2019, 07:43:08 UTC |
5a99d4b | Simon Urli | 07 August 2019, 07:34:08 UTC | XCOMMONS-1692: merge: no way to fallback on another value than current if current is empty * treat as normal conflict if current is empty and not the other ones * treat the same way if current or next is fully modified * do not fallback if current or next is fully modified and they are equals | 07 August 2019, 07:34:08 UTC |
f5a2230 | Thomas Mortagne | 06 August 2019, 16:22:18 UTC | XCOMMONS-1691: Next is always chosen when previous->next diff starts before previous->current XCOMMONS-1690: Merge fallback configuration is not taken when previous->current diff starts before previous->next | 06 August 2019, 16:22:18 UTC |
8cab44e | Thomas Mortagne | 06 August 2019, 16:12:24 UTC | [misc] Codestyle | 06 August 2019, 16:12:24 UTC |
86f87d7 | Simon Urli | 06 August 2019, 13:39:47 UTC | XCOMMONS-1689: Two overlapping changes are not merged correctly | 06 August 2019, 13:40:36 UTC |
f90c110 | Thomas Mortagne | 06 August 2019, 13:29:46 UTC | XCOMMONS-1688: Jobs executed by the ReplayJob share the same ExecutionContext | 06 August 2019, 13:29:46 UTC |
612d8c1 | Thomas Mortagne | 05 August 2019, 15:42:33 UTC | XCOMMONS-1687: Extension Manager special optional behavior should be limited to XWiki extensions | 05 August 2019, 15:42:33 UTC |
6d16155 | Thomas Mortagne | 05 August 2019, 15:12:38 UTC | XCOMMONS-1686: Failed to initialize dependency [xerces:xerces-impl-2.6.2]: NullPointerException: | 05 August 2019, 15:12:38 UTC |
1f051fe | Thomas Mortagne | 02 August 2019, 17:02:01 UTC | [misc] Better error reporting | 02 August 2019, 17:02:01 UTC |
999e779 | Thomas Mortagne | 02 August 2019, 16:46:52 UTC | [misc] Bulletproofing | 02 August 2019, 16:47:05 UTC |
2d35315 | Vincent Massol | 02 August 2019, 14:17:42 UTC | [Misc] Convert to JUnit5 + from JMock to Mockito | 02 August 2019, 14:17:42 UTC |
134ac79 | Vincent Massol | 02 August 2019, 14:06:26 UTC | [Misc] Convert to JUnit5 | 02 August 2019, 14:06:26 UTC |
fa09204 | Vincent Massol | 02 August 2019, 13:36:02 UTC | [Misc] Convert to JUnit5 | 02 August 2019, 13:36:02 UTC |
e412056 | Vincent Massol | 02 August 2019, 13:33:22 UTC | [Misc] Convert to JUnit5 | 02 August 2019, 13:33:22 UTC |
9103018 | Vincent Massol | 02 August 2019, 13:06:30 UTC | [Misc] Fix test (was outputting test data in the source directory and not under target). The error was introduced in my previous commit + reduced coverage threshold (it's a mystery to me why converting the test to JUnit5 + using the new @XWikiTempDir annotation would reduce the coverage...). | 02 August 2019, 13:06:30 UTC |
3587802 | Vincent Massol | 02 August 2019, 07:52:29 UTC | XCOMMONS-1685: Add a Junit5 extension to create a temporary directory * Introduce a utility class so that the code can be reused in a larger context | 02 August 2019, 07:52:29 UTC |
43ada5d | Vincent Massol | 02 August 2019, 07:39:26 UTC | XCOMMONS-1685: Add a Junit5 extension to create a temporary directory * Typo | 02 August 2019, 07:39:26 UTC |
1c208e8 | Vincent Massol | 02 August 2019, 07:30:44 UTC | XCOMMONS-1685: Add a Junit5 extension to create a temporary directory | 02 August 2019, 07:30:44 UTC |
00cd803 | Vincent Massol | 01 August 2019, 15:27:18 UTC | [Misc] Convert test to JUnit5 | 01 August 2019, 15:43:36 UTC |
175666c | Thomas Mortagne | 01 August 2019, 11:27:51 UTC | [misc] Disable checksum validation in test file based maven repositories | 01 August 2019, 11:28:28 UTC |
d30f700 | Alex Cotiugă | 31 July 2019, 11:25:47 UTC | [release] Updated compatibility previous version to the one just released. | 31 July 2019, 11:25:47 UTC |
6f3f6a8 | Thomas Mortagne | 30 July 2019, 19:07:34 UTC | [misc] Improve test | 30 July 2019, 19:07:34 UTC |
5de448c | RICARDO FAULHABER | 22 June 2019, 04:39:13 UTC | Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (5 of 5 strings) Translation: XWiki Commons/xwiki-commons-job Translate-URL: https://l10n.xwiki.org/projects/xwiki-commons/xwiki-commons-job/pt_BR/ | 30 July 2019, 09:24:41 UTC |
7b50b71 | exveria1015 | 14 June 2019, 19:03:12 UTC | Translated using Weblate (Japanese) Currently translated at 75.8% (22 of 29 strings) Translation: XWiki Commons/xwiki-commons-extension-api Translate-URL: https://l10n.xwiki.org/projects/xwiki-commons/xwiki-commons-extension-api/ja/ | 30 July 2019, 09:24:41 UTC |
1fa5c4e | RICARDO FAULHABER | 22 June 2019, 04:02:06 UTC | Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (29 of 29 strings) Translation: XWiki Commons/xwiki-commons-extension-api Translate-URL: https://l10n.xwiki.org/projects/xwiki-commons/xwiki-commons-extension-api/pt_BR/ | 30 July 2019, 09:24:41 UTC |
daf726e | Simon Urli | 29 July 2019, 09:51:19 UTC | XCOMMONS-1681: Upgrade to Spoon 7.5.0 | 29 July 2019, 09:52:10 UTC |
0f89665 | Thomas Mortagne | 29 July 2019, 09:47:48 UTC | XCOMMONS-1678: Upgrade to Byte Buddy 1.9.16 | 29 July 2019, 09:47:48 UTC |
371afa4 | Thomas Mortagne | 29 July 2019, 09:43:21 UTC | XCOMMONS-1683: Upgrade to Checkstyle 8.23 | 29 July 2019, 09:43:21 UTC |
0d7d18a | Thomas Mortagne | 25 July 2019, 06:30:04 UTC | XCOMMONS-1679: Upgrade to commons-codec 1.13 | 25 July 2019, 06:30:04 UTC |
e37d1cc | Thomas Mortagne | 23 July 2019, 13:10:16 UTC | XCOMMONS-1678: Upgrade to Byte Buddy 1.9.15 | 23 July 2019, 13:10:16 UTC |
a4f0e5e | Thomas Mortagne | 23 July 2019, 12:28:29 UTC | Merge branch 'master' into feature-XCOMMONS-1676 | 23 July 2019, 12:28:29 UTC |
19894f3 | Thomas Mortagne | 23 July 2019, 12:24:26 UTC | XCOMMONS-1677: JAR extension upgrade fail when the previous version is loaded but has a component class which cannot be loaded | 23 July 2019, 12:25:02 UTC |
b837cff | Simon Urli | 23 July 2019, 09:03:23 UTC | [branch] Updating inter-project dependencies on master | 23 July 2019, 09:03:23 UTC |
e3c1ab8 | Simon Urli | 23 July 2019, 09:03:17 UTC | [maven-release-plugin] prepare for next development iteration | 23 July 2019, 09:03:17 UTC |
3011149 | Simon Urli | 23 July 2019, 09:03:16 UTC | [maven-release-plugin] prepare branch stable-11.6.x | 23 July 2019, 09:03:16 UTC |
6e2cd85 | Marius Dumitru Florea | 22 July 2019, 16:07:13 UTC | XCOMMONS-1669: Add support for computing diffs on HTML DOM trees * Make sure the HTML diff markers don't affect the index of the child nodes while patches are being applied. | 22 July 2019, 16:10:13 UTC |
ca44aff | Thomas Mortagne | 22 July 2019, 09:24:12 UTC | XCOMMONS-1676: Upgrade to Java Transaction API 1.3.2 | 22 July 2019, 09:24:12 UTC |
5a41d96 | Thomas Mortagne | 18 July 2019, 15:56:46 UTC | XCOMMONS-1675: Upgrade to Jackson 2.9.9.1 | 18 July 2019, 15:56:54 UTC |
41dbfec | Marius Dumitru Florea | 17 July 2019, 14:00:03 UTC | XCOMMONS-1669: Add support for computing diffs on HTML DOM trees * Fix the handling of entity references and unicode characters (they should be treated as single chars when computing the changes) | 17 July 2019, 14:00:03 UTC |
86882d0 | Marius Dumitru Florea | 17 July 2019, 13:50:46 UTC | XCOMMONS-1669: Add support for computing diffs on HTML DOM trees * Consider two nodes to be very similar if the difference between their text content is below a given threshold (60%) | 17 July 2019, 13:50:46 UTC |
983e870 | Marius Dumitru Florea | 17 July 2019, 13:47:02 UTC | XCOMMONS-1669: Add support for computing diffs on HTML DOM trees * Ignore anchor href attribute when computing visual changes. | 17 July 2019, 13:47:02 UTC |
f737b11 | Thomas Mortagne | 16 July 2019, 15:35:05 UTC | XCOMMONS-1674: Upgrade to Woodstox 5.3.0 | 16 July 2019, 15:35:05 UTC |
6d247c3 | Thomas Mortagne | 16 July 2019, 15:25:35 UTC | XCOMMONS-1673: Upgrade to Plexus Utils 3.2.1 | 16 July 2019, 15:25:35 UTC |
f3a657a | Thomas Mortagne | 16 July 2019, 15:19:33 UTC | XCOMMONS-1672: Upgrade to commons-collections 4.4 | 16 July 2019, 15:19:33 UTC |
ee12ad4 | Thomas Mortagne | 16 July 2019, 15:01:45 UTC | XCOMMONS-1671: Upgrade to Byte Buddy 1.9.14 | 16 July 2019, 15:01:45 UTC |
cd8e3da | Thomas Mortagne | 16 July 2019, 14:46:01 UTC | XCOMMONS-1670: Upgrade to Maven Javadoc plugin 3.1.1 | 16 July 2019, 14:46:18 UTC |
4f2c372 | Marius Dumitru Florea | 07 July 2019, 04:04:00 UTC | XCOMMONS-1669: Add support for computing diffs on HTML DOM trees | 07 July 2019, 04:04:00 UTC |
a8b4c35 | Thomas Mortagne | 05 July 2019, 07:22:43 UTC | XCOMMONS-1668: Upgrade to commons-text 1.7 | 05 July 2019, 07:22:43 UTC |
ab1aaa8 | Thomas Mortagne | 05 July 2019, 07:15:19 UTC | XCOMMONS-1666: Upgrade to Checker Qual 2.9.0 | 05 July 2019, 07:15:19 UTC |
2278f0e | Thomas Mortagne | 03 July 2019, 15:04:17 UTC | [misc] Minor improvement | 03 July 2019, 15:04:17 UTC |
710c0f1 | Thomas Mortagne | 02 July 2019, 16:40:15 UTC | XCOMMONS-1494: Upgrade to JavaMail 1.6.3 | 02 July 2019, 16:40:15 UTC |
6ac954d | Thomas Mortagne | 02 July 2019, 08:16:07 UTC | XCOMMONS-1667: Missing javadoc is not checked anymore | 02 July 2019, 08:16:07 UTC |
724ef2c | Thomas Mortagne | 01 July 2019, 13:07:52 UTC | XCOMMONS-1666: Upgrade to Checker Qual 2.8.2 | 01 July 2019, 13:07:52 UTC |
3aba0d1 | Thomas Mortagne | 01 July 2019, 12:57:50 UTC | XCOMMONS-1665: Upgrade to Saxon 9.9.1-4 | 01 July 2019, 12:57:50 UTC |
fe8c1fc | Thomas Mortagne | 01 July 2019, 12:30:29 UTC | XCOMMONS-1155: Upgrade to Guava 28.0-jre | 01 July 2019, 12:31:08 UTC |
0740c48 | Simon Urli | 01 July 2019, 07:28:13 UTC | XCOMMONS-1664: Upgrade to Maven Spoon Plugin 3.2 | 01 July 2019, 07:28:50 UTC |
973b4c0 | Thomas Mortagne | 28 June 2019, 07:57:49 UTC | [misc] Make the javadoc more explicit. | 28 June 2019, 07:57:49 UTC |
4e22cd8 | Thomas Mortagne | 28 June 2019, 06:36:26 UTC | XCOMMONS-1663: Upgrade to Plexus Interpolation 1.26 | 28 June 2019, 06:36:26 UTC |
c168252 | Thomas Mortagne | 27 June 2019, 16:25:12 UTC | XCOMMONS-1662: Upgrade to Checkstyle 8.22 | 27 June 2019, 16:25:12 UTC |
171e715 | Thomas Mortagne | 27 June 2019, 16:18:34 UTC | Revert "Revert "XCOMMONS-1658: Upgrade to Infinispan 9.4.15.Final"" This reverts commit 17818f23b7872def6d3ff4f9b25a66ac69c11db4. | 27 June 2019, 16:18:34 UTC |
74aeccc | Thomas Mortagne | 27 June 2019, 16:18:16 UTC | XCOMMONS-1661: Upgrade to JGroups 4.0.20 | 27 June 2019, 16:18:16 UTC |
17818f2 | Thomas Mortagne | 27 June 2019, 16:15:49 UTC | Revert "XCOMMONS-1658: Upgrade to Infinispan 9.4.15.Final" This reverts commit f5d0970a643733b25885f18dbe6c90a027c5e264. | 27 June 2019, 16:15:49 UTC |
fa73048 | Thomas Mortagne | 27 June 2019, 16:04:17 UTC | XCOMMONS-1660: Upgrade to Maven Pitest Plugin 1.4.9 | 27 June 2019, 16:04:17 UTC |
595fc76 | Thomas Mortagne | 27 June 2019, 16:00:44 UTC | XCOMMONS-1659: Upgrade to Maven Archetype Plugin 3.1.1 | 27 June 2019, 16:00:44 UTC |
f5d0970 | Thomas Mortagne | 27 June 2019, 15:58:19 UTC | XCOMMONS-1658: Upgrade to Infinispan 9.4.15.Final | 27 June 2019, 15:58:29 UTC |
d5bbe6e | Marius Dumitru Florea | 25 June 2019, 10:32:53 UTC | [release] Updated compatibility previous version to the one just released. | 25 June 2019, 10:32:53 UTC |
a6bac9c | Thomas Mortagne | 20 June 2019, 09:37:29 UTC | XCOMMONS-1656: Allow overriding extension properties in generated descriptors during the build * remove unused import | 20 June 2019, 09:37:29 UTC |
7961b7d | Thomas Mortagne | 20 June 2019, 09:25:09 UTC | XCOMMONS-1656: Allow overriding extension properties in generated descriptors during the build | 20 June 2019, 09:25:09 UTC |
f5d4be9 | Thomas Mortagne | 18 June 2019, 15:26:54 UTC | [branch] Updating inter-project dependencies on master | 18 June 2019, 15:26:54 UTC |
6097a83 | Thomas Mortagne | 18 June 2019, 15:26:47 UTC | [maven-release-plugin] prepare for next development iteration | 18 June 2019, 15:26:47 UTC |
ac12d83 | Thomas Mortagne | 18 June 2019, 15:26:46 UTC | [maven-release-plugin] prepare branch stable-11.5.x | 18 June 2019, 15:26:46 UTC |
4e1ff5a | Thomas Mortagne | 11 June 2019, 13:11:17 UTC | XCOMMONS-1655: Upgrade to httpclient 4.5.9 | 11 June 2019, 13:11:17 UTC |