diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d126f25..14fa2e6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,261 +1,151 @@
-Release Notes - Sentry - Version 1.8.0
+Release Notes - Sentry - Version 2.1.0
+
 
 ** New Feature
-    * [SENTRY-711] - Implement grant user to role
-    * [SENTRY-785] - Allow export of sentry for a specific auth object
-    * [SENTRY-912] - Sentry integration with Apache Kafka
-    * [SENTRY-1154] - Uber Jira for enabling Sentry with blob storage
+    * [SENTRY-2106] - If Sentry is ahead do not trigger a full snapshot
+    * [SENTRY-2151] - Automatically derive owner privileges from Hive Object Ownership
+    * [SENTRY-2220] - Support all Hive SHOW GRANT commands
+
 
 ** Improvement
-    * [SENTRY-67] - Complete Hive Integration points
-    * [SENTRY-480] - Create import tool that will load policy file about Solr into the DB store
-    * [SENTRY-662] - SentryServiceIntegrationBase should use UGI based login
-    * [SENTRY-807] - Grant on URI should prepend namenode prefix
-    * [SENTRY-873] - [HMS HA] Have a HMS leader which would be responsible for sending path updates to Sentry
-    * [SENTRY-990] - Improve load time for HMS paths + HDFS sync
-    * [SENTRY-999] - Refactor the sentry to integrate with external components quickly
-    * [SENTRY-1076] - Add SSL support, print version info on Sentry Service webpage
-    * [SENTRY-1120] - Show role / privileges info in Sentry Service Webpage
-    * [SENTRY-1168] - Fix some "major" issues identified by Sonarqube
-    * [SENTRY-1205] - Refactor the code for sentry-provider-db and create sentry-service module
-    * [SENTRY-1206] - Add document for how to integrate with Sentry
-    * [SENTRY-1220] - Improve the import/export to support user scope
-    * [SENTRY-1229] - Add caching to SentryGenericProviderBackend
-    * [SENTRY-1233] - Logging improvements to SentryConfigToolSolr
-    * [SENTRY-1235] - Some pom changes
-    * [SENTRY-1251] - Move PolicyFileConstants to sentry-core-common
-    * [SENTRY-1254] - Upgrading SQL script for implement grant user to role
-    * [SENTRY-1268] - Add solr privilege convertor by default to solr binding
-    * [SENTRY-1269] - Converter vs Convertor is inconsistent
-    * [SENTRY-1290] - Performance improvement for ResourceAuthorizationProvider
-    * [SENTRY-1297] - wget is not a default command on mac
-    * [SENTRY-1404] - Use the new INodeAttributesProvider API in sentry-hdfs
-    * [SENTRY-1406] - Refactor: move AuthorizationProvider out of sentry-provider-common
-    * [SENTRY-1436] - Move PolicyFiles from sentry-provider-file to sentry-core-common
-    * [SENTRY-1450] - Have privilege converter set by Kafka binding
-    * [SENTRY-1470] - Apply Checkstyle changes to the core
-    * [SENTRY-1501] - SentryStore shouldn't synchronize openTransaction() and commitUpdateTransaction()
-    * [SENTRY-1505] - CommitContext isn't used by anything and should be removed
-    * [SENTRY-1507] - Sentry should use Datanucleus version of javax.jdo
-    * [SENTRY-1512] - Refactor the database transaction management
-    * [SENTRY-1516] - Add gpg configuration to the root pom to enable deployment to Maven Central
-    * [SENTRY-1517] - SentryStore should actually use function getMSentryRole to get roles
-    * [SENTRY-1518] - Add metrics for SentryStore transactions
-    * [SENTRY-1525] - Provide script to run Sentry directly from the repo
-    * [SENTRY-1533] - Sentry console metrics reporting interval should be configurable
-    * [SENTRY-1556] - Simplify privilege cleaning
-    * [SENTRY-1557] - getRolesForGroups() does too many trips to the the DB
-    * [SENTRY-1564] - Improve error detection and reporting in MetastoreCacheInitializer.java
-    * [SENTRY-1577] - Support "create function using jar" for hive when Sentry is enabled
-    * [SENTRY-1581] - Provide Log4J metrics reporter
-    * [SENTRY-1582] - Comments to clarify the intent of string manipulation methods in SentryStore.java
-    * [SENTRY-1594] - TransactionBlock should become generic
-    * [SENTRY-1599] - CloseablePersistenceManager is no longer needed
-    * [SENTRY-1615] - SentryStore should not allocate empty objects that are immediately returned
-    * [SENTRY-1625] - PrivilegeOperatePersistence can use QueryParamBuilder
-    * [SENTRY-1633] - Disable mvn failIfNotTest flag
-    * [SENTRY-1636] - Remove thrift dependency on fb303
-    * [SENTRY-1642] - Integrate Sentry build with Error Prone
-    * [SENTRY-1730] - Remove FileInputStream/FileOutputStream
-    * [SENTRY-1742] - Upgrade to Maven surefire plugin v2.2
-    * [SENTRY-1744] - Simplify creation of DelegateSentryStore
-    * [SENTRY-1811] - Optimize data structures used in HDFS sync
-    * [SENTRY-1823] - Fix the sentryShell script to support other types
-    * [SENTRY-1827] - Minimize TPathsDump thrift message used in HDFS sync
-    * [SENTRY-1836] - Add sentry web service config in service template
-    * [SENTRY-1846] - Use a consistent configuration variable for the sentry provider property
-
-** Bug
-    * [SENTRY-320] - show role grant group groupname should not throw an exception if group doesnt exist in db
-    * [SENTRY-418] - org.mortbay.log package accidentally picked up in a few test classes
-    * [SENTRY-522] - [Unit Test] TestExportImportPrivileges failed due to error "Couldn't access new HiveServer: "
-    * [SENTRY-722] - Grant on URI should validate the required resource string format
-    * [SENTRY-887] - Sentry Hive binding fails with NPE when authorizing permanent Hive UDFs
-    * [SENTRY-933] - Some UTs in TestPrivilegesAtFunctionScope should have two arguments for “org.apache.hadoop.hive.ql.udf.generic.GenericUDFPrintf”
-    * [SENTRY-947] - Improve error message in HDFS NN Plugin when unable to connect to Sentry
-    * [SENTRY-951] - move hive warehouse dir to /hive, the dir doesn't have hive:hive as owner.
-    * [SENTRY-961] - Remove fb303.thrift reference from thrift definitions
-    * [SENTRY-1001] - Improve usability of URIs and URI privileges
-    * [SENTRY-1020] - Action ALL is not recognized in the generic API
-    * [SENTRY-1069] - [Unit Test Failure] Fix TestAuditLogForSentryGenericService
-    * [SENTRY-1094] - SentryMetastorePostEventListener.onAlterTable should check for null dereference
-    * [SENTRY-1101] - When edit log for HDFS sync in Sentry Server is full, the next Path update is not correctly setup
-    * [SENTRY-1184] - Clean up HMSPaths.renameAuthzObject
-    * [SENTRY-1190] - IMPORT TABLE silently fails if Sentry is enabled
-    * [SENTRY-1193] - Add SQL upgrade script for 1.8.0
-    * [SENTRY-1201] - Sentry ignores database prefix for MSCK statement
-    * [SENTRY-1209] - Sentry does not block Hive's cross-schema table renames
-    * [SENTRY-1212] - Small authorization and compatibility checking bugs in Sentry conversion tool
-    * [SENTRY-1213] - Remove unnecessary file
-    * [SENTRY-1215] - Sentry's db provider makes privileges case insensitive.
-    * [SENTRY-1216] - [unit test failure] disable sentry ha tests for now; add time out for each test class/method; fix trainsient junit time out issue
-    * [SENTRY-1218] - [unit test failure] testFuncPrivileges1 takes more than 180s to finish so keep failing the test suites
-    * [SENTRY-1228] - SimpleFileProviderBackend error message missing spaces
-    * [SENTRY-1230] - Add basic testing workflow to test Sentry with Hive storage on S3
-    * [SENTRY-1236] - Bump thrift version to 0.9.3
-    * [SENTRY-1250] - Document kafka integration with sentry
-    * [SENTRY-1252] - grantServerPrivilege and revokeServerPrivilege should treat "*" and "ALL" as synonyms when action is not explicitly specified
-    * [SENTRY-1253] - SentryShellKafka is incorrectly setting component as "KAFKA"
-    * [SENTRY-1260] - Improve error handling - ArrayIndexOutOfBoundsException in PathsUpdate.parsePath can cause MetastoreCacheInitializer intialization to fail
-    * [SENTRY-1265] - Sentry service should not require a TGT as it is not talking to other kerberos services as a client
-    * [SENTRY-1270] - Improve error handling - Database with malformed URI causes NPE in HMS plugin during DDL
-    * [SENTRY-1294] - Fix the management problem for dependency's version
-    * [SENTRY-1302] - Update Hive V2 after moving Exception to sentry-core-common module
-    * [SENTRY-1311] - Improve usability of URI privileges by supporting mixed use of URIs with and without scheme
-    * [SENTRY-1312] - HDFS_PERMISSION_DEFAULT does not parse correctly
-    * [SENTRY-1313] - Database prefix is not honoured when executing grant statement
-    * [SENTRY-1320] - truncate table db_name.table_name fails
-    * [SENTRY-1334] - [column level privileges] test and add test for CTAS and Create View AS SELECT (cross databases cases)
-    * [SENTRY-1345] - ACLS on table folder disappear after insert for unpartitioned tables
-    * [SENTRY-1346] - add a test case into hdfs acl e2e suite to test a db.tbl without partition, can take more than certain number groups
-    * [SENTRY-1354] - add column level test cases for select ... group by, order by and where in V2
-    * [SENTRY-1357] - SentryMetastorePostEventListenerBase.onAlterTable should check for null dereference
-    * [SENTRY-1376] - Fix alter property case correctly - Deletes ACLS on the table
-    * [SENTRY-1401] - In V2, show role grant group groupname should not throw an exception if group doesnt exist in db.
-    * [SENTRY-1405] - Add test for "show grant role on all " command in V2
-    * [SENTRY-1410] - Enable sentry ha, validate is able to read active sentry server
-    * [SENTRY-1438] - Move PolicyFiles from sentry-provider-file to sentry-core-common in V2
-    * [SENTRY-1447] - When s3 is configured as HDFS defaultFS and Hive Warehouse Dir, need to fix some e2e test failures. For example, TestDbHdfsMaxGroups.java.
-    * [SENTRY-1459] - Alter view with HMS Client fails with "java.lang.IllegalArgumentException: Can not create a Path from a null string"
-    * [SENTRY-1464] - Sentry e2e test failure in org.apache.sentry.tests.e2e.dbprovider.TestDbUriPermissions.testAlterPartitionLocationPrivileges
-    * [SENTRY-1471] - TestHDFSIntegrationBase.java implements HDFS ACL checking and query verification incorrectly
-    * [SENTRY-1476] - SentryStore is subject to JDQL injection
-    * [SENTRY-1479] - Apply Checkstyle to sentry-policy module
-    * [SENTRY-1486] - Sentry should use repeatable-read consistency level
-    * [SENTRY-1491] - Sentry transactions are not rolled back immediately when commit fails
-    * [SENTRY-1504] - NPE in log4j.properties parsing
-    * [SENTRY-1508] - MetastorePlugin.java does not handle properly initialization failure
-    * [SENTRY-1515] - Cleanup exception handling in SentryStore
-    * [SENTRY-1524] - sentry-dist is missing dependency on sentry-hdfs-dist
-    * [SENTRY-1526] - Sentry processed stays alive after being killed
-    * [SENTRY-1532] - Sentry Web UI isn't working
-    * [SENTRY-1534] - Oracle supports serializable instead of repeatable-read
-    * [SENTRY-1546] - Generic Policy provides bad error messages for Sentry exceptions
-    * [SENTRY-1548] - Setting GrantOption to UNSET upsets Sentry
-    * [SENTRY-1586] - [unit test] Race condition between metastore server/client could cause connection refused errors
-    * [SENTRY-1605] - SENTRY-1508 need to be fixed because of Kerberos initialization issue
-    * [SENTRY-1609] - DelegateSentryStore is subject to JDQL injection
-    * [SENTRY-1624] - DefaultSentryValidator doesn't correctly construct SentryOnFailureHookContextImpl
-    * [SENTRY-1644] - Partition ACLs disappear after renaming Hive table with partitions
-    * [SENTRY-1646] - Unable to truncate table <database>.<tablename>; from "default" databases
-    * [SENTRY-1658] - Null pointer dereference in SentryShellHive
-    * [SENTRY-1663] - UpdateableAuthzPermissions has mutable static fields
-    * [SENTRY-1665] - cross-site scripting vulnerability in ConfServlet
-    * [SENTRY-1683] - MetastoreCacheInitializer has a race condition in handling results list
-    * [SENTRY-1727] - HMSPathsDumper.cloneToEntry should set authzObjToEntries properly
-    * [SENTRY-1759] - UpdatableCache leaks connections
-    * [SENTRY-1783] - alterSentryRoleGrantPrivilegeCore does more persistence work than required
-    * [SENTRY-1785] - Fix TestKrbConnectionTimeout test
-    * [SENTRY-1788] - Sentry Store may use JDO object after the associated data is removed in DB
-    * [SENTRY-1801] - Sentry Namenode Plugin should handle unknown permissions
-    * [SENTRY-1844] - When setting web authentication type to none, sentry fails to start
-    * [SENTRY-1845] - LOAD + OVERWRITE not supported in Hive v2. plugin
-
-** Task
-    * [SENTRY-950] - add column level test cases for select ... group by, order by and where
-    * [SENTRY-1131] - Add document for Generate audit trail for Sentry generic model in wiki
-    * [SENTRY-1171] - Please delete old releases from mirroring system
-    * [SENTRY-1255] - Pull out client dependencies from sentry-provider-db
-    * [SENTRY-1276] - Bump hadoop version to 2.6.1
-    * [SENTRY-1315] - Add an interface in WebUI to request for a Sentry full update
-    * [SENTRY-1431] - Sentry HA test HMSFollower during failover
-    * [SENTRY-1456] - SENTRY-1454 follow up: Commit message and rat check failure
-    * [SENTRY-1520] - Provide mechanism for triggering HMS full snapshot
+    * [SENTRY-853] - Handle show grant on <auth> failure correctly
+    * [SENTRY-1572] - SentryMain() shouldn't dynamically load tool class
+    * [SENTRY-1930] - Switch to hive-authz2 profile by default
+    * [SENTRY-1951] - Old SentryStore.retrieveFullPathsImage() should be removed
+    * [SENTRY-2076] - Some test artifacts are not defined at test scope
+    * [SENTRY-2145] - Some misc code cleanups
+    * [SENTRY-2147] - Fix Javadoc for SentryHiveAuthorizerFactory
+    * [SENTRY-2150] - Update Apache parent pom version
+    * [SENTRY-2165] - NotificationProcesser process notification methods have logs wrongly flagged as ERROR
+    * [SENTRY-2183] - Increase default sentry-hdfs rpc timeout to 20 mins
+    * [SENTRY-2198] - Update to Kafka 1.0.0
+    * [SENTRY-2269] - Make SentryStore pluggable
+    * [SENTRY-2284] - Add two client API to get all roles or users privileges mapping
+    * [SENTRY-2285] - Add a profile '-Pdist' to package Sentry binaries
+    * [SENTRY-2311] - Intellij is broken by shaded jars
+    * [SENTRY-2335] - Allow multiple callbacks to be run when a Signal is received.
+    * [SENTRY-2366] - Exclude jackson transitive dependencies 
+    * [SENTRY-2376] - Bump Jackson libraries versions to 1.9.13 and 2.9.6
+    * [SENTRY-2392] - Add metrics statistics to list_user_privileges and list_role_privileges API
+    * [SENTRY-2398] - Support multiple target versions on single source versions during schema upgrades
 
 ** Sub-task
-    * [SENTRY-726] - Update thrift API for grant user to role
-    * [SENTRY-727] - Update jdo model for grant user to role
-    * [SENTRY-728] - Update audit log for grant user to role
-    * [SENTRY-729] - Update binding-hive for grant user to role
-    * [SENTRY-730] - Update policy engine for grant user to role
-    * [SENTRY-731] - Update provider-backend for grant user to role
-    * [SENTRY-733] - Update notification handler for grant user to role
-    * [SENTRY-734] - Update SentryPolicyStoreProcessor for grant user to role
-    * [SENTRY-735] - Update AuthorizationProvider and e2e test for grant user to role
-    * [SENTRY-840] - Do not allow async initial updater of MetaStore cache
-    * [SENTRY-875] - Make update log size configurable in UpdateForwarder
-    * [SENTRY-1004] - Create CommonPrivilege for external component
-    * [SENTRY-1024] - Document for Sentry Kafka integration
-    * [SENTRY-1026] - Fix PMD tag for unused field.
-    * [SENTRY-1042] - Create CommonPolicy for external component
-    * [SENTRY-1070] - Rename kafka.superusers -> super.users based on kafka docs
-    * [SENTRY-1074] - Refactor ResourceAuthorizationProvider with CommonPrivilege and CommonPolicy
-    * [SENTRY-1086] - Add permission check and test case for alter db set owner
-    * [SENTRY-1089] - Move validator from sentry-policy-xxx to sentry-core-model-xxx
-    * [SENTRY-1090] - Improvement for CommonPrivilege
-    * [SENTRY-1091] - Create Model for specific components
-    * [SENTRY-1092] - Move Class KeyValue and PolicyConstants to sentry-core-common
-    * [SENTRY-1093] - Refactor the constructor of PolicyEngine
-    * [SENTRY-1103] - Authorizable names' case sensitivity must be decided by plugins
-    * [SENTRY-1104] - Add method in Privilege model to create privilege validators
-    * [SENTRY-1115] - Add caching to avoid huge performance hit
-    * [SENTRY-1123] - Add test cases for Hive, Solr, Index, Sqoop with the CommonPrivilege
-    * [SENTRY-1127] - Move test cases from sentry-policy-xxx to sentry-binding-xxx
-    * [SENTRY-1153] - Ensure AccessURI work with S3
-    * [SENTRY-1158] - Remove unnecessary sentry-policy-xxx
-    * [SENTRY-1160] - Enable dist for kafka-binding
-    * [SENTRY-1166] - Update default value for sentry.hive.server in Sentry wiki
-    * [SENTRY-1175] - Improve usability of URI privileges when granting URIs
-    * [SENTRY-1176] - Update thrift API for export with specific auth object
-    * [SENTRY-1177] - Update SentryStore for export with specific auth object
-    * [SENTRY-1178] - Update Sentry Policy Service for export with specific auth object
-    * [SENTRY-1179] - Update Sentry config tool for export with specific auth object
-    * [SENTRY-1199] - Update wiki page for export with specific auth object
-    * [SENTRY-1203] - Rebase the code
-    * [SENTRY-1208] - Make HOST implied in privileges if not specified explicitly.
-    * [SENTRY-1214] - Make Kafka resources/ Kafka Model case sensitive
-    * [SENTRY-1221] - Improve the SentryStore and thrift api for import/export with user scope
-    * [SENTRY-1222] - Improve SentryIniPolicyFileFormatter to support user section in .ini file
-    * [SENTRY-1225] - Improve SentryPolicyServiceClientDefaultImpl to support user section with import/export
-    * [SENTRY-1258] - Mysql upgrade SQL script for implement grant user to role
-    * [SENTRY-1261] - Derby upgrade SQL script for implement grant user to role
-    * [SENTRY-1262] - Oracle upgrade SQL script for implement grant user to role
-    * [SENTRY-1263] - Postgres upgrade SQL script for implement grant user to role
-    * [SENTRY-1272] - Enable ALTERVIEW_RENAME and ALTERVIEW_AS  operation in hive binding
-    * [SENTRY-1278] - DB2 upgrade SQL script for implement grant user to role
-    * [SENTRY-1283] - Enable alter table operation without outputs in hive binding
-    * [SENTRY-1286] - Create sentry-service-common module
-    * [SENTRY-1287] - Create sentry-service-server module
-    * [SENTRY-1288] - Create sentry-service-client module
-    * [SENTRY-1289] - Move exception to sentry-core-common module
-    * [SENTRY-1291] - SimpleCacheProviderBackend.getPrivileges should return the permission based on authorizationhierarchy
-    * [SENTRY-1292] - Reorder DBModelAction EnumSet
-    * [SENTRY-1293] - Avoid converting string permission to Privilege object
-    * [SENTRY-1304] - Enable CREATEMACRO and DROPMACRO  operations in hive binding
-    * [SENTRY-1319] - Add metrics for isActive and isHA
-    * [SENTRY-1327] - Enable "show grant role roleName on all" command
-    * [SENTRY-1337] - Move GroupMappingService from sentry-provider-common to sentry-core-common
-    * [SENTRY-1344] - Move AuthorizationComponent from sentry-provider-common to sentry-core-common
-    * [SENTRY-1348] - Move HA related class from sentry-provider-db to sentry-service-common
-    * [SENTRY-1349] - Add permission check and test case for alter db set owner in V2
-    * [SENTRY-1351] - Enable alter table operation without outputs  in V2
-    * [SENTRY-1352] - Enable CREATEMACRO and DROPMACRO operations in V2
-    * [SENTRY-1358] - Implement Grant role_name To User user_name in V2
-    * [SENTRY-1359] - Implement SHOW ROLE GRANT USER user_name in V2
-    * [SENTRY-1360] - Refactor grantPrivilege of Sentry Client
-    * [SENTRY-1361] - Refactor revokePrivilege of Sentry Client
-    * [SENTRY-1363] - Clean all pom.xml
-    * [SENTRY-1369] - Fix compile error for sentry-binding-hive-v2
-    * [SENTRY-1377] - improve handling of failures, both in tests and after-test cleanup, in TestHDFSIntegration.java
-    * [SENTRY-1394] - Fix compile error for sentry-test-hive-v2
-    * [SENTRY-1454] - Fix intermittent time out issue for TestHDFSIntegration
-    * [SENTRY-1651] - Port SENTRY-1404 to sentry-ha-redesign
-    * [SENTRY-1652] - Port SENTRY-1464 to sentry-ha-redesign
-    * [SENTRY-1655] - Port SENTRY-1471 to sentry-ha-redesign
-    * [SENTRY-1656] - Port Sentry-1459 to sentry-ha-redesign
-    * [SENTRY-1857] - Create new branch (branch-1.8) based on master
+    * [SENTRY-641] - Add binding for lily hbase indexer
+    * [SENTRY-2023] - Add sentry-shell support for hbase-indexer permissions
+    * [SENTRY-2055] - Update the pom file on master with the 2.1.0-SNAPSHOT.
+    * [SENTRY-2063] - Add timestamp in Thrift API for HDFS integration
+    * [SENTRY-2064] - Sentry client at HDFS should send back the timestamp in last response
+    * [SENTRY-2065] - Timestamp in MSentryPathChange and MSentryPermChange should be set by DB server
+    * [SENTRY-2152] - Only Admin can set dbproperty 'owner.privileges'
+    * [SENTRY-2153] - Get owner.privileges value from hive for a given DB
+    * [SENTRY-2154] - Update schema to grant privileges to user
+    * [SENTRY-2155] - Update JDO to grant privileges to user
+    * [SENTRY-2156] - Update provider-db backend code to grant privileges to user
+    * [SENTRY-2157] - Update audit log to grant/revoke owner privileges
+    * [SENTRY-2159] - Add e2e tests for granting owner privileges
+    * [SENTRY-2160] - Add owner in create table notification event
+    * [SENTRY-2162] - Retrieve and list user privileges for authorization
+    * [SENTRY-2169] - Make sure that the implicit privileges for a role are synced with HDFS
+    * [SENTRY-2174] - Sentry authorization provider should now generate ACL for users
+    * [SENTRY-2206] - Refactor out sentry api from sentry-provider-db to own module
+    * [SENTRY-2207] - Refactor out Sentry CLI from sentry-provider-db into own module
+    * [SENTRY-2208] - Refactor out Sentry service into own module from sentry-provider-db
+    * [SENTRY-2224] - Support SHOW GRANT on HIVE_OBJECT
+    * [SENTRY-2233] - Add e2e tests for testing HDFS sync for owner privileges.
+    * [SENTRY-2241] - Extend the Sync Listener to pass owner information to sentry server.
+    * [SENTRY-2246] - Construct owner privilege (TSentryPrivilege)
+    * [SENTRY-2247] - Add e2e tests to verify owner privileges
+    * [SENTRY-2251] - Update user privileges based on changes to authorizables
+    * [SENTRY-2252] - Normalize the Sentry store API's to handle both user/role privileges
+    * [SENTRY-2256] - Make thrift API changes to get user privileges from Sentry
+    * [SENTRY-2260] - Update HDFS ACL's based on owner privileges.
+    * [SENTRY-2264] - It is possible to elevate privileges from DROP using alter table rename
+    * [SENTRY-2265] - Translate owner privilege in sentry binding for authorization
+    * [SENTRY-2272] - Fix the sentry store logic for listing user privileges 
+    * [SENTRY-2273] - Create the SHOW GRANT USER task for Hive
+    * [SENTRY-2274] - Grant and revoke owner privileges based on HMS updates(server-side)
+    * [SENTRY-2275] - Grant and revoke owner privileges based on HMS updates(client-side)
+    * [SENTRY-2280] - The request received in SentryPolicyStoreProcessor.sentry_notify_hms_event is null 
+    * [SENTRY-2281] - list_privileges_by_user() fails with a JDODetachedFieldAccessException
+    * [SENTRY-2290] - Avoid storing the path information for partitions in default location
+    * [SENTRY-2294] - Add requestorUsername to client.notifyHmsEvent() method
+    * [SENTRY-2295] - Owner privileges should not be granted to sentry admin users
+    * [SENTRY-2296] - Add PermissionsUpdate for adding owner privilege on owner transfer
+    * [SENTRY-2307] - Avoid HMS event synchronization while sentry is fetching full snapshot. 
+    * [SENTRY-2312] - Update owner privileges for table when owner is changed.
+    * [SENTRY-2319] - ownership change should be done only by admin users
+    * [SENTRY-2339] - Support transfer of ownership for database/table to roles
+    * [SENTRY-2355] - Merge the DB owner privileges configurations into one enum configuration
+    * [SENTRY-2358] - Close JIRA version for 2.0.1
+    * [SENTRY-2363] - Update the wiki "How to release sentry"
+    * [SENTRY-2364] - Make an announcement for 2.0.1 release
+    * [SENTRY-2367] - Implement subsystem to allow for pluggable attribute providers and transports
+    * [SENTRY-2374] - Add Lombok for easier development
+
+
+** Bug
+    * [SENTRY-379] - Db entities are not captured when firing failurehook for SentryAccessDeniedException
+    * [SENTRY-1662] - Constants java uses mutable collection
+    * [SENTRY-1688] - Apache fails to build Sentry package Sentry-jdk-1.7-v2 
+    * [SENTRY-1819] - HMSFollower and friends do not belong in sentry.service.thrift
+    * [SENTRY-2034] - Add e2e tests for testing HMS notification processing.
+    * [SENTRY-2040] - When getting Snapshots from HMS we need more logging around cases when a snapshot is not being received
+    * [SENTRY-2049] - Remove hive-authz2 profile from the sentry-dist module
+    * [SENTRY-2078] - Have sentry server print an obvious INFO level log message when it becomes the writer
+    * [SENTRY-2079] - Sentry HA leader monitor does not work due to a mix of curator versions in the classpath
+    * [SENTRY-2082] - Exclude javax.servlet-3.0.0.v201112011016.jar from Sentry dist
+    * [SENTRY-2084] - Exclude javax.jms:jms from sentry distribution
+    * [SENTRY-2085] - Sentry error handling exposes SentryGroupNotFoundException externally
+    * [SENTRY-2092] - Drop Role log message shows "Creating role"
+    * [SENTRY-2115] -  Incorrect behavior of HMsFollower when HDFSSync feature is disabled.
+    * [SENTRY-2120] - Escape input string for error response message in LogLevelServlet
+    * [SENTRY-2123] - Specify code path of auth-generated thrift files for Javadoc and exclude them from Javadoc generation
+    * [SENTRY-2124] - LeaderStatusMonitor.toString() throws IllegalFormatConversionException with AtomicLong
+    * [SENTRY-2127] - Fix unstable unit test TestColumnEndToEnd.testCrossDbTableOperations
+    * [SENTRY-2136] - Bump metrics dependency to new namespace and version used by the rest of Hadoop
+    * [SENTRY-2164] - Convert uses of TransactionBlock to lambdas
+    * [SENTRY-2167] - Change ignored logging messages to debug level in NotificationProcessor
+    * [SENTRY-2178] - Sentry permissions for Solr are deleted as part of migration process
+    * [SENTRY-2184] - Performance Issue: MPath is queried for each MAuthzPathsMapping in full snapshot
+    * [SENTRY-2190] - Have verbose debug logs in CounterWait class
+    * [SENTRY-2192] - supress date value in @Generated annotation generated by thrift
+    * [SENTRY-2193] - Synchronize thrift definition with the generated sources
+    * [SENTRY-2200] - Migrate 3.x Datanucleus unsupported configurations to 4.1 Datanucleus 
+    * [SENTRY-2209] - Incorrect class in SentryHdfsMetricsUtil.java
+    * [SENTRY-2212] - smart-apply-patch.sh isn't so smart, won't apply changes when files have been moved or renamed
+    * [SENTRY-2214] - Sentry should not allow URI grants to EMPTY or NULL locations
+    * [SENTRY-2226] - Support Hive operation ALTER TABLE EXCHANGE
+    * [SENTRY-2231] - Fix URI check on List Privileges by Provider in SentryStore
+    * [SENTRY-2236] - Add UNKNOWN to PrincipalType
+    * [SENTRY-2238] - Explicitly set Database on SentryHivePrivilegeObjectDesc 
+    * [SENTRY-2257] - Implement Sentry store API's to update owner privilege on a authorizable
+    * [SENTRY-2262] - Sentry client is not compatible when connecting to Sentry 2.0
+    * [SENTRY-2267] - Listing user privileges fails because roleName field is required on Thrift
+    * [SENTRY-2270] - Illegal privileges on columns can be granted on Hive
+    * [SENTRY-2271] - Wrong log messages/method names in SentrySchema related classes.
+    * [SENTRY-2278] - SentryPolicyServiceClientDefaultImpl setupSentryAuthorizable methods always returns a single TSentryAuthorizable for a list of authorizable
+    * [SENTRY-2282] - Remove hive-authzv2 binding and tests modules completely
+    * [SENTRY-2283] - Multiple versions of metrics on the classpath causes Sentry to not startup
+    * [SENTRY-2308] - Create privilege on table has no use case
+    * [SENTRY-2310] - Sentry is not be able to fetch full update subsequently,  when there is HMS restart in the snapshot process.
+    * [SENTRY-2315] - The grant all operation is not dropping the create/alter/drop/index/lock privileges.
+    * [SENTRY-2330] - Change sentry-service-server to use ${project.version}
+    * [SENTRY-2337] - [REVERT] SENTRY-2295: Owner privileges should not be granted to sentry admin users
+    * [SENTRY-2352] - User roles with ALTER on a table can not show or describe the table on which they have ALTER
+    * [SENTRY-2359] - Object owner is unable to grant privileges: SentryAccessDeniedException
+    * [SENTRY-2369] - Remove the index for `USER_ID` and `DB_PRIVILEGE_ID` in `SENTRY_USER_DB_PRIVILEGE_MAP`
+    * [SENTRY-2375] - Fix API typos on SentryPolicyServiceClient
+    * [SENTRY-2394] - Typo in sentry-site.xml.service.template
+    * [SENTRY-2395] - ALTER VIEW AS SELECT is asking for CREATE privileges instead of ALTER
+
+
+** Task
+    * [SENTRY-2056] - Display test-patch.py output on the standard console to see progress on Jenkins
+    * [SENTRY-2096] - Fail unit tests at end during test-patch.py execution
+    * [SENTRY-2118] - Document Configuration required to make Column authentication work
+    * [SENTRY-2199] - Bump Hive version from 2.3.2 to 2.3.3
+    * [SENTRY-2215] - Remove unused SentryGrantRevokeTask class
+    * [SENTRY-2277] - Add to SentryStore testURI test case testing with multiple URI privileges
 
 ** Test
-    * [SENTRY-583] - Add boundary condition test coverage to HDFS synchronization test suite around max #of groups
-    * [SENTRY-858] - Add a test case for - Database prefix is not honoured when executing grant statement 
-    * [SENTRY-1108] - Improve surefire execution to run tests concurrently
-    * [SENTRY-1134] - Add user defined udf test case
-    * [SENTRY-1266] - Add ConfigTool tests to skipSlowAndNotThreadSafeTests blacklist
-    * [SENTRY-1299] - Add a test case to verify SentryStore#verifySentryStoreSchema works
-    * [SENTRY-1390] - Add test cases to ensure usability of URI privileges for HMS binding
-    * [SENTRY-1391] - Add more test cases for perm and temp UDF
-    * [SENTRY-1402] - Add TestGrantUserToRole to V2
-    * [SENTRY-1489] - Categorize e2e tests into slow and regular tests, so that can adapt the timeout and etc.
-    * [SENTRY-1497] - create a sentry scale test tool to add various objects and privileges into Sentry and HMS
-    * [SENTRY-1503] - Remove all sequence ID checks from TestSentryStore
-    * [SENTRY-1809] - Use Apache Curator in the Kafka tests
+    * [SENTRY-2094] - Enable TestHDFSIntegrationWithHA tests
diff --git a/pom.xml b/pom.xml
index 984e15a..73112e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.sentry</groupId>
   <artifactId>sentry</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0</version>
   <description>Sentry component</description>
   <name>Sentry</name>
   <packaging>pom</packaging>
diff --git a/sentry-binding/pom.xml b/sentry-binding/pom.xml
index fd5e28b..8784794 100644
--- a/sentry-binding/pom.xml
+++ b/sentry-binding/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding</artifactId>
diff --git a/sentry-binding/sentry-binding-hbase-indexer/pom.xml b/sentry-binding/sentry-binding-hbase-indexer/pom.xml
index d50acfe..e0cb32c 100644
--- a/sentry-binding/sentry-binding-hbase-indexer/pom.xml
+++ b/sentry-binding/sentry-binding-hbase-indexer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-hbase-indexer</artifactId>
diff --git a/sentry-binding/sentry-binding-hive-common/pom.xml b/sentry-binding/sentry-binding-hive-common/pom.xml
index e154cde..cfa5081 100644
--- a/sentry-binding/sentry-binding-hive-common/pom.xml
+++ b/sentry-binding/sentry-binding-hive-common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-hive-common</artifactId>
diff --git a/sentry-binding/sentry-binding-hive-conf/pom.xml b/sentry-binding/sentry-binding-hive-conf/pom.xml
index 3e7e70a..c9f6fcc 100644
--- a/sentry-binding/sentry-binding-hive-conf/pom.xml
+++ b/sentry-binding/sentry-binding-hive-conf/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-hive-conf</artifactId>
diff --git a/sentry-binding/sentry-binding-hive-follower/pom.xml b/sentry-binding/sentry-binding-hive-follower/pom.xml
index 5f8a5af..5e51cc2 100644
--- a/sentry-binding/sentry-binding-hive-follower/pom.xml
+++ b/sentry-binding/sentry-binding-hive-follower/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-hive-follower</artifactId>
diff --git a/sentry-binding/sentry-binding-hive/pom.xml b/sentry-binding/sentry-binding-hive/pom.xml
index 09d75f7de..6f4d69e 100644
--- a/sentry-binding/sentry-binding-hive/pom.xml
+++ b/sentry-binding/sentry-binding-hive/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-hive</artifactId>
diff --git a/sentry-binding/sentry-binding-kafka/pom.xml b/sentry-binding/sentry-binding-kafka/pom.xml
index e4fdddf..27b0ad9 100644
--- a/sentry-binding/sentry-binding-kafka/pom.xml
+++ b/sentry-binding/sentry-binding-kafka/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-kafka</artifactId>
diff --git a/sentry-binding/sentry-binding-solr/pom.xml b/sentry-binding/sentry-binding-solr/pom.xml
index f086699..cba7d59 100644
--- a/sentry-binding/sentry-binding-solr/pom.xml
+++ b/sentry-binding/sentry-binding-solr/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-solr</artifactId>
diff --git a/sentry-binding/sentry-binding-sqoop/pom.xml b/sentry-binding/sentry-binding-sqoop/pom.xml
index 82cd4a6..37c02f9 100644
--- a/sentry-binding/sentry-binding-sqoop/pom.xml
+++ b/sentry-binding/sentry-binding-sqoop/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-binding-sqoop</artifactId>
diff --git a/sentry-core/pom.xml b/sentry-core/pom.xml
index 173d203..e536805 100644
--- a/sentry-core/pom.xml
+++ b/sentry-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core</artifactId>
diff --git a/sentry-core/sentry-core-common/pom.xml b/sentry-core/sentry-core-common/pom.xml
index 75ce574..07b6bcb 100644
--- a/sentry-core/sentry-core-common/pom.xml
+++ b/sentry-core/sentry-core-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-common</artifactId>
diff --git a/sentry-core/sentry-core-model-db/pom.xml b/sentry-core/sentry-core-model-db/pom.xml
index 30519aa..1e0b02d 100644
--- a/sentry-core/sentry-core-model-db/pom.xml
+++ b/sentry-core/sentry-core-model-db/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-model-db</artifactId>
diff --git a/sentry-core/sentry-core-model-indexer/pom.xml b/sentry-core/sentry-core-model-indexer/pom.xml
index f65e49a..1ccc8e8 100644
--- a/sentry-core/sentry-core-model-indexer/pom.xml
+++ b/sentry-core/sentry-core-model-indexer/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-model-indexer</artifactId>
diff --git a/sentry-core/sentry-core-model-kafka/pom.xml b/sentry-core/sentry-core-model-kafka/pom.xml
index cfe9221..6a7a989 100644
--- a/sentry-core/sentry-core-model-kafka/pom.xml
+++ b/sentry-core/sentry-core-model-kafka/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-model-kafka</artifactId>
diff --git a/sentry-core/sentry-core-model-solr/pom.xml b/sentry-core/sentry-core-model-solr/pom.xml
index 95ea02b..defeaba 100644
--- a/sentry-core/sentry-core-model-solr/pom.xml
+++ b/sentry-core/sentry-core-model-solr/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-model-solr</artifactId>
diff --git a/sentry-core/sentry-core-model-sqoop/pom.xml b/sentry-core/sentry-core-model-sqoop/pom.xml
index 5629028..9ddfd1b 100644
--- a/sentry-core/sentry-core-model-sqoop/pom.xml
+++ b/sentry-core/sentry-core-model-sqoop/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-core</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-core-model-sqoop</artifactId>
diff --git a/sentry-dist/pom.xml b/sentry-dist/pom.xml
index b892536..c795809 100644
--- a/sentry-dist/pom.xml
+++ b/sentry-dist/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <artifactId>sentry-dist</artifactId>
   <name>Sentry Distribution</name>
diff --git a/sentry-hdfs/pom.xml b/sentry-hdfs/pom.xml
index a015e11..358350e 100644
--- a/sentry-hdfs/pom.xml
+++ b/sentry-hdfs/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-hdfs</artifactId>
diff --git a/sentry-hdfs/sentry-hdfs-common/pom.xml b/sentry-hdfs/sentry-hdfs-common/pom.xml
index 2bfb76d..f8fa887 100644
--- a/sentry-hdfs/sentry-hdfs-common/pom.xml
+++ b/sentry-hdfs/sentry-hdfs-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-hdfs</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-hdfs-common</artifactId>
diff --git a/sentry-hdfs/sentry-hdfs-dist/pom.xml b/sentry-hdfs/sentry-hdfs-dist/pom.xml
index 1e04bf2..123f631 100644
--- a/sentry-hdfs/sentry-hdfs-dist/pom.xml
+++ b/sentry-hdfs/sentry-hdfs-dist/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-hdfs</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-hdfs-dist</artifactId>
diff --git a/sentry-hdfs/sentry-hdfs-namenode-plugin/pom.xml b/sentry-hdfs/sentry-hdfs-namenode-plugin/pom.xml
index e1bd8c3..716789b 100644
--- a/sentry-hdfs/sentry-hdfs-namenode-plugin/pom.xml
+++ b/sentry-hdfs/sentry-hdfs-namenode-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-hdfs</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-hdfs-namenode-plugin</artifactId>
diff --git a/sentry-hdfs/sentry-hdfs-service/pom.xml b/sentry-hdfs/sentry-hdfs-service/pom.xml
index 888f61e..bcdf8c3 100644
--- a/sentry-hdfs/sentry-hdfs-service/pom.xml
+++ b/sentry-hdfs/sentry-hdfs-service/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-hdfs</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-hdfs-service</artifactId>
diff --git a/sentry-policy/pom.xml b/sentry-policy/pom.xml
index 1124829..89cf602 100644
--- a/sentry-policy/pom.xml
+++ b/sentry-policy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-policy</artifactId>
diff --git a/sentry-policy/sentry-policy-common/pom.xml b/sentry-policy/sentry-policy-common/pom.xml
index 902f3e6..c2f0075 100644
--- a/sentry-policy/sentry-policy-common/pom.xml
+++ b/sentry-policy/sentry-policy-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-policy</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-policy-common</artifactId>
diff --git a/sentry-policy/sentry-policy-engine/pom.xml b/sentry-policy/sentry-policy-engine/pom.xml
index 5bdd10b..6c1576a 100644
--- a/sentry-policy/sentry-policy-engine/pom.xml
+++ b/sentry-policy/sentry-policy-engine/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-policy</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <artifactId>sentry-policy-engine</artifactId>
diff --git a/sentry-provider/pom.xml b/sentry-provider/pom.xml
index b075f49..814fe45 100644
--- a/sentry-provider/pom.xml
+++ b/sentry-provider/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-provider</artifactId>
diff --git a/sentry-provider/sentry-provider-cache/pom.xml b/sentry-provider/sentry-provider-cache/pom.xml
index e278878..ec43c05 100644
--- a/sentry-provider/sentry-provider-cache/pom.xml
+++ b/sentry-provider/sentry-provider-cache/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-provider</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-provider-cache</artifactId>
diff --git a/sentry-provider/sentry-provider-common/pom.xml b/sentry-provider/sentry-provider-common/pom.xml
index f269873..a733eaf 100644
--- a/sentry-provider/sentry-provider-common/pom.xml
+++ b/sentry-provider/sentry-provider-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-provider</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-provider-common</artifactId>
diff --git a/sentry-provider/sentry-provider-db/pom.xml b/sentry-provider/sentry-provider-db/pom.xml
index ab586f7..6d2590e 100644
--- a/sentry-provider/sentry-provider-db/pom.xml
+++ b/sentry-provider/sentry-provider-db/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-provider</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-provider-db</artifactId>
diff --git a/sentry-provider/sentry-provider-file/pom.xml b/sentry-provider/sentry-provider-file/pom.xml
index 6623ffe..78e603d 100644
--- a/sentry-provider/sentry-provider-file/pom.xml
+++ b/sentry-provider/sentry-provider-file/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-provider</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-provider-file</artifactId>
diff --git a/sentry-service/pom.xml b/sentry-service/pom.xml
index b63467b..565e86b 100644
--- a/sentry-service/pom.xml
+++ b/sentry-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>sentry</artifactId>
         <groupId>org.apache.sentry</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sentry-service/sentry-service-api/pom.xml b/sentry-service/sentry-service-api/pom.xml
index be95976..465ccf2 100644
--- a/sentry-service/sentry-service-api/pom.xml
+++ b/sentry-service/sentry-service-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>sentry-service</artifactId>
         <groupId>org.apache.sentry</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sentry-service/sentry-service-client/pom.xml b/sentry-service/sentry-service-client/pom.xml
index a1ae8c8..8249b20 100644
--- a/sentry-service/sentry-service-client/pom.xml
+++ b/sentry-service/sentry-service-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-service</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <artifactId>sentry-service-client</artifactId>
diff --git a/sentry-service/sentry-service-server/pom.xml b/sentry-service/sentry-service-server/pom.xml
index 4919183..7729656 100644
--- a/sentry-service/sentry-service-server/pom.xml
+++ b/sentry-service/sentry-service-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-service</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
 
     <artifactId>sentry-service-server</artifactId>
diff --git a/sentry-solr/pom.xml b/sentry-solr/pom.xml
index df8c397..218c73e 100644
--- a/sentry-solr/pom.xml
+++ b/sentry-solr/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-solr</artifactId>
diff --git a/sentry-solr/solr-sentry-handlers/pom.xml b/sentry-solr/solr-sentry-handlers/pom.xml
index accd581..4f9e4ba 100644
--- a/sentry-solr/solr-sentry-handlers/pom.xml
+++ b/sentry-solr/solr-sentry-handlers/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-solr</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>solr-sentry-handlers</artifactId>
diff --git a/sentry-spi/pom.xml b/sentry-spi/pom.xml
index f9dbc7f..eb9e668 100644
--- a/sentry-spi/pom.xml
+++ b/sentry-spi/pom.xml
@@ -26,12 +26,12 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-spi</artifactId>
   <name>Sentry Service Provider Interface Control</name>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0</version>
 
   <dependencies>
     <dependency>
diff --git a/sentry-tests/pom.xml b/sentry-tests/pom.xml
index e17f2a8..1b6bd0d 100644
--- a/sentry-tests/pom.xml
+++ b/sentry-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <artifactId>sentry-tests</artifactId>
   <name>Sentry Tests</name>
diff --git a/sentry-tests/sentry-tests-hive/pom.xml b/sentry-tests/sentry-tests-hive/pom.xml
index 388023c..d9e535d 100644
--- a/sentry-tests/sentry-tests-hive/pom.xml
+++ b/sentry-tests/sentry-tests-hive/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-tests</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <artifactId>sentry-tests-hive</artifactId>
   <name>Sentry Hive Tests</name>
diff --git a/sentry-tests/sentry-tests-kafka/pom.xml b/sentry-tests/sentry-tests-kafka/pom.xml
index 03bc574..c6c0565 100644
--- a/sentry-tests/sentry-tests-kafka/pom.xml
+++ b/sentry-tests/sentry-tests-kafka/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>sentry-tests</artifactId>
     <groupId>org.apache.sentry</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/sentry-tests/sentry-tests-solr/pom.xml b/sentry-tests/sentry-tests-solr/pom.xml
index cc0969a..cdf2924 100644
--- a/sentry-tests/sentry-tests-solr/pom.xml
+++ b/sentry-tests/sentry-tests-solr/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-tests</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-tests-solr</artifactId>
diff --git a/sentry-tests/sentry-tests-sqoop/pom.xml b/sentry-tests/sentry-tests-sqoop/pom.xml
index 13f8eed..2a999f5 100644
--- a/sentry-tests/sentry-tests-sqoop/pom.xml
+++ b/sentry-tests/sentry-tests-sqoop/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-tests</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
 
   <artifactId>sentry-tests-sqoop</artifactId>
diff --git a/sentry-thirdparty/pom.xml b/sentry-thirdparty/pom.xml
index bfb5fa9..7c0fc9d 100644
--- a/sentry-thirdparty/pom.xml
+++ b/sentry-thirdparty/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>sentry</artifactId>
     <groupId>org.apache.sentry</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
diff --git a/sentry-thirdparty/sentry-shaded/pom.xml b/sentry-thirdparty/sentry-shaded/pom.xml
index beb89b0..99a9217 100644
--- a/sentry-thirdparty/sentry-shaded/pom.xml
+++ b/sentry-thirdparty/sentry-shaded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>sentry-thirdparty</artifactId>
     <groupId>org.apache.sentry</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/sentry-tools/pom.xml b/sentry-tools/pom.xml
index 05cd75c..4bf374c 100644
--- a/sentry-tools/pom.xml
+++ b/sentry-tools/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <artifactId>sentry</artifactId>
         <groupId>org.apache.sentry</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sentry-tools</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
 
     <dependencies>
         <dependency>