fmauch · fmauch · May 20, 2021 · Jul 2, 2019 · Jul 15, 2019 · Jul 15, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -2,24 +2,32 @@ language: generic
 services:
   - docker
 
-notifications:
-  email:
-    on_success: always
-    on_failure: always
+cache:
+  directories:
+    - $HOME/.ccache
+
+git:
+  quiet: true
+
 env:
+  global:
+    - CCACHE_DIR=$HOME/.ccache
   matrix:
-    - ROS_DISTRO="kinetic"   ROS_REPO=ros
-    - ROS_DISTRO="kinetic"   ROS_REPO=ros-shadow-fixed
-    - ROS_DISTRO="kinetic"   PRERELEASE=true
-    - ROS_DISTRO="melodic"   ROS_REPO=ros
-    - ROS_DISTRO="melodic"   ROS_REPO=ros-shadow-fixed
-    - ROS_DISTRO="melodic"   PRERELEASE=true
+    - ROS_DISTRO="kinetic" ROS_REPO=main
+    - ROS_DISTRO="kinetic" ROS_REPO=testing
+    - ROS_DISTRO="kinetic" PRERELEASE=true
+    - ROS_DISTRO="melodic" ROS_REPO=main UPSTREAM_WORKSPACE='github:ros-industrial/ur_msgs#1.3.1'
+    - ROS_DISTRO="melodic" ROS_REPO=testing
+    - ROS_DISTRO="melodic" PRERELEASE=true UPSTREAM_WORKSPACE='github:ros-industrial/ur_msgs#1.3.1'
+
 matrix:
   allow_failures:
-    - env: ROS_DISTRO="melodic"   ROS_REPO=ros
-    - env: ROS_DISTRO="melodic"   ROS_REPO=ros-shadow-fixed
-    - env: ROS_DISTRO="melodic"   PRERELEASE=true
+    - env: ROS_DISTRO="kinetic" ROS_REPO=main
+    - env: ROS_DISTRO="kinetic" ROS_REPO=testing
+    - env: ROS_DISTRO="kinetic" PRERELEASE=true
+
 install:
-  - git clone --quiet --depth=1 https://github.com/ros-industrial/industrial_ci.git .ci_config
+  - git clone --quiet --depth=1 -b master https://github.com/ros-industrial/industrial_ci.git .industrial_ci
+
 script:
-  - source .ci_config/travis.sh
+  - .industrial_ci/travis.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+ROS-Industrial is a community project. We welcome contributions from any source, from those who are extremely active to casual users. The following sections outline the steps on how to contribute to ROS-Industrial. It assumes there is an existing repository to which one would like to contribute (item 1 in the figure above) and one is familiar with the Git "Fork and Branch" workflow, detailed [here](http://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/).
+
+1. Before any development is undertaken, a contributor would communicate a need and/or issue to the ROS-Industrial community. This can be done by submitting an issue on the appropriate GitHub repo, the [issues repo](https://github.com/ros-industrial/ros_industrial_issues), or by posting a message in the [ROS-Industrial category on ROS Discourse](//[email protected]). . Doing so may save you time if similar development is underway and ensure that whatever approach you take is acceptable to the community of reviewers once it is submitted.
+2. The second step (item 2) is to implement your change. If you are working on a code contribution, we highly recommend you utilize the [ROS Qt-Creator Plug-in](http://rosindustrial.org/news/2016/6/9/ros-qt-ide-plugin). Verify that your change successfully builds and passes all tests.
+3. Next, push your changes to a "feature" branch in your personal fork of the repo and issue a pull request (PR)(item 3). The PR allows maintainers to review the submitted code. Before the PR can be accepted, the maintainer and contributor must agree that the contribution is implemented appropriately. This process can take several back-and-forth steps (see [example](https://github.com/ros-industrial/motoman/pull/89)). Contributors should expect to spend as much time reviewing/changing the code as on the initial implementation. This time can be minimized by communicating with the ROS-Industrial community before any contribution is made.
+4. Issuing a Pull Request (PR) triggers the [Travis Continuous Integrations (CI)](https://github.com/ros-industrial/industrial_ci) step (item 4) which happens automatically in the background. The Travis CI performs several operations, and if any of the steps below fail, then the PR is marked accordingly for the maintainer.
+  * Travis Workflow:
+    * Installs a barebones ROS distribution on a fresh Ubuntu virtual machine.
+    * Creates a catkin workspace and puts the repository in it.
+    * Uses wstool to check out any from-source dependencies (i.e. other repositories).
+    * Resolves package dependencies using rosdep (i.e. install packages using apt-get).
+    * Compiles the catkin workspace.
+    * Runs all available unit tests.
+5. If the PR passes Travis CI and one of the maintainers is satisfied with the changes, they post a +1 as a comment on the PR (item 5). The +1 signifies that the PR is ready to be merged. All PRs require at least one +1 and pass Travis CI before it can be merged.
+6. The next step (item 6) is for the PR to be merged into the main branch. This is done through the GitHub web interface by selecting the “Merge pull request” button. After the PR is merged, all status badges are updated automatically.
+7. Periodically, the maintainer will release the package (item 7), which then gets sent to the [ROS Build Farm](http://wiki.ros.org/build.ros.org) for Debian creation.
+8. The publishing of the released packages (item 8) is managed by OSRF and is not on a set schedule. This usually happens when all packages for a given distro are built successfully and stable. The current status for the distro kinetic can be found [here](http://repositories.ros.org/status_page/ros_kinetic_default.html) . Navigating to other distros can be done by changing the distro name in the link.
+9. Once the package has been published, it is available to be installed by the developer (item 9).
+10. After the install of a new version, the developer may have questions, experience issues or it may not have the necessary functionality which should all be reported on the packages GitHub repository as an issue (item 10). If an issue is identified or there is missing functionality that the developer requires, the cycle starts back at (item 2).
+
+For more details, please refer to the [ROS-I wiki](http://wiki.ros.org/Industrial/DevProcess).
diff --git a/universal_robot/CHANGELOG.rst b/universal_robot/CHANGELOG.rst
diff --git a/universal_robot/CMakeLists.txt b/universal_robot/CMakeLists.txt
diff --git a/universal_robot/package.xml b/universal_robot/package.xml
diff --git a/universal_robots/package.xml b/universal_robots/package.xml
@@ -20,20 +20,16 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <exec_depend>ur10_e_moveit_config</exec_depend>
+  <exec_depend>ur10e_moveit_config</exec_depend>
   <exec_depend>ur10_moveit_config</exec_depend>
-  <exec_depend>ur3_e_moveit_config</exec_depend>
+  <exec_depend>ur16e_moveit_config</exec_depend>
+  <exec_depend>ur3e_moveit_config</exec_depend>
   <exec_depend>ur3_moveit_config</exec_depend>
-  <exec_depend>ur5_e_moveit_config</exec_depend>
+  <exec_depend>ur5e_moveit_config</exec_depend>
   <exec_depend>ur5_moveit_config</exec_depend>
-  <exec_depend>ur_bringup</exec_depend>
   <exec_depend>ur_description</exec_depend>
-  <exec_depend>ur_driver</exec_depend>
-  <exec_depend>ur_e_description</exec_depend>
-  <exec_depend>ur_e_gazebo</exec_depend>
   <exec_depend>ur_gazebo</exec_depend>
   <exec_depend>ur_kinematics</exec_depend>
-  <exec_depend>ur_msgs</exec_depend>
 
   <export>
     <metapackage/>

diff --git a/ur10_e_moveit_config/.setup_assistant b/ur10_e_moveit_config/.setup_assistant
diff --git a/ur10_e_moveit_config/CHANGELOG.rst b/ur10_e_moveit_config/CHANGELOG.rst
diff --git a/ur10_e_moveit_config/config/controllers.yaml b/ur10_e_moveit_config/config/controllers.yaml
diff --git a/ur10_e_moveit_config/config/ompl_planning.yaml b/ur10_e_moveit_config/config/ompl_planning.yaml
diff --git a/ur10_e_moveit_config/launch/default_warehouse_db.launch b/ur10_e_moveit_config/launch/default_warehouse_db.launch
diff --git a/ur10_e_moveit_config/launch/demo.launch b/ur10_e_moveit_config/launch/demo.launch