I have had the tanks both ways. Weird is the parts book only shows one number for the tank. I believe that is a roll over valve. Does the plastic part have a part number on it? The mopar parts book is wrong and shows part 4002012 which I think is for the cars with the vent tube like your first pic. I need that part to install my new tank.
Ok, after more research my book was wrong. I need 4002252 valve and 4002149 grommet. The 4002012 valve that was listed mounts near the bottom of the right front fender for the two piece line. Nobody has the 4002252 valve but it appears the jeep valve works fine part J5360058 and seal 52018823