Fix ordering and remove IGN_<LIB>_VER pattern (#700)

* Fix replacement ordering

* Implement IGN_<LIB>_VER fix

* Remove IGN_<LIB>_VER case instead

This pattern requires that the library is found before it is invoked. And in most cases, it'll be invoked first.

release-repo-scripts/bump_dependency.bash

@@ -455,16 +455,6 @@ for ((i = 0; i < "${#LIBRARIES[@]}"; i++)); do
     DEP_VER=${VERSIONS[$j]}
     DEP_PREV_VER="$((${DEP_VER}-1))"
 
-    # Rule: *plugin2 -> *plugin3
-    # Replace lines like: "find_package(ignition-cmake2)"
-    #               with: "find_package(ignition-cmake3)"
-    find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s ${DEP_LIB}${DEP_PREV_VER} ${DEP_LIB}${DEP_VER} g"
-
-    # Rule: IGN_PLUGIN_VER 2 -> IGN_PLUGIN_VER 3
-    # Replace lines like: "set(IGN_PLUGIN_VER 2)"
-    #               with: "set(IGN_PLUGIN_VER 3)"
-    find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s@IGN_${DEP_LIB}_VER ${DEP_PREV_VER}@\UIGN_${DEP_LIB}_VER ${DEP_VER}@ig"
-
     # Replace lines like "find_package(ignition-cmake2 2.0.0)"
     #               with "find_package(ignition-cmake3)"
     find . -type f -name 'CMakeLists.txt' -print0 | xargs -0 sed -i "s@\(find_package.*${DEP_LIB}\)${DEP_PREV_VER} \+${DEP_PREV_VER}[^ )]*@\1${DEP_VER}@g"
@@ -478,6 +468,12 @@ for ((i = 0; i < "${#LIBRARIES[@]}"; i++)); do
     #               with "ign_find_package(ignition-math7 REQUIRED COMPONENTS eigen3)"
     find . -type f -name 'CMakeLists.txt' -print0 | xargs -0 sed -i "s@\(find_package.*${DEP_LIB}\)${DEP_PREV_VER}\(.*\) \+VERSION \+${DEP_PREV_VER}[^ )]*@\1${DEP_VER}\2@g"
 
+
+    # Rule: *plugin2 -> *plugin3
+    # Replace lines like: "find_package(ignition-cmake2)"
+    #               with: "find_package(ignition-cmake3)"
+    find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s ${DEP_LIB}${DEP_PREV_VER} ${DEP_LIB}${DEP_VER} g"
+
     # Replace collection yaml branch names with main
     if [[ "${LIB}" == "ign-${COLLECTION}" ]]; then
       find . -type f -name "collection-${COLLECTION}.yaml" -print0 | xargs -0 sed -i "s ign-${DEP_LIB}${DEP_VER} main g"