Author: alexparvulescu Date: Thu Jun 8 14:52:08 2017 New Revision: 1798074
URL: http://svn.apache.org/viewvc?rev=1798074&view=rev Log: OAK-5921 Make import org.apache.log4j optional - backport to 1.6 Modified: jackrabbit/oak/branches/1.6/ (props changed) jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml Propchange: jackrabbit/oak/branches/1.6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 8 14:52:08 2017 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988 +/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml?rev=1798074&r1=1798073&r2=1798074&view=diff ============================================================================== --- jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml (original) +++ jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml Thu Jun 8 14:52:08 2017 @@ -61,6 +61,7 @@ sun.security.util.*;resolution:=optional, sun.security.x509.*;resolution:=optional, org.apache.logging.log4j.*;resolution:=optional, + org.apache.log4j.*;resolution:=optional, * </Import-Package> </instructions>
