date:20171201

[sentry] Git Push Summary

2017-12-01 Thread spena

Repository: sentry
Updated Branches:
  refs/heads/branch-2.0.0 [deleted] b7fff9dc9

[1/3] sentry git commit: SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)

2017-12-01 Thread kalyan

Repository: sentry
Updated Branches:
  refs/heads/master 4583c26ad -> 10de29b39


SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar 
Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/3fe0dfa9
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/3fe0dfa9
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/3fe0dfa9

Branch: refs/heads/master
Commit: 3fe0dfa96bcac59c371de240adb5912d71be617b
Parents: 4583c26
Author: Kalyan Kumar Kalvagadda 
Authored: Fri Dec 1 17:44:50 2017 -0600
Committer: Kalyan Kumar Kalvagadda 
Committed: Fri Dec 1 18:20:01 2017 -0600

--
 pom.xml | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/3fe0dfa9/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 40d96e3..34ec9f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -731,6 +731,19 @@ limitations under the License.
 jetty-servlet
 ${jetty.version}
   
+  
+org.apache.hive.hcatalog
+hive-hcatalog-server-extensions
+${hive.version}
+
+  
+  
+javax.jms
+jms
+  
+
+

[2/3] sentry git commit: SENTRY-2081: Automate the generation LICENSE.txt based on distributed jars. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Colm O hEigeartaigh, Alexander Kolbasov)

2017-12-01 Thread kalyan

http://git-wip-us.apache.org/repos/asf/sentry/blob/10de29b3/sentry-dist/src/main/resources/licences/CDDL_1_1.txt
--
diff --git a/sentry-dist/src/main/resources/licences/CDDL_1_1.txt 
b/sentry-dist/src/main/resources/licences/CDDL_1_1.txt
new file mode 100644
index 000..49478c7
--- /dev/null
+++ b/sentry-dist/src/main/resources/licences/CDDL_1_1.txt
@@ -0,0 +1,797 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+1. Definitions.
+
+1.1. âContributorâ means each individual or entity that creates or
+contributes to the creation of Modifications.
+1.2. âContributor Versionâ means the combination of the Original Software,
+prior Modifications used by a Contributor (if any), and the Modifications made
+by that particular Contributor.
+1.3. âCovered Softwareâ means (a) the Original Software, or (b)
+Modifications, or (c) the combination of files containing Original Software 
with
+files containing Modifications, in each case including portions thereof.
+1.4. âExecutableâ means the Covered Software in any form other than Source
+Code.
+1.5. âInitial Developerâ means the individual or entity that first makes
+Original Software available under this License.
+1.6. âLarger Workâ means a work which combines Covered Software or portions
+thereof with code not governed by the terms of this License.
+1.7. âLicenseâ means this document.
+1.8. âLicensableâ means having the right to grant, to the maximum extent
+possible, whether at the time of the initial grant or subsequently acquired, 
any
+and all of the rights conveyed herein.
+1.9. âModificationsâ means the Source Code and Executable form of any of 
the
+following:
+A. Any file that results from an addition to, deletion from or modification of
+the contents of a file containing Original Software or previous Modifications;
+B. Any new file that contains any part of the Original Software or previous
+Modification; or
+C. Any new file that is contributed or otherwise made available under the terms
+of this License.
+1.10. âOriginal Softwareâ means the Source Code and Executable form of
+computer software code that is originally released under this License.
+1.11. âPatent Claimsâ means any patent claim(s), now owned or hereafter
+acquired, including without limitation, method, process, and apparatus claims,
+in any patent Licensable by grantor.
+1.12. âSource Codeâ means (a) the common form of computer software code in
+which modifications are made and (b) associated documentation included in or
+with such code.
+1.13. âYouâ (or âYourâ) means an individual or a legal entity 
exercising
+rights under, and complying with all of the terms of, this License. For legal
+entities, âYouâ includes any entity which controls, is controlled by, or is
+under common control with You. For purposes of this definition, âcontrolâ
+means (a) the power, direct or indirect, to cause the direction or management 
of
+such entity, whether by contract or otherwise, or (b) ownership of more than
+fifty percent (50%) of the outstanding shares or beneficial ownership of such
+entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and subject to
+third party intellectual property claims, the Initial Developer hereby grants
+You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual
+property rights (other than patent or trademark) Licensable by Initial
+Developer, to use, reproduce, modify, display, perform, sublicense and
+distribute the Original Software (or portions thereof), with or without
+Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims
+infringed by the making, using or selling of Original Software, to make, have
+made, use, practice, sell, and offer for sale, and/or otherwise dispose of the
+Original Software (or portions thereof).
+(c) The licenses granted in Sections
+2.1(a) and (b) are effective on the date Initial Developer first distributes or
+otherwise makes the Original Software available to a third party under the 
terms
+of this License.
+(d) Notwithstanding Section 2.1(b) above, no patent license is
+granted: (1) for code that You delete from the Original Software, or (2) for
+infringements caused by: (i) the modification of the Original Software, or (ii)
+the combination of the Original Software with other software or devices.
+
+2.2. Contributor Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and
+subject to third party intellectual property claims, each Contributor hereby
+grants You a world-wide, royalty-free, non-exclusive license:
+(a) under
+intellectual property rights (other than patent or trademark) Licensable by
+Contributor to use, reproduce, modify, display, perform, sublicense and
+distribute the Modifications created by such Contributor (or portions thereof),
+either on an

[2/2] sentry git commit: SENTRY-2081: Automate the generation LICENSE.txt based on distributed jars. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Colm O hEigeartaigh, Alexander Kolbasov)

2017-12-01 Thread kalyan

SENTRY-2081: Automate the generation LICENSE.txt based on distributed jars. 
(Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Colm O hEigeartaigh, 
Alexander Kolbasov)


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/8efa1926
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/8efa1926
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/8efa1926

Branch: refs/heads/branch-2.0
Commit: 8efa19261770bfcea76c4f026d86c1e58edd797f
Parents: 09b1638
Author: Kalyan Kumar Kalvagadda 
Authored: Fri Dec 1 17:39:42 2017 -0600
Committer: Kalyan Kumar Kalvagadda 
Committed: Fri Dec 1 17:50:57 2017 -0600

--
 LICENSE.txt |  66 +-
 README_license.txt  |  66 ++
 pom.xml |   4 +
 sentry-dist/pom.xml |  71 +-
 sentry-dist/src/license/THIRD-PARTY.ftl |  54 ++
 sentry-dist/src/license/THIRD-PARTY.properties  |  44 +
 .../src/license/override-THIRD-PARTY.properties |  18 +
 sentry-dist/src/main/assembly/bin.xml   |  16 +-
 .../main/resources/licences/BSD_2-clause.txt|   8 +
 .../src/main/resources/licences/BSD_License.txt |   7 +
 .../src/main/resources/licences/CDDL_1_0.txt| 308 +++
 .../src/main/resources/licences/CDDL_1_1.txt| 797 +++
 .../src/main/resources/licences/CDDL_2.txt  |   1 +
 .../Eclipse_Public_License_-_Version_1_0.txt|  70 ++
 .../src/main/resources/licences/MIT_License.txt |  21 +
 .../Mozilla_Public_License_Version_1_1.txt  | 183 +
 .../licences/The_BSD_3-Clause_License.txt   |  13 +
 17 files changed, 1684 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/8efa1926/LICENSE.txt
--
diff --git a/LICENSE.txt b/LICENSE.txt
index b794ae6..93ed157 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -209,15 +209,8 @@ their respective licenses.
 
 For 
sentry-tests/sentry-tests-solr/src/test/resources/solr/collection1/conf/velocity/jquery.autocomplete.js:
 
-The MIT License (MIT)
-
-Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, JÃ¶rn 
Zaefferer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
of this software and associated documentation files (the "Software"), to deal 
in the Software without restriction, including without limitation the rights to 
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
of the Software, and to permit persons to whom the Software is furnished to do 
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+For details, see the associated license in 
sentry-dist/src/main/resources/licenses/MIT_License.txt
+
 
 For 
sentry-tests/sentry-tests-solr/src/test/resources/solr/collection1/conf/lang:
 stopwords_ar.txt
@@ -226,19 +219,8 @@ stopwords_fa.txt
 stopwords_hi.txt
 stopwords_ro.txt
 
-BSD License
-
-Copyright (c) 2005, Jacques Savoy.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, 
this list of conditions and the following disclaimer in the documentation 
and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
CAUSED AND ON ANY THEORY OF LIABILITY,

sentry git commit: SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)

2017-12-01 Thread kalyan

Repository: sentry
Updated Branches:
  refs/heads/branch-2.0 169172be8 -> 09b1638fb


SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar 
Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/09b1638f
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/09b1638f
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/09b1638f

Branch: refs/heads/branch-2.0
Commit: 09b1638fb3edaad788b5df0b6e38996558e00c45
Parents: 169172b
Author: Kalyan Kumar Kalvagadda 
Authored: Fri Dec 1 17:44:50 2017 -0600
Committer: Kalyan Kumar Kalvagadda 
Committed: Fri Dec 1 17:44:50 2017 -0600

--
 pom.xml | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/09b1638f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index eec185b..9d1729b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -731,6 +731,19 @@ limitations under the License.
 jetty-servlet
 ${jetty.version}
   
+  
+org.apache.hive.hcatalog
+hive-hcatalog-server-extensions
+${hive.version}
+
+  
+  
+javax.jms
+jms
+  
+
+

[1/2] sentry git commit: Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)"

2017-12-01 Thread spena

Repository: sentry
Updated Branches:
  refs/heads/branch-2.0 374883149 -> 169172be8


Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of 
curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar 
kalvagadda, Na Li)"

This reverts commit 989cb7f3551ebd895fbda668665778104e4d6db9.


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/85273361
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/85273361
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/85273361

Branch: refs/heads/branch-2.0
Commit: 8527336104ec7f4a0ed8e7f2331bdf9762ede523
Parents: 3748831
Author: Sergio Pena 
Authored: Fri Dec 1 09:42:49 2017 -0600
Committer: Sergio Pena 
Committed: Fri Dec 1 09:47:47 2017 -0600

--
 pom.xml |  39 +-
 sentry-binding/sentry-binding-solr/pom.xml  |   6 -
 .../dependency-reduced-pom.xml  | 624 ---
 sentry-provider/sentry-provider-db/pom.xml  |  37 --
 sentry-tests/sentry-tests-solr/pom.xml  |   1 -
 5 files changed, 29 insertions(+), 678 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/85273361/pom.xml
--
diff --git a/pom.xml b/pom.xml
index eec185b..f342e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@ limitations under the License.
 1.7
 2.9
 1.3.1
-2.4.3
 3.0.2
 1.8.5
 1.2
@@ -447,10 +446,6 @@ limitations under the License.
 org.eclipse.jetty.aggregate
 jetty-all
   
-  
-org.apache.curator
-curator-client
-  
 
   
   
@@ -636,11 +631,6 @@ limitations under the License.
 ${curator.version}
   
   
-org.apache.curator
-curator-client
-${curator.version}
-  
-  
 org.apache.zookeeper
 zookeeper
 ${zookeeper.version}
@@ -828,6 +818,35 @@ limitations under the License.
   
 
   
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/85273361/sentry-binding/sentry-binding-solr/pom.xml
--
diff --git a/sentry-binding/sentry-binding-solr/pom.xml 
b/sentry-binding/sentry-binding-solr/pom.xml
index 8a3fd1d..0db76bb 100644
--- a/sentry-binding/sentry-binding-solr/pom.xml
+++ b/sentry-binding/sentry-binding-solr/pom.xml
@@ -33,12 +33,6 @@ limitations under the License.
   org.apache.solr
   solr-core
   ${solr.version}
-  
-
-  org.apache.curator
-  curator-client
-
-  
 
 
   junit

http://git-wip-us.apache.org/repos/asf/sentry/blob/85273361/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
--
diff --git a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml 
b/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
deleted file mode 100644
index f40ec32..000
--- a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-  
-sentry-provider
-org.apache.sentry
-2.0.0-cdh6.x-SNAPSHOT
-  
-  4.0.0
-  sentry-provider-db
-  Sentry Provider DB
-  
-${basedir}/src/main/java
-${basedir}/src/test/java
-
-  
-
${basedir}/src/main/java/org/apache/sentry/provider/db/service/model
-
-  package.jdo
-
-  
-  
-${basedir}/src/main
-
-  webapp/*
-  webapp/css/*
-
-  
-
-
-  
-com.google.code.maven-replacer-plugin
-replacer
-1.5.2
-
-  
-replaceTokens
-clean
-
-  replace
-
-  
-
-
-  ${basedir}/src/main/webapp/SentryService.html
-  
-
-  %PROJECT_VERSION%
-  ${project.version}
-
-  
-
-  
-  
-org.codehaus.mojo
-build-helper-maven-plugin
-
-  
-add-source
-generate-sources
-
-  add-source
-
-
-  
-src/gen/thrift/gen-javabean
-  
-
-  
-
-  
-  
-org.datanucleus
-datanucleus-maven-plugin
-${datanucleus.maven.plugin.version}
-
-  
-

[2/2] sentry git commit: SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)

2017-12-01 Thread spena

SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator 
versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na 
Li)


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/169172be
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/169172be
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/169172be

Branch: refs/heads/branch-2.0
Commit: 169172be8c3a4d94ee4c5bdc5f1e118575db9fee
Parents: 8527336
Author: Sergio Pena 
Authored: Fri Dec 1 09:46:09 2017 -0600
Committer: Sergio Pena 
Committed: Fri Dec 1 09:47:52 2017 -0600

--
 pom.xml| 39 +++--
 sentry-binding/sentry-binding-solr/pom.xml |  6 
 sentry-provider/sentry-provider-db/pom.xml | 37 +++
 sentry-tests/sentry-tests-solr/pom.xml |  1 +
 4 files changed, 54 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/169172be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f342e65..eec185b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@ limitations under the License.
 1.7
 2.9
 1.3.1
+2.4.3
 3.0.2
 1.8.5
 1.2
@@ -446,6 +447,10 @@ limitations under the License.
 org.eclipse.jetty.aggregate
 jetty-all
   
+  
+org.apache.curator
+curator-client
+  
 
   
   
@@ -631,6 +636,11 @@ limitations under the License.
 ${curator.version}
   
   
+org.apache.curator
+curator-client
+${curator.version}
+  
+  
 org.apache.zookeeper
 zookeeper
 ${zookeeper.version}
@@ -818,35 +828,6 @@ limitations under the License.
   
 
   
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/169172be/sentry-binding/sentry-binding-solr/pom.xml
--
diff --git a/sentry-binding/sentry-binding-solr/pom.xml 
b/sentry-binding/sentry-binding-solr/pom.xml
index 0db76bb..8a3fd1d 100644
--- a/sentry-binding/sentry-binding-solr/pom.xml
+++ b/sentry-binding/sentry-binding-solr/pom.xml
@@ -33,6 +33,12 @@ limitations under the License.
   org.apache.solr
   solr-core
   ${solr.version}
+  
+
+  org.apache.curator
+  curator-client
+
+  
 
 
   junit

http://git-wip-us.apache.org/repos/asf/sentry/blob/169172be/sentry-provider/sentry-provider-db/pom.xml
--
diff --git a/sentry-provider/sentry-provider-db/pom.xml 
b/sentry-provider/sentry-provider-db/pom.xml
index d4fd9bd..679868a 100644
--- a/sentry-provider/sentry-provider-db/pom.xml
+++ b/sentry-provider/sentry-provider-db/pom.xml
@@ -226,6 +226,10 @@ limitations under the License.
   curator-test
 
 
+  org.apache.curator
+  curator-client
+
+
   org.apache.commons
   commons-pool2
 
@@ -357,6 +361,39 @@ limitations under the License.
 false
 
   
+  
+org.apache.maven.plugins
+maven-shade-plugin
+${maven.shade.plugin.version}
+
+  
+curator-shade
+package
+
+  shade
+
+
+  
+
+  
+  org.apache.curator:curator-recipes
+  org.apache.curator:curator-x-discovery
+  org.apache.curator:curator-framework
+  org.apache.curator:curator-client
+
+  
+  
+
+
+  org.apache.curator
+  sentry.org.apache.curator
+
+  
+  false
+
+  
+
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/sentry/blob/169172be/sentry-tests/sentry-tests-solr/pom.xml
--
diff --git a/sentry-tests/sentry-tests-solr/pom.xml 
b/sentry-tests/sentry-tests-solr/pom.xml
index c7125bd..01f5c6c 100644
--- a/sentry-tests/sentry-tests-solr/pom.xml
+++ b/sentry-tests/sentry-tests-solr/pom.xml
@@ -148,6 +148,7 @@ limitations under the License.
 
   org.apache.solr
   solr-test-framework
+  test
 
 
   org.apache.solr

[3/3] sentry git commit: Add dependency-reduced-pom.xml to the .gitignore file

2017-12-01 Thread spena

Add dependency-reduced-pom.xml to the .gitignore file


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/4583c26a
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/4583c26a
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/4583c26a

Branch: refs/heads/master
Commit: 4583c26ad5dbd73119b861c6bded2ff486474de6
Parents: 0becb24
Author: Sergio Pena 
Authored: Fri Dec 1 09:46:51 2017 -0600
Committer: Sergio Pena 
Committed: Fri Dec 1 09:46:51 2017 -0600

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/4583c26a/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 80d5c03..6ce3a6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ maven-repo/
 .DS_Store
 **/thirdparty/*
 **/metastore_db/*
+*dependency-reduced-pom.xml

[1/3] sentry git commit: Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)"

2017-12-01 Thread spena

Repository: sentry
Updated Branches:
  refs/heads/master 35e9d48cd -> 4583c26ad


Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of 
curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar 
kalvagadda, Na Li)"

This reverts commit 989cb7f3551ebd895fbda668665778104e4d6db9.


Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/da879a0c
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/da879a0c
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/da879a0c

Branch: refs/heads/master
Commit: da879a0cc4a960636f02084f3ed1f0ae66b885da
Parents: 35e9d48
Author: Sergio Pena 
Authored: Fri Dec 1 09:42:49 2017 -0600
Committer: Sergio Pena 
Committed: Fri Dec 1 09:42:49 2017 -0600

--
 pom.xml |  39 +-
 sentry-binding/sentry-binding-solr/pom.xml  |   6 -
 .../dependency-reduced-pom.xml  | 624 ---
 sentry-provider/sentry-provider-db/pom.xml  |  37 --
 sentry-tests/sentry-tests-solr/pom.xml  |   1 -
 5 files changed, 29 insertions(+), 678 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 40d96e3..cdd76c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@ limitations under the License.
 1.7
 2.9
 1.3.1
-2.4.3
 3.0.2
 1.8.5
 1.2
@@ -447,10 +446,6 @@ limitations under the License.
 org.eclipse.jetty.aggregate
 jetty-all
   
-  
-org.apache.curator
-curator-client
-  
 
   
   
@@ -636,11 +631,6 @@ limitations under the License.
 ${curator.version}
   
   
-org.apache.curator
-curator-client
-${curator.version}
-  
-  
 org.apache.zookeeper
 zookeeper
 ${zookeeper.version}
@@ -828,6 +818,35 @@ limitations under the License.
   
 
   
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-binding/sentry-binding-solr/pom.xml
--
diff --git a/sentry-binding/sentry-binding-solr/pom.xml 
b/sentry-binding/sentry-binding-solr/pom.xml
index f086699..c0367f1 100644
--- a/sentry-binding/sentry-binding-solr/pom.xml
+++ b/sentry-binding/sentry-binding-solr/pom.xml
@@ -33,12 +33,6 @@ limitations under the License.
   org.apache.solr
   solr-core
   ${solr.version}
-  
-
-  org.apache.curator
-  curator-client
-
-  
 
 
   junit

http://git-wip-us.apache.org/repos/asf/sentry/blob/da879a0c/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
--
diff --git a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml 
b/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
deleted file mode 100644
index f40ec32..000
--- a/sentry-provider/sentry-provider-db/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-  
-sentry-provider
-org.apache.sentry
-2.0.0-cdh6.x-SNAPSHOT
-  
-  4.0.0
-  sentry-provider-db
-  Sentry Provider DB
-  
-${basedir}/src/main/java
-${basedir}/src/test/java
-
-  
-
${basedir}/src/main/java/org/apache/sentry/provider/db/service/model
-
-  package.jdo
-
-  
-  
-${basedir}/src/main
-
-  webapp/*
-  webapp/css/*
-
-  
-
-
-  
-com.google.code.maven-replacer-plugin
-replacer
-1.5.2
-
-  
-replaceTokens
-clean
-
-  replace
-
-  
-
-
-  ${basedir}/src/main/webapp/SentryService.html
-  
-
-  %PROJECT_VERSION%
-  ${project.version}
-
-  
-
-  
-  
-org.codehaus.mojo
-build-helper-maven-plugin
-
-  
-add-source
-generate-sources
-
-  add-source
-
-
-  
-src/gen/thrift/gen-javabean
-  
-
-  
-
-  
-  
-org.datanucleus
-datanucleus-maven-plugin
-${datanucleus.maven.plugin.version}
-
-  
-

[sentry] Git Push Summary

[1/3] sentry git commit: SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)

[2/3] sentry git commit: SENTRY-2081: Automate the generation LICENSE.txt based on distributed jars. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Colm O hEigeartaigh, Alexander Kolbasov)

[2/2] sentry git commit: SENTRY-2081: Automate the generation LICENSE.txt based on distributed jars. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Colm O hEigeartaigh, Alexander Kolbasov)

sentry git commit: SENTRY-2084: Exclude javax.jms:jms from sentry distribution. (Kalyan Kumar Kalvagadda, reviewed by Sergio Pena, Alexander Kolbasov)

[1/2] sentry git commit: Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)"

[2/2] sentry git commit: SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)

[3/3] sentry git commit: Add dependency-reduced-pom.xml to the .gitignore file

[1/3] sentry git commit: Revert "SENTRY-2079: Sentry HA leader monitor does not work due to a mix of curator versions in the classpath (Sergio Pena, reviewed by kalyan kumar kalvagadda, Na Li)"

9 matches

Site Navigation

Mail list logo

Footer information