Solaris died a long time ago, regardless of what roadmaps say. It died the day Oracle acquired it. Even if Oracle invested heavily in Solaris, it's hard to imagine how they could match Linux long term.

Solaris had opportunity to compete with Linux, by becoming a real open source project. Not in the Android sense ("we let you see and modify it, but we don't let you participate in the development), but in the Linux sense. Do all your development in the open, kill the bureaucracy, make other companies trust that they aren't being taken advantage of if they contribute to it. Sun attempted to go in this direction, but Oracle killed it.