Update version numbers for release

adeguet1 · adeguet1 · commit 2d1590a64793 · 2021-04-13T11:03:31.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,8 +2,7 @@
 # Author(s):  Anton Deguet
 # Created on: 2011-01-20
 #
-# (C) Copyright 2011-2017 Johns Hopkins University (JHU), All Rights
-# Reserved.
+# (C) Copyright 2011-2021 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -13,7 +12,7 @@
 #
 # --- end cisst license ---
 
-project (sawIntuitiveDaVinciAll)
+project (sawIntuitiveDaVinciPackage)
 
 cmake_minimum_required (VERSION 2.8)
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2011-2018 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2011-2021 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -19,7 +19,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
                               cisstMultiTask
                               cisstParameterTypes)
 
-find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -49,8 +49,8 @@ if (cisst_FOUND_AS_REQUIRED)
     set (sawIntuitiveDaVinci_LIBRARIES sawIntuitiveDaVinci "${isi_api_LIBRARIES}")
 
     # Set the version number
-    set (sawIntuitiveDaVinci_VERSION_MAJOR "1")
-    set (sawIntuitiveDaVinci_VERSION_MINOR "2")
+    set (sawIntuitiveDaVinci_VERSION_MAJOR "2")
+    set (sawIntuitiveDaVinci_VERSION_MINOR "0")
     set (sawIntuitiveDaVinci_VERSION_PATCH "0")
     set (sawIntuitiveDaVinci_VERSION "${sawIntuitiveDaVinci_VERSION_MAJOR}.${sawIntuitiveDaVinci_VERSION_MINOR}.${sawIntuitiveDaVinci_VERSION_PATCH}")
 
diff --git a/components/package.xml b/components/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_da_vinci</name>
-  <version>1.2.0</version>
+  <version>2.0.0</version>
   <description>
   sawIntuitiveDaVinci
   </description>
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2009-2020 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2009-2021 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -22,7 +22,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -36,7 +36,7 @@ if (cisst_FOUND_AS_REQUIRED)
   endif ()
 
   # sawIntuitiveDaVinci has been compiled within cisst, we should find it automatically
-  find_package (sawIntuitiveDaVinci 1.2.0)
+  find_package (sawIntuitiveDaVinci 2.0.0)
 
   if (sawIntuitiveDaVinci_FOUND)
 
diff --git a/examples/package.xml b/examples/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>saw_intuitive_da_vinci_examples</name>
-  <version>1.2.0</version>
+  <version>2.0.0</version>
   <description>
   sawIntuitiveDaVinci Examples
   </description>
diff --git a/ros/CMakeLists.txt b/ros/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2009-2020 Johns Hopkins University (JHU), All Rights Reserved.
+# (C) Copyright 2009-2021 Johns Hopkins University (JHU), All Rights Reserved.
 #
 # --- begin cisst license - do not edit ---
 #
@@ -35,7 +35,7 @@ set (REQUIRED_CISST_LIBRARIES
      cisstQt)
 
 # find cisst and make sure the required libraries have been compiled
-find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
+find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})
 
 if (cisst_FOUND_AS_REQUIRED)
 
@@ -52,7 +52,7 @@ if (cisst_FOUND_AS_REQUIRED)
                   LIBRARIES isi_ros
                   CATKIN_DEPENDS cisst_ros_bridge geometry_msgs roscpp std_msgs)
 
-  find_package (sawIntuitiveDaVinci 1.2.0)
+  find_package (sawIntuitiveDaVinci 2.0.0)
 
   if (sawIntuitiveDaVinci_FOUND)
 
diff --git a/ros/isi.rosinstall b/ros/isi.rosinstall
@@ -5,16 +5,16 @@
 - git:
     local-name: cisst-saw/cisst
     uri: https://github.com/jhu-cisst/cisst
-    version: devel
+    version: 1.1.0
 - git:
     local-name: cisst-saw/cisst-ros
     uri: https://github.com/jhu-cisst/cisst-ros
-    version: devel
+    version: 2.0.0
 - git:
     local-name: crtk/crtk_msgs
     uri: https://github.com/collaborative-robotics/crtk_msgs
-    version: master   
+    version: master
 - git:
     local-name: cisst-saw/sawIntuitiveDaVinci
     uri: https://github.com/jhu-saw/sawIntuitiveDaVinci
-    version: devel
+    version: 2.0.0
diff --git a/ros/package.xml b/ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>isi_ros</name>
-  <version>1.2.0</version>
+  <version>2.0.0</version>
   <description>The ISI ROS package</description>
 
   <maintainer email="anton.deguet@jhu.edu">Anton Deguet</maintainer>

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`# Author(s): Anton Deguet`
`3`	`3`	`# Created on: 2011-01-20`
`4`	`4`	`#`
`5`		`-# (C) Copyright 2011-2017 Johns Hopkins University (JHU), All Rights`
`6`		`-# Reserved.`
	`5`	`+# (C) Copyright 2011-2021 Johns Hopkins University (JHU), All Rights Reserved.`
`7`	`6`	`#`
`8`	`7`	`# --- begin cisst license - do not edit ---`
`9`	`8`	`#`
`@@ -13,7 +12,7 @@`
`13`	`12`	`#`
`14`	`13`	`# --- end cisst license ---`
`15`	`14`
`16`		`-project (sawIntuitiveDaVinciAll)`
	`15`	`+project (sawIntuitiveDaVinciPackage)`
`17`	`16`
`18`	`17`	`cmake_minimum_required (VERSION 2.8)`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# (C) Copyright 2009-2020 Johns Hopkins University (JHU), All Rights Reserved.`
	`2`	`+# (C) Copyright 2009-2021 Johns Hopkins University (JHU), All Rights Reserved.`
`3`	`3`	`#`
`4`	`4`	`# --- begin cisst license - do not edit ---`
`5`	`5`	`#`
`@@ -22,7 +22,7 @@ set (REQUIRED_CISST_LIBRARIES`
`22`	`22`	`cisstQt)`
`23`	`23`
`24`	`24`	`# find cisst and make sure the required libraries have been compiled`
`25`		`-find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})`
	`25`	`+find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})`
`26`	`26`
`27`	`27`	`if (cisst_FOUND_AS_REQUIRED)`
`28`	`28`
`@@ -36,7 +36,7 @@ if (cisst_FOUND_AS_REQUIRED)`
`36`	`36`	`endif ()`
`37`	`37`
`38`	`38`	`# sawIntuitiveDaVinci has been compiled within cisst, we should find it automatically`
`39`		`- find_package (sawIntuitiveDaVinci 1.2.0)`
	`39`	`+ find_package (sawIntuitiveDaVinci 2.0.0)`
`40`	`40`
`41`	`41`	`if (sawIntuitiveDaVinci_FOUND)`
`42`	`42`