Stocks, oil and dollar rise as trade war put on hold