Google Git
Sign in
apache / sling-org-apache-sling-resourcemerger / HEAD
  1. 3057e88 SLING-12091 Use constructor injection to ensure bundleContext is set (#12) by Konrad Windszus · 7 months ago master
  2. b23f891 SLING-12094 - Use GitHub for the Maven scm.url value by Robert Munteanu · 8 months ago
  3. c996239 [maven-release-plugin] prepare for next development iteration by Carsten Ziegeler · 10 months ago
  4. a1a9fda [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.4.4 by Carsten Ziegeler · 10 months ago org.apache.sling.resourcemerger-1.4.4
  5. c19bd55 SLING-11978 : IllegalStateException on shutdown by Carsten Ziegeler · 11 months ago
  6. 71d9b96 SLING-11709 - Set up Jira autolinks to all Sling Github projects by Robert Munteanu · 1 year, 2 months ago
  7. cdf0d95 [maven-release-plugin] prepare for next development iteration by Radu Cotescu · 1 year, 3 months ago
  8. 2ae883d [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.4.2 by Radu Cotescu · 1 year, 3 months ago org.apache.sling.resourcemerger-1.4.2
  9. c5909a7 Merge pull request #11 from sagarmiglani/SLING-11776 by Carsten Ziegeler · 1 year, 4 months ago
  10. c1587bf SLING-11776 - Sling ResourceMerger may cause high cpu utilization - Add test cases by Sagar Miglani · 1 year, 4 months ago
  11. 043fb8a SLING-11776 : Sling ResourceMerger may cause high cpu utilizations. Patch provided by Sagar Miglani (saga@adobe.com) by Carsten Ziegeler · 1 year, 4 months ago
  12. b58f734 SLING-11506 : Streamline and document resource (super) type merging by Carsten Ziegeler · 1 year, 4 months ago
  13. a04dcc3 SLING-11774 - Fix the registration of the MergedResourcePicker2 implementations by Radu Cotescu · 1 year, 4 months ago
  14. 622f3b3 SLING-11775 - Update the Sling Resource Merger to parent pom version 49 by Radu Cotescu · 1 year, 4 months ago
  15. 8bad7c2 SLING-11774 - Fix the registration of the MergedResourcePicker2 implementations by Radu Cotescu · 1 year, 4 months ago
  16. c8c05f1 SLING-11773 - ResourceTypeHierarchyBasedResourcePicker not working anymore by Sagar Miglani · 1 year, 4 months ago
  17. 186043d Merge pull request #7 from apache/issues/SLING-11506 by Carsten Ziegeler · 1 year, 10 months ago
  18. ede5177 SLING-11506 : Streamline and document resource (super) type merging by Carsten Ziegeler · 1 year, 10 months ago
  19. f821f84 SLING-11051 - Fixing JavaDoc badge by Dan Klco · 2 years, 5 months ago
  20. 7ac9500 SLING-10676 - remove SECURITY.md which is not needed by Bertrand Delacretaz · 2 years, 10 months ago
  21. bf6e9e0 SLING-10676 - add or update SECURITY.md by Bertrand Delacretaz · 2 years, 10 months ago
  22. 55e4fc5 SLING-10676 - add or update SECURITY.md by Bertrand Delacretaz · 2 years, 10 months ago
  23. c9d742c Link documentation by Konrad Windszus · 3 years, 3 months ago
  24. d40f474 rename test classes to be executed by maven-surefire-plugin by Konrad Windszus · 3 years, 3 months ago
  25. 9b7b99d [maven-release-plugin] prepare for next development iteration by Konrad Windszus · 3 years, 3 months ago
  26. 8dfd804 [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.4.0 by Konrad Windszus · 3 years, 3 months ago org.apache.sling.resourcemerger-1.4.0
  27. 718f863 SLING-10168 make all resource picker references take 0..n references by Konrad Windszus · 3 years, 3 months ago
  28. 5b4044d releng: fix wrong null annotation by Konrad Windszus · 3 years, 3 months ago
  29. f65f2bd releng: some more fixes detected by SonarQube by Konrad Windszus · 3 years, 3 months ago
  30. fef21df releng: add null annotations by Konrad Windszus · 3 years, 3 months ago
  31. 113f9ef Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-resourcemerger.git by Konrad Windszus · 3 years, 3 months ago
  32. 6b74489 SLING-10150 fix unescaping of even number leading exclamation marks by Konrad Windszus · 3 years, 3 months ago
  33. edde295 SLING-10168 Migrate to Bundle Parent 41 and OSGi annotations (#6) by Konrad Windszus · 3 years, 3 months ago
  34. 84c00de SLING-10150 improve handling of multivalue hides (#4) by Konrad Windszus · 3 years, 3 months ago
  35. d4fad8c SLING-5469 add mixin for resource merger properties (#5) by Konrad Windszus · 3 years, 3 months ago
  36. da55970 Adding sonarqube badges as per SLING-9682 by Dan Klco · 3 years, 9 months ago
  37. c453ca0 Updating badges for org-apache-sling-resourcemerger by Radu Cotescu · 3 years, 9 months ago
  38. b771318 [maven-release-plugin] prepare for next development iteration by Karl Pauls · 5 years ago
  39. 8ae5010 [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.10 by Karl Pauls · 5 years ago org.apache.sling.resourcemerger-1.3.10
  40. 056c3a0 SLING-8296 : MergingResourceProvider purges the last item if existing item is overlaid and has sling:orderBefore property set by Carsten Ziegeler · 5 years ago
  41. 79c9a8c Updating badges for org-apache-sling-resourcemerger by Radu Cotescu · 5 years ago
  42. df37f55 SLING-7245 - Validate pull requests using Jenkins by Robert Munteanu · 5 years ago
  43. f8ceb69 trivial: added license header to *.md files by Radu Cotescu · 6 years ago
  44. 4c1e5db SLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module by Radu Cotescu · 6 years ago
  45. 7f6dd56 SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module by Radu Cotescu · 6 years ago
  46. cc16812 Updating badges for org-apache-sling-resourcemerger by Dan Klco · 6 years ago
  47. f73150f [maven-release-plugin] prepare for next development iteration by Carsten Ziegeler · 6 years ago
  48. b5ac058 [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.8 by Carsten Ziegeler · 6 years ago org.apache.sling.resourcemerger-1.3.8
  49. 3962295 Merge pull request #2 from rishi05091989/master by Carsten Ziegeler · 6 years ago
  50. 7c5c0dc SLING-7375 Moving order using overlapping children causing IndexOutOfBoundException by Rishi Mehta · 6 years ago
  51. 070a6e3 [maven-release-plugin] prepare for next development iteration by Carsten Ziegeler · 6 years ago
  52. 3b65fda [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.6 by Carsten Ziegeler · 6 years ago org.apache.sling.resourcemerger-1.3.6
  53. a061bf7 Merge pull request #1 from rishi05091989/master by Carsten Ziegeler · 6 years ago
  54. 9218afb SLING-7366 OrderBefore property not being honored during resource merging by Rishi Mehta · 6 years ago
  55. e36ab18 SLING-7213 - Add a default .gitignore file to every module by Robert Munteanu · 7 years ago
  56. e0e6dfb SLING-7214 - Add the LICENSE file to every module by Robert Munteanu · 7 years ago
  57. 448537e Fix typo in pom.xml : conncetion should be connection by Robert Munteanu · 7 years ago
  58. 8808227 SLING-7162 - Update SCM information in all POM files to reference Git by Robert Munteanu · 7 years ago
  59. d706639 SLING-7167 Adjust READMEs by Oliver Lietz · 7 years ago
  60. 2ab4b8d clarify naming of overlay vs. override pickers by Konrad Windszus · 7 years ago
  61. 24d364b clarify relatedResource in Javadoc by Konrad Windszus · 7 years ago
  62. 0e05146 [maven-release-plugin] prepare for next development iteration by Konrad Windszus · 7 years ago
  63. 6652433 [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.4 by Konrad Windszus · 7 years ago
  64. 015c01c remove redundant test method by Konrad Windszus · 7 years ago
  65. fbe4bc5 SLING-6956 do not touch order when no new resources have been defined in an overlying resource by Konrad Windszus · 7 years ago
  66. f932851 SLING-6951 correctly hide underlying grand children (which are hidden by the grandparent's sling:hideChildren) by Konrad Windszus · 7 years ago
  67. 7c92ec9 SLING-6951 do not hide local grandchildren when sling:hideChildren is set on the grandparent by Konrad Windszus · 7 years ago
  68. abb5914 SLING-6587 improved javadoc by Georg Henzler · 7 years ago
  69. 0d01503 [maven-release-plugin] prepare for next development iteration by Konrad Windszus · 7 years ago
  70. 9e8718c [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.2 by Konrad Windszus · 7 years ago
  71. 71b7671 fix some javadoc by Konrad Windszus · 7 years ago
  72. 73398fd SLING-6457 correctly expose child resources in MergedResource's toString() by Konrad Windszus · 7 years ago
  73. f045331 update to latest version of sling hamcrest by Stefan Seifert · 7 years ago
  74. 607678d SLING-6117 remove "with"/"has" prefix from ResourceMatchers method names as well by Stefan Seifert · 8 years ago
  75. 89708cf SLING-6117 Hamcrest: Simplify ResourceMatchers method signatures by Stefan Seifert · 8 years ago
  76. cd996dd SLING-4915 remove irrelevant code by Konrad Windszus · 8 years ago
  77. af8b6da SLING-4915 preferably take the order from the overlying resource by Konrad Windszus · 8 years ago
  78. 4df6eb7 SLNG-5468, make wildcards in sling:hideProperties and sling:hideChildren only act on inherited children/properties (not on the local ones) to allow to easily replace an existing resource by Konrad Windszus · 8 years ago
  79. f7f5b14 [maven-release-plugin] prepare for next development iteration by Carsten Ziegeler · 8 years ago
  80. dfe1f6a [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.3.0 by Carsten Ziegeler · 8 years ago
  81. f0e903d SLING-5502 : Additions to MergedResourcePicker break existing implementations by Carsten Ziegeler · 8 years ago
  82. 105df95 SLING-5502 : Additions to MergedResourcePicker break existing implementations by Carsten Ziegeler · 8 years ago
  83. fff1097 SLING-5501 : Adjust resource merger for latest API changes. Apply patch from Joel Richard by Carsten Ziegeler · 8 years ago
  84. 010d602 update to released versions by Stefan Seifert · 8 years ago
  85. d3ff8a3 Switch to parent pom 26 by Carsten Ziegeler · 8 years ago
  86. b71f706 Copy relevant bits of resourceresolver private impl class to resourcemerger to avoid dependency on internal classes (even if it's for testing) by Carsten Ziegeler · 9 years ago
  87. cef7b03 SLING-5204 : Implement provider lifecycle methods by Carsten Ziegeler · 9 years ago
  88. 8f076c8 SLING-5201 : Improve resource provider resolving by Carsten Ziegeler · 9 years ago
  89. 8141212 SLING-4611 Performance: Consider optimizing MergedResource#getParent and getChild by Tomasz Rekawek · 9 years ago
  90. edaabab SLING-5108 Reverted MergedResource#toString() change by Tomasz Rekawek · 9 years ago
  91. 3fb1554 SLING-5108 Various little performance improvements by Tomasz Rekawek · 9 years ago
  92. 475b781 Update the contrib reactor to parent 25 by Robert Munteanu · 9 years ago
  93. 56ed7eb [maven-release-plugin] prepare for next development iteration by Radu Cotescu · 9 years ago
  94. 8aed0b4 [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.10 by Radu Cotescu · 9 years ago
  95. 221c77c trivial: updated JavaDoc to comply with Java 1.8 by Radu Cotescu · 9 years ago
  96. 8db97b1 SLING-4878 - Resource Merger: Infinite loop in case a parent resource has one of its children as a supertype by Radu Cotescu · 9 years ago
  97. 40d1f36 set parent version to 24 and add empty relativePath where missing by Oliver Lietz · 9 years ago
  98. c47c342 Update contrib modules to Parent 23 by Robert Munteanu · 9 years ago
  99. c8c4a0a SLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about 30pp rendering overhead. Apply slightly modified patch from Joel Richard by Carsten Ziegeler · 9 years ago
  100. f6cb5dd SLING-4568 : Performance: MergingResourceProvider.ParentHidingHandler adds about 30pp rendering overhead. Apply slightly modified patch from Joel Richard by Carsten Ziegeler · 9 years ago