From ea26986c64594cdfc5a9b43a3010da1b5ef8671e Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Tue, 4 Feb 2020 23:29:16 +0200
Subject: [PATCH 1/2] Update repros for dashing and colcon tool.

ament_tool is obsolete
---
 ament_java.repos | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/ament_java.repos b/ament_java.repos
index 9498230..d8791e0 100644
--- a/ament_java.repos
+++ b/ament_java.repos
@@ -2,19 +2,19 @@ repositories:
   ament/ament_cmake:
     type: git
     url: https://github.com/ament/ament_cmake.git
-    version: 0.5.1
+    version: dashing
   ament/ament_index:
     type: git
     url: https://github.com/ament/ament_index.git
-    version: 0.5.1
+    version: dashing
   ament/ament_lint:
     type: git
     url: https://github.com/ament/ament_lint.git
-    version: 0.5.2
+    version: dashing
   ament/ament_package:
     type: git
     url: https://github.com/ament/ament_package.git
-    version: 0.5.2
+    version: dashing
   ament/ament_tools:
     type: git
     url: https://github.com/esteve/ament_tools.git
@@ -22,16 +22,28 @@ repositories:
   ament/googletest:
     type: git
     url: https://github.com/ament/googletest.git
-    version: 4b6e624e78ba3d43c1602ffc80478ee7253e0b04
+    version: dashing
   ament/osrf_pycommon:
     type: git
     url: https://github.com/osrf/osrf_pycommon.git
-    version: 0.1.5
+    version: dashing
   ament/uncrustify:
     type: git
-    url: https://github.com/ament/uncrustify.git
-    version: 0.66.1
+    url: https://github.com/uncrustify/uncrustify
+    version: master
+  ament/uncrustify_vendor:
+    type: git
+    url: https://github.com/ament/uncrustify_vendor/
+    version: dashing
   ament_java/ament_java:
     type: git
-    url: https://github.com/esteve/ament_java.git
+    url: https://github.com/ros2-java/ament_java
     version: master
+  colcon/colcon-gradle:
+    type: git
+    url: https://github.com/colcon/colcon-gradle
+    version: master
+  colcon/colcon-ros-gradle:
+    type: git
+    url: https://github.com/colcon/colcon-ros-gradle
+    version: master	

From 170d192a2da2e0f51b99e07206b384c522ea382e Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Tue, 4 Feb 2020 23:30:14 +0200
Subject: [PATCH 2/2] Update ament_java.repos

---
 ament_java.repos | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ament_java.repos b/ament_java.repos
index d8791e0..611cc9e 100644
--- a/ament_java.repos
+++ b/ament_java.repos
@@ -15,10 +15,6 @@ repositories:
     type: git
     url: https://github.com/ament/ament_package.git
     version: dashing
-  ament/ament_tools:
-    type: git
-    url: https://github.com/esteve/ament_tools.git
-    version: win32-platform
   ament/googletest:
     type: git
     url: https://github.com/ament/googletest.git