hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1543065 - in /hive/trunk: ./ ant/ beeline/ cli/ common/ contrib/ hbase-handler/ hcatalog/core/ hcatalog/hcatalog-pig-adapter/ hcatalog/server-extensions/ hcatalog/storage-handlers/hbase/ hcatalog/webhcat/java-client/ hcatalog/webhcat/svr/ ...
Date Mon, 18 Nov 2013 16:16:43 GMT
Author: brock
Date: Mon Nov 18 16:16:42 2013
New Revision: 1543065

URL: http://svn.apache.org/r1543065
Log:
HIVE-5741: Fix binary packaging build eg include hcatalog, resolve pom issues (Brock Noland reviewed by Xuefu Zhang)

Modified:
    hive/trunk/ant/pom.xml
    hive/trunk/beeline/pom.xml
    hive/trunk/cli/pom.xml
    hive/trunk/common/pom.xml
    hive/trunk/contrib/pom.xml
    hive/trunk/hbase-handler/pom.xml
    hive/trunk/hcatalog/core/pom.xml
    hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
    hive/trunk/hcatalog/server-extensions/pom.xml
    hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
    hive/trunk/hcatalog/webhcat/java-client/pom.xml
    hive/trunk/hcatalog/webhcat/svr/pom.xml
    hive/trunk/hwi/pom.xml
    hive/trunk/itests/hcatalog-unit/pom.xml
    hive/trunk/itests/hive-unit/pom.xml
    hive/trunk/itests/qtest/pom.xml
    hive/trunk/itests/test-serde/pom.xml
    hive/trunk/itests/util/pom.xml
    hive/trunk/jdbc/pom.xml
    hive/trunk/metastore/pom.xml
    hive/trunk/odbc/pom.xml
    hive/trunk/packaging/pom.xml
    hive/trunk/packaging/src/main/assembly/bin.xml
    hive/trunk/pom.xml
    hive/trunk/ql/pom.xml
    hive/trunk/serde/pom.xml
    hive/trunk/service/pom.xml
    hive/trunk/shims/0.20/pom.xml
    hive/trunk/shims/0.20S/pom.xml
    hive/trunk/shims/0.23/pom.xml
    hive/trunk/shims/assembly/pom.xml
    hive/trunk/shims/common-secure/pom.xml
    hive/trunk/shims/common/pom.xml
    hive/trunk/testutils/pom.xml
    hive/trunk/testutils/ptest2/pom.xml

Modified: hive/trunk/ant/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ant/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/ant/pom.xml (original)
+++ hive/trunk/ant/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- inter-project -->
     <dependency>
       <groupId>commons-lang</groupId>

Modified: hive/trunk/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/beeline/pom.xml (original)
+++ hive/trunk/beeline/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/cli/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/cli/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/cli/pom.xml (original)
+++ hive/trunk/cli/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/common/pom.xml (original)
+++ hive/trunk/common/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-proect -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/contrib/pom.xml (original)
+++ hive/trunk/contrib/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/hbase-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hbase-handler/pom.xml (original)
+++ hive/trunk/hbase-handler/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/hcatalog/core/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/core/pom.xml (original)
+++ hive/trunk/hcatalog/core/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/trunk/hcatalog/hcatalog-pig-adapter/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/trunk/hcatalog/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/server-extensions/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/server-extensions/pom.xml (original)
+++ hive/trunk/hcatalog/server-extensions/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/trunk/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -85,12 +86,6 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>
@@ -256,6 +251,7 @@
       </resource>
     </resources>
     <plugins>
+      <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

Modified: hive/trunk/hcatalog/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/java-client/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/java-client/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,7 +38,7 @@
   </properties>
 
   <dependencies>
-
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/trunk/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/hwi/pom.xml (original)
+++ hive/trunk/hwi/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -99,6 +100,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
@@ -110,6 +112,7 @@
    <profile>
       <id>hadoop-2</id>
       <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
@@ -124,6 +127,7 @@
     <sourceDirectory>${basedir}/src/java</sourceDirectory>
     <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
     <plugins>
+    <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>

Modified: hive/trunk/itests/hcatalog-unit/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hcatalog-unit/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/itests/hcatalog-unit/pom.xml (original)
+++ hive/trunk/itests/hcatalog-unit/pom.xml Mon Nov 18 16:16:42 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/trunk/itests/hive-unit/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/itests/hive-unit/pom.xml (original)
+++ hive/trunk/itests/hive-unit/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/itests/qtest/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/qtest/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/itests/qtest/pom.xml (original)
+++ hive/trunk/itests/qtest/pom.xml Mon Nov 18 16:16:42 2013
@@ -42,6 +42,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -197,7 +198,7 @@
         </dependency>
       </dependencies>
     </profile>
-   <profile>
+    <profile>
       <id>hadoop-2</id>
       <properties>
         <active.hadoop.version>${hadoop-23.version}</active.hadoop.version>

Modified: hive/trunk/itests/test-serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/test-serde/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/itests/test-serde/pom.xml (original)
+++ hive/trunk/itests/test-serde/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/itests/util/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/itests/util/pom.xml (original)
+++ hive/trunk/itests/util/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -157,5 +158,4 @@
     </profile>
   </profiles>
 
-
 </project>

Modified: hive/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/jdbc/pom.xml (original)
+++ hive/trunk/jdbc/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -67,12 +68,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${httpcomponents.version}</version>
+      <version>${httpcomponents.client.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${httpcomponents.version}</version>
+      <version>${httpcomponents.core.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>

Modified: hive/trunk/metastore/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/metastore/pom.xml (original)
+++ hive/trunk/metastore/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -172,6 +173,7 @@
       </resource>
     </resources>
     <plugins>
+      <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr3-maven-plugin</artifactId>

Modified: hive/trunk/odbc/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/odbc/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/odbc/pom.xml (original)
+++ hive/trunk/odbc/pom.xml Mon Nov 18 16:16:42 2013
@@ -34,6 +34,7 @@
 
   <!-- odbc code depends on code generated in these modules -->
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/packaging/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/packaging/pom.xml (original)
+++ hive/trunk/packaging/pom.xml Mon Nov 18 16:16:42 2013
@@ -36,6 +36,7 @@
       <id>dist</id>
       <build>
         <plugins>
+    <!-- plugins are always listed in sorted order by groupId, artifectId -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -62,32 +63,9 @@
     </profile>
   </profiles>
 
+
   <dependencies>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-0.20</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-common-secure</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-0.20S</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-0.23</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-common</artifactId>
@@ -120,6 +98,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hive</groupId>
+      <artifactId>hive-shims</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
       <artifactId>hive-jdbc</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -148,7 +131,36 @@
       <artifactId>hive-hwi</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-hbase-storage-handler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-hcatalog-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-hcatalog-pig-adapter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-hcatalog-server-extensions</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-webhcat</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive.hcatalog</groupId>
+      <artifactId>hive-webhcat-java-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
 </project>

Modified: hive/trunk/packaging/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/src/main/assembly/bin.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/packaging/src/main/assembly/bin.xml (original)
+++ hive/trunk/packaging/src/main/assembly/bin.xml Mon Nov 18 16:16:42 2013
@@ -33,9 +33,58 @@
 
   <dependencySets>
     <dependencySet>
-    <outputDirectory>lib</outputDirectory>
-    <unpack>false</unpack>
-    <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>lib</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useStrictFiltering>true</useStrictFiltering>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.apache.hadoop:*</exclude>
+        <exclude>org.apache.hbase:*</exclude>
+        <exclude>org.apache.hive.hcatalog:*</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>hcatalog/share/hcatalog</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useStrictFiltering>true</useStrictFiltering>
+      <includes>
+        <include>org.apache.hive.hcatalog:hive-hcatalog-core</include>
+        <include>org.apache.hive.hcatalog:hive-hcatalog-pig-adapter</include>
+        <include>org.apache.hive.hcatalog:hive-hcatalog-server-extensions</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>hcatalog/share/hcatalog/storage-handlers/hbase/lib</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useStrictFiltering>true</useStrictFiltering>
+      <includes>
+        <include>org.apache.hive.hcatalog:hive-hbase-storage-handler</include>
+      </includes>
+    </dependencySet>
+    <!-- TODO 0.12 release the webhcat server lib directory had all transitive jars
+         while this lib directory only has explicit dependencies
+    -->
+    <dependencySet>
+      <outputDirectory>hcatalog/share/webhcat/svr/lib</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useStrictFiltering>true</useStrictFiltering>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <includes>
+        <include>org.apache.hive.hcatalog:hive-webhcat:*</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>hcatalog/share/webhcat/java-client</outputDirectory>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useStrictFiltering>true</useStrictFiltering>
+      <includes>
+        <include>org.apache.hive.hcatalog:hive-webhcat-java-client</include>
+      </includes>
     </dependencySet>
   </dependencySets>
 
@@ -202,7 +251,77 @@
       <outputDirectory>lib/py/queryplan</outputDirectory>
     </fileSet>
 
+    <!-- hcatalog bin -->
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/bin</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>hcat</include>
+        <include>hcatcfg.py</include>
+        <include>hcat.py</include>
+        <include>templeton.cmd</include>
+      </includes>
+      <outputDirectory>hcatalog/bin</outputDirectory>
+    </fileSet>
 
+    <!-- hcatalog etc -->
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/conf</directory>
+      <fileMode>644</fileMode>
+      <includes>
+        <include>jndi.properties</include>
+        <include>proto-hive-site.xml</include>
+      </includes>
+      <outputDirectory>hcatalog/etc/hcatalog</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/webhcat/svr/src/main/config</directory>
+      <fileMode>644</fileMode>
+      <includes>
+        <include>webhcat-default.xml</include>
+        <include>webhcat-log4j.properties</include>
+      </includes>
+      <outputDirectory>hcatalog/etc/webhcat</outputDirectory>
+    </fileSet>
+
+    <!-- hcatalog libexec -->
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/bin</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>hcat-config.sh</include>
+      </includes>
+      <outputDirectory>hcatalog/libexec</outputDirectory>
+    </fileSet>
+
+    <!-- hcatalog sbin -->
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/bin</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>hcatcfg.py</include>
+        <include>hcat_server.py</include>
+        <include>hcat_server.sh</include>
+      </includes>
+      <outputDirectory>hcatalog/sbin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/src/packages</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>update-hcatalog-env.sh</include>
+      </includes>
+      <outputDirectory>hcatalog/sbin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/hcatalog/webhcat/svr/src/main/bin</directory>
+      <fileMode>755</fileMode>
+      <includes>
+        <include>webhcat_config.sh</include>
+        <include>webhcat_server.sh</include>
+      </includes>
+      <outputDirectory>hcatalog/sbin</outputDirectory>
+    </fileSet>
   </fileSets>
 
   <files>
@@ -211,12 +330,19 @@
       <outputDirectory>conf</outputDirectory>
       <destName>hive-log4j.properties.template</destName>
     </file>
-
     <file>
       <source>${project.parent.basedir}/ql/src/main/resources/hive-exec-log4j.properties</source>
       <outputDirectory>conf</outputDirectory>
       <destName>hive-exec-log4j.properties.template</destName>
     </file>
+    <file>
+      <source>${project.parent.basedir}/hcatalog/README.txt</source>
+      <outputDirectory>hcatalog/share/doc/hcatalog</outputDirectory>
+    </file>
+    <file>
+      <source>${project.parent.basedir}/hcatalog/storage-handlers/hbase/conf/revision-manager-site.xml</source>
+      <outputDirectory>hcatalog/share/hcatalog/storage-handlers/hbase/conf</outputDirectory>
+    </file>
   </files>
 
 </assembly>

Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Mon Nov 18 16:16:42 2013
@@ -79,24 +79,19 @@
     <activemq.version>5.5.0</activemq.version>
     <ant.version>1.9.1</ant.version>
     <antlr.version>3.4</antlr.version>
-    <avro.version>1.7.1</avro.version>
+    <avro.version>1.7.5</avro.version>
     <bonecp.version>0.7.1.RELEASE</bonecp.version>
     <datanucleus-api-jdo.version>3.2.1</datanucleus-api-jdo.version>
     <datanucleus-core.version>3.2.2</datanucleus-core.version>
     <datanucleus-rdbms.version>3.2.1</datanucleus-rdbms.version>
-    <checkstyle.version>5.0</checkstyle.version>
-    <findbugs.version>1.3.9</findbugs.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-codec.version>1.4</commons-codec.version>
-    <commons-collections.version>3.2.1</commons-collections.version>
     <commons-compress.version>1.4.1</commons-compress.version>
-    <commons-configuration.version>1.6</commons-configuration.version>
     <commons-exec.version>1.1</commons-exec.version>
     <commons-httpclient.version>3.0.1</commons-httpclient.version>
     <commons-io.version>2.4</commons-io.version>
     <commons-lang.version>2.4</commons-lang.version>
     <commons-logging.version>1.1.3</commons-logging.version>
-    <commons-pool.version>1.5.4</commons-pool.version>
     <derby.version>10.4.2.0</derby.version>
     <guava.version>11.0.2</guava.version>
     <groovy.version>2.1.6</groovy.version>
@@ -105,15 +100,17 @@
     <hadoop-23.version>2.2.0</hadoop-23.version>
     <hbase.hadoop1.version>0.96.0-hadoop1</hbase.hadoop1.version>
     <hbase.hadoop2.version>0.96.0-hadoop2</hbase.hadoop2.version>
-    <httpcomponents.version>4.1.3</httpcomponents.version>
+    <!-- httpcomponents are not always in version sync -->
+    <httpcomponents.client.version>4.2.5</httpcomponents.client.version>
+    <httpcomponents.core.version>4.2.4</httpcomponents.core.version>
     <jackson.version>1.9.2</jackson.version>
     <javaewah.version>0.3.2</javaewah.version>
     <javolution.version>5.5.1</javolution.version>
-    <jersey.version>1.14</jersey.version>
-    <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
     <jdo-api.version>3.0.1</jdo-api.version>
-    <jdom.version>1.1</jdom.version>
+    <!-- TODO figure out how to reconcile jetty versions -->
     <jetty.version>6.1.26</jetty.version>
+    <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
+    <jersey.version>1.14</jersey.version>
     <jline.version>0.9.94</jline.version>
     <jms.version>1.1</jms.version>
     <json.version>20090211</json.version>
@@ -124,18 +121,22 @@
     <log4j.version>1.2.16</log4j.version>
     <mockito-all.version>1.8.2</mockito-all.version>
     <mina.version>2.0.0-M5</mina.version>
+    <!--netty is not a direct dependency but due to a change
+        in artifact name and given that zookeeper < 3.5
+        requires netty < 3.6.0 we force hadoops version
+      -->
+    <netty.version>3.4.0.Final</netty.version>
     <pig.version>0.10.1</pig.version>
     <protobuf.version>2.5.0</protobuf.version>
-    <rat.version>0.8</rat.version>
     <stax.version>1.0.1</stax.version>
-    <slf4j.version>1.6.1</slf4j.version>
+    <slf4j.version>1.7.5</slf4j.version>
     <ST4.version>4.0.4</ST4.version>
     <tempus-fugit.version>1.1</tempus-fugit.version>
     <snappy.version>0.2</snappy.version>
     <wadl-resourcedoc-doclet.version>1.4</wadl-resourcedoc-doclet.version>
     <velocity.version>1.5</velocity.version>
     <xerces.version>2.9.1</xerces.version>
-    <zookeeper.version>3.4.3</zookeeper.version>
+    <zookeeper.version>3.4.5</zookeeper.version>
   </properties>
 
   <repositories>
@@ -184,7 +185,322 @@
      </repository>
   </repositories>
 
+  <!-- Hadoop dependency management is done at the bottom under profiles -->
+  <dependencyManagement>
+    <dependencies>
+      <!-- dependencies are always listed in sorted order by groupId, artifectId -->
+      <dependency>
+        <groupId>com.esotericsoftware.kryo</groupId>
+        <artifactId>kryo</artifactId>
+        <version>${kryo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.tempus-fugit</groupId>
+        <artifactId>tempus-fugit</artifactId>
+        <version>${tempus-fugit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode.javaewah</groupId>
+        <artifactId>JavaEWAH</artifactId>
+        <version>${javaewah.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.jolbox</groupId>
+        <artifactId>bonecp</artifactId>
+        <version>${bonecp.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-server</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey.contribs</groupId>
+        <artifactId>wadl-resourcedoc-doclet</artifactId>
+        <version>${wadl-resourcedoc-doclet.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>${commons-cli.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${commons-codec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>${commons-httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${commons-lang.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.jdo</groupId>
+        <artifactId>jdo-api</artifactId>
+        <version>${jdo-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.jms</groupId>
+        <artifactId>jms</artifactId>
+        <version>${jms.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javolution</groupId>
+        <artifactId>javolution</artifactId>
+        <version>${javolution.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
+        <version>${jline.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>antlr-runtime</artifactId>
+        <version>${antlr.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.antlr</groupId>
+        <artifactId>ST4</artifactId>
+        <version>${ST4.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>${commons-compress.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-exec</artifactId>
+        <version>${commons-exec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-core</artifactId>
+        <version>${activemq.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>kahadb</artifactId>
+        <version>${activemq.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro</artifactId>
+        <version>${avro.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-mapred</artifactId>
+        <version>${avro.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>${derby.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpcomponents.client.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${httpcomponents.core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <version>${mina.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>${velocity.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>${stax.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.pig</groupId>
+        <artifactId>pig</artifactId>
+        <version>${pig.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.thrift</groupId>
+        <artifactId>libfb303</artifactId>
+        <version>${libfb303.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.thrift</groupId>
+        <artifactId>libthrift</artifactId>
+        <version>${libthrift.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${zookeeper.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>${groovy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-mapper-asl</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-xc</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.aggregate</groupId>
+        <artifactId>jetty-all-server</artifactId>
+        <version>${jetty.webhcat.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.datanucleus</groupId>
+        <artifactId>datanucleus-api-jdo</artifactId>
+        <version>${datanucleus-api-jdo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.datanucleus</groupId>
+        <artifactId>datanucleus-core</artifactId>
+        <version>${datanucleus-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.datanucleus</groupId>
+        <artifactId>datanucleus-rdbms</artifactId>
+        <version>${datanucleus-rdbms.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.iq80.snappy</groupId>
+        <artifactId>snappy</artifactId>
+        <version>${snappy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>${json.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>${mockito-all.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>${xerces.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- global dependencies -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -201,6 +517,7 @@
   <build>
     <pluginManagement>
       <plugins>
+        <!-- plugins are always listed in sorted order by groupId, artifectId -->
         <plugin>
           <groupId>org.antlr</groupId>
           <artifactId>antlr3-maven-plugin</artifactId>
@@ -296,6 +613,7 @@
     </pluginManagement>
 
     <plugins>
+      <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -521,5 +839,98 @@
         </plugins>
       </build>
     </profile>
+    <!-- hadoop profiles in the root pom are only used for dependency management -->
+    <profile>
+      <id>hadoop-1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-core</artifactId>
+            <version>${hadoop-20S.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-test</artifactId>
+            <version>${hadoop-20S.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-tools</artifactId>
+            <version>${hadoop-20S.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-common</artifactId>
+            <version>${hbase.hadoop1.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop-compat</artifactId>
+            <version>${hbase.hadoop1.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop1-compat</artifactId>
+            <version>${hbase.hadoop1.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <version>${hbase.hadoop1.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+    <profile>
+      <id>hadoop-2</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop-23.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <version>${hadoop-23.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+            <version>${hadoop-23.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-mapreduce-client-core</artifactId>
+            <version>${hadoop-23.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-common</artifactId>
+            <version>${hbase.hadoop2.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop-compat</artifactId>
+            <version>${hbase.hadoop2.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-hadoop2-compat</artifactId>
+            <version>${hbase.hadoop2.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
+            <version>${hbase.hadoop2.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 </project>

Modified: hive/trunk/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/ql/pom.xml (original)
+++ hive/trunk/ql/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <!-- used for vector code-gen -->
     <dependency>
@@ -288,6 +289,7 @@
     <sourceDirectory>${basedir}/src/java</sourceDirectory>
     <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
     <plugins>
+      <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr3-maven-plugin</artifactId>

Modified: hive/trunk/serde/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/serde/pom.xml (original)
+++ hive/trunk/serde/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/service/pom.xml (original)
+++ hive/trunk/service/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/trunk/shims/0.20/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/0.20/pom.xml (original)
+++ hive/trunk/shims/0.20/pom.xml Mon Nov 18 16:16:42 2013
@@ -33,6 +33,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.shims</groupId>

Modified: hive/trunk/shims/0.20S/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/0.20S/pom.xml (original)
+++ hive/trunk/shims/0.20S/pom.xml Mon Nov 18 16:16:42 2013
@@ -33,6 +33,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.shims</groupId>

Modified: hive/trunk/shims/0.23/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/0.23/pom.xml (original)
+++ hive/trunk/shims/0.23/pom.xml Mon Nov 18 16:16:42 2013
@@ -33,6 +33,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.shims</groupId>

Modified: hive/trunk/shims/assembly/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/assembly/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/assembly/pom.xml (original)
+++ hive/trunk/shims/assembly/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,30 +32,36 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-common</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-0.20</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-common-secure</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-0.20S</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-0.23</artifactId>
       <version>${project.version}</version>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 

Modified: hive/trunk/shims/common-secure/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/common-secure/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/common-secure/pom.xml (original)
+++ hive/trunk/shims/common-secure/pom.xml Mon Nov 18 16:16:42 2013
@@ -33,6 +33,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.shims</groupId>

Modified: hive/trunk/shims/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/common/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/shims/common/pom.xml (original)
+++ hive/trunk/shims/common/pom.xml Mon Nov 18 16:16:42 2013
@@ -33,6 +33,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- inter-project -->
     <dependency>
       <groupId>commons-logging</groupId>

Modified: hive/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
--- hive/trunk/testutils/pom.xml (original)
+++ hive/trunk/testutils/pom.xml Mon Nov 18 16:16:42 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- inter-project -->
     <dependency>
       <groupId>com.google.code.tempus-fugit</groupId>

Modified: hive/trunk/testutils/ptest2/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/pom.xml?rev=1543065&r1=1543064&r2=1543065&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message