You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by ol...@apache.org on 2013/09/05 14:51:10 UTC

[1/2] git commit: inherit from Apache parent and use Apache reference (jira, git)

Updated Branches:
  refs/heads/master a5262c6e9 -> c98ac0c37


inherit from Apache parent and use Apache reference (jira, git)


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

Branch: refs/heads/master
Commit: 2f037b5d5395bb4a04f3bdb1d80c3f91423bb949
Parents: a5262c6
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Sep 5 16:20:55 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Sep 5 16:20:55 2013 +1000

----------------------------------------------------------------------
 pom.xml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/2f037b5d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2fe9297..bf04106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,39 +18,26 @@ limitations under the License.
 <project xmlns="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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
-    <artifactId>cdh-root</artifactId>
-    <version>4.4.0-SNAPSHOT</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>13</version>
   </parent>
 
   <artifactId>sentry</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.0-incubating-SNAPSHOT</version>
   <description>Sentry component</description>
   <name>Sentry</name>
   <packaging>pom</packaging>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Cloudera Inc.</name>
-    <url>http://www.cloudera.com/</url>
-  </organization>
-
   <issueManagement>
     <system>JIRA</system>
-    <url>https://issues.cloudera.org/browse/ACCESS</url>
+    <url>https://issues.apache.org/jira/browse/SENTRY</url>
   </issueManagement>
 
   <scm>
-    <connection>scm:git:https://github.com/cloudera/access</connection>
-    <developerConnection>scm:git:https://github.com/cloudera/access</developerConnection>
-    <url>https://github.com/cloudera/access</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-sentry.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-sentry.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf/incubator-sentry</url>
   </scm>
 
   <properties>


[2/2] git commit: use org.apache.sentry groupId

Posted by ol...@apache.org.
use org.apache.sentry groupId


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

Branch: refs/heads/master
Commit: c98ac0c37032b90b2452f16571435d72a570094e
Parents: 2f037b5
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Sep 5 22:50:59 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Sep 5 22:50:59 2013 +1000

----------------------------------------------------------------------
 pom.xml                                      | 19 +++++++++++--------
 sentry-binding/pom.xml                       |  8 ++++----
 sentry-binding/sentry-binding-hive/pom.xml   | 11 +++++------
 sentry-core/pom.xml                          |  5 ++---
 sentry-dist/pom.xml                          | 10 +++++-----
 sentry-provider/pom.xml                      |  8 ++++----
 sentry-provider/sentry-provider-file/pom.xml |  7 +++----
 sentry-tests/pom.xml                         | 22 +++++++++++++++++-----
 8 files changed, 51 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf04106..393142e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@ limitations under the License.
     <version>13</version>
   </parent>
 
+  <groupId>org.apache.sentry</groupId>
   <artifactId>sentry</artifactId>
   <version>1.2.0-incubating-SNAPSHOT</version>
   <description>Sentry component</description>
@@ -54,6 +55,8 @@ limitations under the License.
     <slf4j.version>1.6.1</slf4j.version>
     <derby.version>10.4.2.0</derby.version>
     <libthrift.version>0.9.0-cdh4-1</libthrift.version>
+    <hadoop.version>2.0.0-cdh4.4.0-SNAPSHOT</hadoop.version>
+    <zookeeper.version>3.4.5-cdh4.4.0-SNAPSHOT</zookeeper.version>
   </properties>
 
   <dependencyManagement>
@@ -142,7 +145,7 @@ limitations under the License.
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.cloudera.cdh</groupId>
+        <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-core</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -219,19 +222,19 @@ limitations under the License.
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>com.cloudera.cdh</groupId>
+        <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-binding-hive</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>
        </dependency>
       <dependency>
-        <groupId>com.cloudera.cdh</groupId>
+        <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-provider-file</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>com.cloudera.cdh</groupId>
+        <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-dist</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -259,7 +262,7 @@ limitations under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>2.5.1</version>
           <configuration>
             <source>${maven.compile.source}</source>
             <target>${maven.compile.target}</target>
@@ -268,7 +271,7 @@ limitations under the License.
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
-          <version>0.8</version>
+          <version>0.10</version>
           <executions>
             <execution>
               <id>header-check</id>
@@ -302,13 +305,13 @@ limitations under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>2.4</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.16</version>
           <configuration>
             <forkMode>always</forkMode>
             <environmentVariables>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-binding/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-binding/pom.xml b/sentry-binding/pom.xml
index d6da6a7..9a5fff1 100644
--- a/sentry-binding/pom.xml
+++ b/sentry-binding/pom.xml
@@ -14,17 +14,17 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
---><project xmlns="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/xsd/maven-4.0.0.xsd">
+-->
+<project xmlns="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/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>com.cloudera.cdh</groupId>
   <artifactId>sentry-binding</artifactId>
   <name>Sentry Bindings</name>
   <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-binding/sentry-binding-hive/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/pom.xml b/sentry-binding/sentry-binding-hive/pom.xml
index 32c5a8a..383fcdc 100644
--- a/sentry-binding/sentry-binding-hive/pom.xml
+++ b/sentry-binding/sentry-binding-hive/pom.xml
@@ -20,9 +20,9 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-binding</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>sentry-binding-hive</artifactId>
@@ -63,11 +63,11 @@ limitations under the License.
       <artifactId>hive-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-provider-file</artifactId>
       <scope>test</scope>
     </dependency>
@@ -78,9 +78,8 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
-      <version>${cdh.hadoop.version}</version>
+      <version>${hadoop.version}</version>
     </dependency>
   </dependencies>
 
-  <groupId>com.cloudera.cdh</groupId>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-core/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-core/pom.xml b/sentry-core/pom.xml
index 45312a7..b86eef2 100644
--- a/sentry-core/pom.xml
+++ b/sentry-core/pom.xml
@@ -19,12 +19,11 @@ limitations under the License.
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>com.cloudera.cdh</groupId>
   <artifactId>sentry-core</artifactId>
   <name>Sentry core</name>
 

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-dist/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-dist/pom.xml b/sentry-dist/pom.xml
index d618faf..af5bf51 100644
--- a/sentry-dist/pom.xml
+++ b/sentry-dist/pom.xml
@@ -18,24 +18,24 @@ limitations under the License.
 <project xmlns="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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
   <artifactId>sentry-dist</artifactId>
   <name>Sentry Distribution</name>
   <description>Sentry distribution</description>
   <dependencies>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-binding-hive</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-provider-file</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-provider/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-provider/pom.xml b/sentry-provider/pom.xml
index fe1d9e5..9da0e58 100644
--- a/sentry-provider/pom.xml
+++ b/sentry-provider/pom.xml
@@ -14,17 +14,17 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
---><project xmlns="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/xsd/maven-4.0.0.xsd">
+-->
+<project xmlns="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/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>com.cloudera.cdh</groupId>
   <artifactId>sentry-provider</artifactId>
   <name>Sentry Providers</name>
   <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-provider/sentry-provider-file/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-file/pom.xml b/sentry-provider/sentry-provider-file/pom.xml
index 466e96c..f913c52 100644
--- a/sentry-provider/sentry-provider-file/pom.xml
+++ b/sentry-provider/sentry-provider-file/pom.xml
@@ -19,12 +19,11 @@ limitations under the License.
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry-provider</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>com.cloudera.cdh</groupId>
   <artifactId>sentry-provider-file</artifactId>
   <name>Sentry Provider File</name>
 
@@ -66,7 +65,7 @@ limitations under the License.
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-core</artifactId>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/c98ac0c3/sentry-tests/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-tests/pom.xml b/sentry-tests/pom.xml
index 5e40cea..5daf619 100644
--- a/sentry-tests/pom.xml
+++ b/sentry-tests/pom.xml
@@ -18,9 +18,9 @@ limitations under the License.
 <project xmlns="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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.cdh</groupId>
+    <groupId>org.apache.sentry</groupId>
     <artifactId>sentry</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-incubating-SNAPSHOT</version>
   </parent>
   <artifactId>sentry-tests</artifactId>
   <name>Sentry Tests</name>
@@ -47,7 +47,7 @@ limitations under the License.
       <artifactId>derby</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-core</artifactId>
     </dependency>
     <dependency>
@@ -128,61 +128,73 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-auth</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-core</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-api</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-common</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-server-common</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+      <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
+      <version>${zookeeper.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -194,7 +206,7 @@ limitations under the License.
       <artifactId>fest-reflect</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-binding-hive</artifactId>
     </dependency>
     <dependency>
@@ -203,7 +215,7 @@ limitations under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.cdh</groupId>
+      <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-provider-file</artifactId>
     </dependency>
     <dependency>