The history of Abu Dhabi was marked by violence within the ruling dynasty, and Abu Dhabi frequently clashed with the neighboring sheikhdom of Sharjah. In 1892 the sheikhdom became a British protectorate. There was a long period of tranquillity during the rule (1928-66) of Sheikh Shakhbut ibn Sultan, broken only by a war between Abu Dhabi and Dubai from 1945 to 1948. The pearling industry that once thrived in Abu Dhabi declined after oil was discovered there in the early 1960s. The abundant oil revenues have been used for development and modernization. The current ruler is Sheikh Khalifa ibn Zaid Al Nahayan, who succeeded his father when the latter died in 2004.