From 057fe3f88fbb9b95b65174aa47a65d39449cdae1 Mon Sep 17 00:00:00 2001
From: ruffsl <roxfoxpox@gmail.com>
Date: Mon, 18 May 2020 12:13:11 -0700
Subject: [PATCH 1/2] Revert libgazebo11 workaround

---
 .circleci/config.yml |  4 ----
 Dockerfile           | 21 ---------------------
 2 files changed, 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ec6a46b682..da909a0b58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,10 +74,6 @@ references:
                 rosdep install -q -y \
                   --from-paths src \
                   --ignore-src \
-                  --skip-keys " \
-                    gazebo11 \
-                    libgazebo11-dev \
-                  " \
                   --verbose | \
                 awk '$1 ~ /^resolution\:/' | \
                 awk -F'[][]' '{print $2}' | \
diff --git a/Dockerfile b/Dockerfile
index 4186488520..db641e1a65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,19 +42,6 @@ RUN apt-get update && apt-get install -q -y \
       lcov \
     && rm -rf /var/lib/apt/lists/*
 
-# TODO: clean up once libgazebo11-dev released into ros2 repo
-# https://github.com/ros-infrastructure/reprepro-updater/pull/75
-# https://github.com/ros/rosdistro/pull/24646
-# setup keys
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743
-# setup sources.list
-RUN . /etc/os-release \
-    && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list
-# install gazebo packages
-RUN apt-get update && apt-get install -q -y --no-install-recommends \
-      libgazebo11-dev \
-    && rm -rf /var/lib/apt/lists/*
-
 # install underlay dependencies
 ARG UNDERLAY_WS
 WORKDIR $UNDERLAY_WS
@@ -63,10 +50,6 @@ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
     apt-get update && rosdep install -q -y \
       --from-paths src \
       --ignore-src \
-      --skip-keys " \
-        gazebo11 \
-        libgazebo11-dev \
-      " \
     && rm -rf /var/lib/apt/lists/*
 
 # build underlay source
@@ -92,10 +75,6 @@ RUN . $UNDERLAY_WS/install/setup.sh && \
       --from-paths src \
         $UNDERLAY_WS/src \
       --ignore-src \
-      --skip-keys " \
-        gazebo11 \
-        libgazebo11-dev \
-      " \
     && rm -rf /var/lib/apt/lists/*
 
 # build overlay source

From 312cc1464877175678d1e87f286b178ef0588ba6 Mon Sep 17 00:00:00 2001
From: ruffsl <roxfoxpox@gmail.com>
Date: Mon, 18 May 2020 12:17:38 -0700
Subject: [PATCH 2/2] Revert gazebo_ros_pkgs to main ros2 branch

---
 tools/ros2_dependencies.repos | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos
index df9e1a177a..b6645197b0 100644
--- a/tools/ros2_dependencies.repos
+++ b/tools/ros2_dependencies.repos
@@ -10,10 +10,7 @@ repositories:
   ros-simulation/gazebo_ros_pkgs:
     type: git
     url: https://github.com/ros-simulation/gazebo_ros_pkgs.git
-    # TODO: Revert after support for Gazebo v11 is merged
-    # https://github.com/ros-simulation/gazebo_ros_pkgs/pull/1093
-    # version: ros2
-    version: gazebo11_foxy
+    version: ros2
   ros-perception/image_common:
     type: git
     url: https://github.com/ros-perception/image_common.git