@EdJ Hi Ed,
Yes the baptism of John (Acts 19) was of water and a requirement for the Jews as Lk 7.30 makes plain.
Neither were gentiles required to become Jews or to be circumcised as Baptism is the new circumcision.col2.11-12
Surely you do not confuse John’s baptism with those who came to Christ and were water baptised for the forgiveness of their sins?
Acts 19 should clarify for you that they are not the same.